Merge tag '3.0.0' into develop

Release 3.0.0
SolarNetwork · Dec 8, 2023 · 17b7933 · 17b7933
2 parents 4aa4004 + 0f4bfd4
commit 17b7933
Show file tree

Hide file tree

Showing 28 changed files with 41 additions and 23 deletions.
diff --git a/solarnet/common-test/build.gradle b/solarnet/common-test/build.gradle
@@ -14,7 +14,7 @@ dependencyManagement {
 }
 
 description = 'SolarNet: Common Test'
-version = '1.2.0'
+version = '2.0.0'
 
 base {
 	archivesName = 'solarnet-common-test'

diff --git a/solarnet/common/build.gradle b/solarnet/common/build.gradle
@@ -14,7 +14,7 @@ dependencyManagement {
 }
 
 description = 'SolarNet: Common'
-version = '1.18.0'
+version = '2.0.0'
 
 base {
 	archivesName = 'solarnet-common'

diff --git a/solarnet/common/src/main/java/net/solarnetwork/central/web/PingController.java b/solarnet/common/src/main/java/net/solarnetwork/central/web/PingController.java
@@ -36,6 +36,7 @@
 import java.util.concurrent.TimeoutException;
 import org.springframework.http.MediaType;
 import org.springframework.scheduling.concurrent.CustomizableThreadFactory;
+import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -51,8 +52,9 @@
  * the results.
  * 
  * @author matt
- * @version 3.0
+ * @version 3.1
  */
+@Controller
 @RequestMapping("/ping")
 public class PingController {
 

diff --git a/solarnet/datum/build.gradle b/solarnet/datum/build.gradle
@@ -14,7 +14,7 @@ dependencyManagement {
 }
 
 description = 'SolarNet: Datum'
-version = '1.16.0'
+version = '2.0.0'
 
 base {
 	archivesName = 'solarnet-datum'

diff --git a/solarnet/dnp3/build.gradle b/solarnet/dnp3/build.gradle
@@ -14,7 +14,7 @@ dependencyManagement {
 }
 
 description = 'SolarNet: DNP3'
-version = '1.0.0'
+version = '2.0.0'
 
 base {
 	archivesName = 'solarnet-dnp3'

diff --git a/solarnet/instructor/build.gradle b/solarnet/instructor/build.gradle
@@ -14,7 +14,7 @@ dependencyManagement {
 }
 
 description = 'SolarNet: Instructor'
-version = '1.5.0'
+version = '2.0.0'
 
 base {
 	archivesName = 'solarnet-instructor'

diff --git a/solarnet/net-proxy/build.gradle b/solarnet/net-proxy/build.gradle
@@ -14,7 +14,7 @@ dependencyManagement {
 }
 
 description = 'SolarNet: Network Proxy'
-version = '1.0.0'
+version = '2.0.0'
 
 base {
 	archivesName = 'solarnet-net-proxy'

diff --git a/solarnet/ocpp/build.gradle b/solarnet/ocpp/build.gradle
@@ -14,7 +14,7 @@ dependencyManagement {
 }
 
 description = 'SolarNet: OCPP'
-version = '1.15.0'
+version = '2.0.0'
 
 base {
 	archivesName = 'solarnet-ocpp'

diff --git a/solarnet/oscp-fp/build.gradle b/solarnet/oscp-fp/build.gradle
@@ -9,7 +9,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 description = 'SolarOSCP Flexibility Provider'
-version = '1.8.0'
+version = '2.0.0'
 
 base {
 	archivesName = 'solaroscp-fp'

diff --git a/solarnet/oscp-fp/src/main/java/net/solarnetwork/central/oscp/fp/config/WebConfig.java b/solarnet/oscp-fp/src/main/java/net/solarnetwork/central/oscp/fp/config/WebConfig.java
@@ -29,6 +29,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
@@ -60,6 +61,7 @@ public PingController pingController() {
 		return controller;
 	}
 
+	@Controller
 	@RequestMapping("/ping")
 	static class SolarOscpFpPingController extends PingController {
 		// nothing new

diff --git a/solarnet/oscp-sim-cp/build.gradle b/solarnet/oscp-sim-cp/build.gradle
@@ -9,7 +9,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 description = 'SolarOSCP Capacity Provider Simulator'
-version = '1.0.0'
+version = '2.0.0'
 
 base {
 	archivesName = 'solaroscp-sim-cp'

diff --git a/solarnet/oscp-sim-cp/src/main/java/net/solarnetwork/oscp/sim/cp/config/WebConfig.java b/solarnet/oscp-sim-cp/src/main/java/net/solarnetwork/oscp/sim/cp/config/WebConfig.java
@@ -29,6 +29,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
@@ -60,6 +61,7 @@ public PingController pingController() {
 		return controller;
 	}
 
+	@Controller
 	@RequestMapping("/ping")
 	static class SolarOscpSimCpPingController extends PingController {
 		// nothing new

diff --git a/solarnet/oscp/build.gradle b/solarnet/oscp/build.gradle
@@ -14,7 +14,7 @@ dependencyManagement {
 }
 
 description = 'SolarNet: OSCP'
-version = '1.8.0'
+version = '2.0.0'
 
 base {
 	archivesName = 'solarnet-oscp'

diff --git a/solarnet/solardnp3/build.gradle b/solarnet/solardnp3/build.gradle
@@ -9,7 +9,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 description = 'SolarDNP3'
-version = '1.1.0'
+version = '2.0.0'
 
 base {
 	archivesName = 'solardnp3'

diff --git a/solarnet/solardnp3/src/main/java/net/solarnetwork/central/dnp3/app/config/WebConfig.java b/solarnet/solardnp3/src/main/java/net/solarnetwork/central/dnp3/app/config/WebConfig.java
@@ -28,6 +28,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
@@ -56,6 +57,7 @@ public PingController pingController() {
 		return controller;
 	}
 
+	@Controller
 	@RequestMapping("/ping")
 	static class SolarDnp3PingController extends PingController {
 		// nothing new

diff --git a/solarnet/solarflux-vernemq-webhook/build.gradle b/solarnet/solarflux-vernemq-webhook/build.gradle
@@ -8,6 +8,9 @@ apply plugin: 'java'
 apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
+description = 'SolarFlux VerneMQ Webhook'
+version = '2.0.0'
+
 configurations {
 	all*.exclude group: 'com.amazonaws'
 	all*.exclude group: 'com.fasterxml.jackson.datatype', module: 'jackson-datatype-joda'

diff --git a/solarnet/solarin/build.gradle b/solarnet/solarin/build.gradle
@@ -9,7 +9,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 description = 'SolarIn'
-version = '1.16.1'
+version = '2.0.0'
 
 base {
 	archivesName = 'solarin'

diff --git a/solarnet/solarjobs/build.gradle b/solarnet/solarjobs/build.gradle
@@ -9,7 +9,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 description = 'SolarJobs'
-version = '1.10.0'
+version = '2.0.0'
 
 base {
 	archivesName = 'solarjobs'

diff --git a/solarnet/solarocpp/build.gradle b/solarnet/solarocpp/build.gradle
@@ -9,7 +9,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 description = 'SolarOCPP'
-version = '1.5.0'
+version = '2.0.0'
 
 base {
 	archivesName = 'solarocpp'

diff --git a/solarnet/solarquery/build.gradle b/solarnet/solarquery/build.gradle
@@ -9,7 +9,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 description = 'SolarQuery'
-version = '1.11.0'
+version = '2.0.0'
 
 base {
 	archivesName = 'solarquery'

diff --git a/solarnet/solaruser/build.gradle b/solarnet/solaruser/build.gradle
@@ -11,7 +11,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 description = 'SolarUser'
-version = '1.22.1'
+version = '2.0.0'
 
 base {
 	archivesName = 'solaruser'

diff --git a/solarnet/user-billing/build.gradle b/solarnet/user-billing/build.gradle
@@ -14,7 +14,7 @@ dependencyManagement {
 }
 
 description = 'SolarNet: User Billing'
-version = '1.6.0'
+version = '2.0.0'
 
 base {
 	archivesName = 'solarnet-user-billing'

diff --git a/solarnet/user-datum/build.gradle b/solarnet/user-datum/build.gradle
@@ -14,7 +14,7 @@ dependencyManagement {
 }
 
 description = 'SolarNet: User Datum'
-version = '1.4.0'
+version = '2.0.0'
 
 base {
 	archivesName = 'solarnet-user-datum'

diff --git a/solarnet/user-dnp3/build.gradle b/solarnet/user-dnp3/build.gradle
@@ -14,7 +14,7 @@ dependencyManagement {
 }
 
 description = 'SolarNet: User DNP3'
-version = '1.1.0'
+version = '2.0.0'
 
 base {
 	archivesName = 'solarnet-user-dnp3'

diff --git a/solarnet/user-ocpp/build.gradle b/solarnet/user-ocpp/build.gradle
@@ -14,7 +14,7 @@ dependencyManagement {
 }
 
 description = 'SolarNet: User OCPP'
-version = '1.4.0'
+version = '2.0.0'
 
 base {
 	archivesName = 'solarnet-user-ocpp'

diff --git a/solarnet/user-oscp/build.gradle b/solarnet/user-oscp/build.gradle
@@ -14,7 +14,7 @@ dependencyManagement {
 }
 
 description = 'SolarNet: User OSCP'
-version = '1.1.1'
+version = '2.0.0'
 
 base {
 	archivesName = 'solarnet-user-oscp'

diff --git a/solarnet/user/build.gradle b/solarnet/user/build.gradle
@@ -14,7 +14,7 @@ dependencyManagement {
 }
 
 description = 'SolarNet: User'
-version = '1.5.0'
+version = '2.0.0'
 
 base {
 	archivesName = 'solarnet-user'

diff --git a/solarnet/user/src/main/java/net/solarnetwork/central/user/pki/dogtag/SSLContextFactory.java b/solarnet/user/src/main/java/net/solarnetwork/central/user/pki/dogtag/SSLContextFactory.java
@@ -50,6 +50,7 @@
 import org.springframework.core.io.Resource;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.http.converter.xml.SourceHttpMessageConverter;
 import org.springframework.web.client.RestOperations;
 import org.springframework.web.client.RestTemplate;
 import net.solarnetwork.service.CertificateException;
@@ -127,6 +128,12 @@ public RestOperations createRestOps() {
 			restTemplate.getInterceptors().add(new LoggingHttpRequestInterceptor());
 		}
 
+		// Spring 6 no longer includes SourceHttpMessageConverter by default, but we rely on that
+		if ( restTemplate.getMessageConverters().stream()
+				.filter(c -> c instanceof SourceHttpMessageConverter<?>).findAny().isEmpty() ) {
+			restTemplate.getMessageConverters().add(0, new SourceHttpMessageConverter<>());
+		}
+
 		return restTemplate;
 	}