TP-963: Update Gigaspaces to 16.1.0 and Spring Framework to 5.3.7 (#123)

* TP-963: Update Gigaspaces to 16.1.0 and Spring Framework to 5.3.7 * Update Maven compiler plugin to 3.10.0, see https://github.com/apache/maven-compiler-plugin/releases/tag/maven-compiler-plugin-3.10.0 Do not add asm dependency to compiler * Update maven-jar-plugin to 3.2.2, see https://github.com/apache/maven-jar-plugin/releases/tag/maven-jar-plugin-3.2.2 * Use gs-test version 2.0.0 release
AvanzaBank · Feb 18, 2022 · cdd3aa1 · cdd3aa1
1 parent bfe4e4f
commit cdd3aa1
Show file tree

Hide file tree

Showing 35 changed files with 179 additions and 290 deletions.
diff --git a/astrix-context/pom.xml b/astrix-context/pom.xml
@@ -56,7 +56,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-library</artifactId>
+			<artifactId>hamcrest</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/astrix-contracts/pom.xml b/astrix-contracts/pom.xml
@@ -22,5 +22,9 @@
 		<groupId>junit</groupId>
 		<artifactId>junit</artifactId>
 	</dependency>
+	  <dependency>
+		  <groupId>org.hamcrest</groupId>
+		  <artifactId>hamcrest</artifactId>
+	  </dependency>
   </dependencies>
 </project>
diff --git a/astrix-core/pom.xml b/astrix-core/pom.xml
@@ -15,5 +15,10 @@
 	  		<artifactId>junit</artifactId>
 	  		<scope>test</scope>
 	  	</dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/astrix-fault-tolerance/pom.xml b/astrix-fault-tolerance/pom.xml
@@ -32,7 +32,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-library</artifactId>
+			<artifactId>hamcrest</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -46,10 +46,5 @@
 			<artifactId>log4j-slf4j-impl</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-1.2-api</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/astrix-fault-tolerance/src/test/java/com/avanza/astrix/ft/hystrix/HystrixSpike.java b/astrix-fault-tolerance/src/test/java/com/avanza/astrix/ft/hystrix/HystrixSpike.java
@@ -18,9 +18,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.avanza.astrix.context.AstrixContext;
 import com.avanza.astrix.context.TestAstrixConfigurer;
@@ -32,9 +30,7 @@
 public class HystrixSpike {
 
 	public static void main(String[] args) throws Exception {
-		BasicConfigurator.configure();
-		Logger.getRootLogger().setLevel(Level.INFO);
-		Logger.getLogger(HystrixBeanFaultTolerance.class).info("HELL");
+		LoggerFactory.getLogger(HystrixBeanFaultTolerance.class).info("HELL");
 		TestAstrixConfigurer astrix = new TestAstrixConfigurer();
 		astrix.enableFaultTolerance(true);
 		astrix.registerApiProvider(PingApi.class);

diff --git a/astrix-fault-tolerance/src/test/resources/log4j2.xml b/astrix-fault-tolerance/src/test/resources/log4j2.xml
@@ -9,7 +9,10 @@
     <Logger name="com.avanza" level="warn" additivity="false">
         <AppenderRef ref="Console" />
     </Logger>
-    <Root level="warn">
+    <Logger name="com.avanza.astrix.ft.hystrix.HystrixBeanFaultTolerance" level="info" additivity="false">
+        <AppenderRef ref="Console" />
+    </Logger>
+    <Root level="info">
         <AppenderRef ref="Console" />
     </Root>
 </Loggers>

diff --git a/astrix-gs/pom.xml b/astrix-gs/pom.xml
@@ -76,6 +76,11 @@
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>

diff --git a/astrix-http/pom.xml b/astrix-http/pom.xml
@@ -18,16 +18,22 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpasyncclient</artifactId>
-			<version>4.1</version>
+			<version>4.1.4</version>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.1.0</version>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
+			<version>4.0.4</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest</artifactId>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	<build>

diff --git a/astrix-integration-tests/pom.xml b/astrix-integration-tests/pom.xml
@@ -56,7 +56,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-library</artifactId>
+			<artifactId>hamcrest</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -69,12 +69,6 @@
 			<artifactId>log4j-slf4j-impl</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-1.2-api</artifactId>
-			<scope>test</scope>
-		</dependency>
-
 	</dependencies>
 	<build>
 		<plugins>

diff --git a/...egration-tests/src/test/java/com/avanza/astrix/integration/tests/LunchGraderPuRunner.java b/...egration-tests/src/test/java/com/avanza/astrix/integration/tests/LunchGraderPuRunner.java
@@ -17,8 +17,6 @@
 
 import java.io.IOException;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
 import com.avanza.astrix.beans.core.AstrixSettings;
 import com.avanza.astrix.config.GlobalConfigSourceRegistry;
 import com.avanza.astrix.config.MapConfigSource;
@@ -29,7 +27,6 @@
 public class LunchGraderPuRunner {
 
 	public static void main(String[] args) throws IOException {
-		Logger.getRootLogger().setLevel(Level.INFO);
 		System.setProperty("com.gs.jini_lus.groups", "lunch-grader-pu");
 		MapConfigSource settings = new MapConfigSource();
 		settings.set(AstrixSettings.SERVICE_REGISTRY_URI, AstrixServiceComponentNames.GS_REMOTING + ":jini://*/*/service-registry-space?groups=service-registry");

diff --git a/...ix-integration-tests/src/test/java/com/avanza/astrix/integration/tests/LunchPuRunner.java b/...ix-integration-tests/src/test/java/com/avanza/astrix/integration/tests/LunchPuRunner.java
@@ -17,8 +17,6 @@
 
 import java.io.IOException;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
 import com.avanza.astrix.beans.core.AstrixSettings;
 import com.avanza.astrix.config.GlobalConfigSourceRegistry;
 import com.avanza.astrix.config.MapConfigSource;
@@ -29,7 +27,6 @@
 public class LunchPuRunner {
 
 	public static void main(String[] args) throws IOException {
-		Logger.getRootLogger().setLevel(Level.INFO);
 		System.setProperty("com.gs.jini_lus.groups", "lunch-pu");
 		MapConfigSource settings = new MapConfigSource();
 		settings.set(AstrixSettings.SERVICE_REGISTRY_URI, AstrixServiceComponentNames.GS_REMOTING + ":jini://*/*/service-registry-space?groups=service-registry");

diff --git a/astrix-metrics/pom.xml b/astrix-metrics/pom.xml
@@ -33,7 +33,7 @@
 
 		<dependency>
 			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-library</artifactId>
+			<artifactId>hamcrest</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

diff --git a/astrix-metrics/src/main/java/com/avanza/astrix/metrics/DropwizardMetrics.java b/astrix-metrics/src/main/java/com/avanza/astrix/metrics/DropwizardMetrics.java
@@ -41,7 +41,7 @@ public TimerSpi createTimer() {
 	}
 
 	static class TimerAdapter implements TimerSpi {
-		private Timer timer;
+		private final Timer timer;
 		public TimerAdapter(Timer timer) {
 			this.timer = timer;
 		}
@@ -68,7 +68,7 @@ public <T> Supplier<Observable<T>> timeObservable(final Supplier<Observable<T>>
 
 		@Override
 		public TimerSnaphot getSnapshot() {
-			// Rates are are in seconds by default
+			// Rates are in seconds by default
 			// Duration are in NANO_SECONDS
 			TimeUnit rateUnit = TimeUnit.SECONDS;
 			TimeUnit durationUnit = TimeUnit.MILLISECONDS;

diff --git a/astrix-modules/pom.xml b/astrix-modules/pom.xml
@@ -26,7 +26,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/astrix-netty-remoting/pom.xml b/astrix-netty-remoting/pom.xml
@@ -18,20 +18,25 @@
 			<groupId>io.netty</groupId>
 			<artifactId>netty-all</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-slf4j-impl</artifactId>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	<build>

diff --git a/astrix-remoting/pom.xml b/astrix-remoting/pom.xml
@@ -18,11 +18,6 @@
 			<groupId>io.reactivex</groupId>
 			<artifactId>rxjava</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-slf4j-impl</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
@@ -41,13 +36,18 @@
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-library</artifactId>
+			<artifactId>hamcrest</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/astrix-service-registry/pom.xml b/astrix-service-registry/pom.xml
@@ -36,6 +36,11 @@
 		<artifactId>junit</artifactId>
 		<scope>test</scope>
 	</dependency>
+	  <dependency>
+		  <groupId>org.hamcrest</groupId>
+		  <artifactId>hamcrest</artifactId>
+		  <scope>test</scope>
+	  </dependency>
 	  <dependency>
 		  <groupId>org.apache.logging.log4j</groupId>
 		  <artifactId>log4j-slf4j-impl</artifactId>

diff --git a/astrix-spring/pom.xml b/astrix-spring/pom.xml
@@ -39,7 +39,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-library</artifactId>
+			<artifactId>hamcrest</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/astrix-test-support-common/pom.xml b/astrix-test-support-common/pom.xml
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
+            <artifactId>hamcrest</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/astrix-test-support-junit4/pom.xml b/astrix-test-support-junit4/pom.xml
@@ -17,6 +17,10 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>astrix-test-support-common</artifactId>

diff --git a/astrix-test-util/pom.xml b/astrix-test-util/pom.xml
@@ -19,7 +19,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-core</artifactId>
+			<artifactId>hamcrest</artifactId>
 		</dependency>
 	</dependencies>
 	<build>

diff --git a/astrix-versioning/pom.xml b/astrix-versioning/pom.xml
@@ -24,5 +24,10 @@
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>