From cdd3aa1de6684371e9eeb2657445981294043626 Mon Sep 17 00:00:00 2001 From: Daniel Bergholm <861482+ath0s@users.noreply.github.com> Date: Fri, 18 Feb 2022 11:30:53 +0100 Subject: [PATCH] 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 --- astrix-context/pom.xml | 2 +- astrix-contracts/pom.xml | 4 + astrix-core/pom.xml | 5 + astrix-fault-tolerance/pom.xml | 7 +- .../astrix/ft/hystrix/HystrixSpike.java | 8 +- .../src/test/resources/log4j2.xml | 5 +- astrix-gs/pom.xml | 5 + astrix-http/pom.xml | 14 ++- astrix-integration-tests/pom.xml | 8 +- .../tests/LunchGraderPuRunner.java | 3 - .../integration/tests/LunchPuRunner.java | 3 - astrix-metrics/pom.xml | 2 +- .../astrix/metrics/DropwizardMetrics.java | 4 +- astrix-modules/pom.xml | 2 +- astrix-netty-remoting/pom.xml | 13 ++- astrix-remoting/pom.xml | 12 +-- astrix-service-registry/pom.xml | 5 + astrix-spring/pom.xml | 2 +- astrix-test-support-common/pom.xml | 2 +- astrix-test-support-junit4/pom.xml | 4 + astrix-test-util/pom.xml | 2 +- astrix-versioning/pom.xml | 5 + doc-snippets/pom.xml | 26 ++--- .../java/tutorial/p3/LunchServicePuTest.java | 11 +- .../src/main/java/runners/LunchPuRunner.java | 3 - .../src/main/resources/log4j2.xml | 16 +++ .../lunch-grader-pu/pom.xml | 5 +- .../java/lunch/grader/pu/LunchClient.java | 10 +- .../src/test/resources/log4j2.xml | 16 +++ examples/lunch-web/pom.xml | 88 ++------------- .../src/main/java/lunch/web/WebAppConfig.java | 11 +- .../lunch-web/src/main/resources/log4j2.xml | 16 +++ examples/pom.xml | 100 ++---------------- pom.xml | 49 ++++----- .../trading-api-parent/trading-pu/pom.xml | 1 + 35 files changed, 179 insertions(+), 290 deletions(-) create mode 100644 examples/example-application-runners/src/main/resources/log4j2.xml create mode 100644 examples/lunch-grader-parent/lunch-grader-pu/src/test/resources/log4j2.xml create mode 100644 examples/lunch-web/src/main/resources/log4j2.xml diff --git a/astrix-context/pom.xml b/astrix-context/pom.xml index 12e5c4183..16fff011d 100644 --- a/astrix-context/pom.xml +++ b/astrix-context/pom.xml @@ -56,7 +56,7 @@ org.hamcrest - hamcrest-library + hamcrest test diff --git a/astrix-contracts/pom.xml b/astrix-contracts/pom.xml index 2e55f8401..61af17a44 100644 --- a/astrix-contracts/pom.xml +++ b/astrix-contracts/pom.xml @@ -22,5 +22,9 @@ junit junit + + org.hamcrest + hamcrest + \ No newline at end of file diff --git a/astrix-core/pom.xml b/astrix-core/pom.xml index 24df0064d..65fade2dd 100644 --- a/astrix-core/pom.xml +++ b/astrix-core/pom.xml @@ -15,5 +15,10 @@ junit test + + org.hamcrest + hamcrest + test + \ No newline at end of file diff --git a/astrix-fault-tolerance/pom.xml b/astrix-fault-tolerance/pom.xml index 7bae8e25d..5acf91354 100644 --- a/astrix-fault-tolerance/pom.xml +++ b/astrix-fault-tolerance/pom.xml @@ -32,7 +32,7 @@ org.hamcrest - hamcrest-library + hamcrest test @@ -46,10 +46,5 @@ log4j-slf4j-impl test - - org.apache.logging.log4j - log4j-1.2-api - test - 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 index fff303c78..50cbb4fb7 100644 --- 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 index e946cf67d..3d8482c55 100644 --- a/astrix-fault-tolerance/src/test/resources/log4j2.xml +++ b/astrix-fault-tolerance/src/test/resources/log4j2.xml @@ -9,7 +9,10 @@ - + + + + diff --git a/astrix-gs/pom.xml b/astrix-gs/pom.xml index c039d1497..ff17308aa 100644 --- a/astrix-gs/pom.xml +++ b/astrix-gs/pom.xml @@ -76,6 +76,11 @@ junit test + + org.hamcrest + hamcrest + test + org.mockito mockito-core diff --git a/astrix-http/pom.xml b/astrix-http/pom.xml index b40efb641..e5dbae286 100644 --- a/astrix-http/pom.xml +++ b/astrix-http/pom.xml @@ -18,16 +18,22 @@ org.apache.httpcomponents httpasyncclient - 4.1 + 4.1.4 - javax.servlet - javax.servlet-api - 3.1.0 + jakarta.servlet + jakarta.servlet-api + 4.0.4 junit junit + test + + + org.hamcrest + hamcrest + test diff --git a/astrix-integration-tests/pom.xml b/astrix-integration-tests/pom.xml index 0fbda8303..42b661237 100644 --- a/astrix-integration-tests/pom.xml +++ b/astrix-integration-tests/pom.xml @@ -56,7 +56,7 @@ org.hamcrest - hamcrest-library + hamcrest test @@ -69,12 +69,6 @@ log4j-slf4j-impl test - - org.apache.logging.log4j - log4j-1.2-api - test - - diff --git a/astrix-integration-tests/src/test/java/com/avanza/astrix/integration/tests/LunchGraderPuRunner.java b/astrix-integration-tests/src/test/java/com/avanza/astrix/integration/tests/LunchGraderPuRunner.java index 6115d197a..93469c2ae 100644 --- a/astrix-integration-tests/src/test/java/com/avanza/astrix/integration/tests/LunchGraderPuRunner.java +++ b/astrix-integration-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/astrix-integration-tests/src/test/java/com/avanza/astrix/integration/tests/LunchPuRunner.java b/astrix-integration-tests/src/test/java/com/avanza/astrix/integration/tests/LunchPuRunner.java index 4f281566c..3072c860f 100644 --- a/astrix-integration-tests/src/test/java/com/avanza/astrix/integration/tests/LunchPuRunner.java +++ b/astrix-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 index 0834db838..2fea040a9 100644 --- a/astrix-metrics/pom.xml +++ b/astrix-metrics/pom.xml @@ -33,7 +33,7 @@ org.hamcrest - hamcrest-library + hamcrest test 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 index 09b197358..e3414c6cd 100644 --- 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 Supplier> timeObservable(final Supplier> @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 index e42357b58..303ebb6ec 100644 --- a/astrix-modules/pom.xml +++ b/astrix-modules/pom.xml @@ -26,7 +26,7 @@ org.hamcrest - hamcrest-library + hamcrest test diff --git a/astrix-netty-remoting/pom.xml b/astrix-netty-remoting/pom.xml index 8c955a636..b111dac80 100644 --- a/astrix-netty-remoting/pom.xml +++ b/astrix-netty-remoting/pom.xml @@ -18,6 +18,10 @@ io.netty netty-all + + org.slf4j + slf4j-api + junit @@ -25,13 +29,14 @@ test - org.apache.logging.log4j - log4j-slf4j-impl + org.hamcrest + hamcrest test - org.slf4j - slf4j-api + org.apache.logging.log4j + log4j-slf4j-impl + test diff --git a/astrix-remoting/pom.xml b/astrix-remoting/pom.xml index 99bf1cf1a..0fb48a570 100644 --- a/astrix-remoting/pom.xml +++ b/astrix-remoting/pom.xml @@ -18,11 +18,6 @@ io.reactivex rxjava - - org.apache.logging.log4j - log4j-slf4j-impl - test - org.slf4j slf4j-api @@ -41,7 +36,7 @@ org.hamcrest - hamcrest-library + hamcrest test @@ -49,5 +44,10 @@ mockito-core test + + org.apache.logging.log4j + log4j-slf4j-impl + test + \ No newline at end of file diff --git a/astrix-service-registry/pom.xml b/astrix-service-registry/pom.xml index a656b3279..962d83af7 100644 --- a/astrix-service-registry/pom.xml +++ b/astrix-service-registry/pom.xml @@ -36,6 +36,11 @@ junit test + + org.hamcrest + hamcrest + test + org.apache.logging.log4j log4j-slf4j-impl diff --git a/astrix-spring/pom.xml b/astrix-spring/pom.xml index 4c8aa812d..711cdc54b 100644 --- a/astrix-spring/pom.xml +++ b/astrix-spring/pom.xml @@ -39,7 +39,7 @@ org.hamcrest - hamcrest-library + hamcrest test diff --git a/astrix-test-support-common/pom.xml b/astrix-test-support-common/pom.xml index b3aeee3ba..9223a2b58 100644 --- a/astrix-test-support-common/pom.xml +++ b/astrix-test-support-common/pom.xml @@ -29,7 +29,7 @@ org.hamcrest - hamcrest-core + hamcrest \ No newline at end of file diff --git a/astrix-test-support-junit4/pom.xml b/astrix-test-support-junit4/pom.xml index f400e1bea..2321417cb 100644 --- a/astrix-test-support-junit4/pom.xml +++ b/astrix-test-support-junit4/pom.xml @@ -17,6 +17,10 @@ junit junit + + org.hamcrest + hamcrest + ${project.groupId} astrix-test-support-common diff --git a/astrix-test-util/pom.xml b/astrix-test-util/pom.xml index b66aca957..866d616e7 100644 --- a/astrix-test-util/pom.xml +++ b/astrix-test-util/pom.xml @@ -19,7 +19,7 @@ org.hamcrest - hamcrest-core + hamcrest diff --git a/astrix-versioning/pom.xml b/astrix-versioning/pom.xml index 385e20269..1a6051575 100644 --- a/astrix-versioning/pom.xml +++ b/astrix-versioning/pom.xml @@ -24,5 +24,10 @@ junit test + + org.hamcrest + hamcrest + test + \ No newline at end of file diff --git a/doc-snippets/pom.xml b/doc-snippets/pom.xml index 7d667035c..46e3d2687 100644 --- a/doc-snippets/pom.xml +++ b/doc-snippets/pom.xml @@ -15,14 +15,19 @@ ${project.groupId} - astrix-service-registry + astrix-gs ${project.version} - test ${project.groupId} - astrix-gs + astrix-versioning + ${project.version} + + + ${project.groupId} + astrix-service-registry ${project.version} + test com.avanza.gs @@ -35,29 +40,24 @@ ${project.version} test - - ${project.groupId} - astrix-versioning - ${project.version} - junit junit test - org.mockito - mockito-core + org.hamcrest + hamcrest test - org.apache.logging.log4j - log4j-slf4j-impl + org.mockito + mockito-core test org.apache.logging.log4j - log4j-1.2-api + log4j-slf4j-impl test diff --git a/doc-snippets/src/test/java/tutorial/p3/LunchServicePuTest.java b/doc-snippets/src/test/java/tutorial/p3/LunchServicePuTest.java index 42af66810..8f46e14af 100644 --- a/doc-snippets/src/test/java/tutorial/p3/LunchServicePuTest.java +++ b/doc-snippets/src/test/java/tutorial/p3/LunchServicePuTest.java @@ -19,12 +19,9 @@ import javax.annotation.PostConstruct; -import org.apache.log4j.BasicConfigurator; import org.junit.ClassRule; import org.junit.Test; -import tutorial.p3.api.LunchService; - import com.avanza.astrix.beans.core.AstrixSettings; import com.avanza.astrix.beans.registry.InMemoryServiceRegistry; import com.avanza.astrix.context.AstrixConfigurer; @@ -32,9 +29,11 @@ import com.avanza.gs.test.PuConfigurers; import com.avanza.gs.test.RunningPu; +import tutorial.p3.api.LunchService; + public class LunchServicePuTest { - public static InMemoryServiceRegistry serviceRegistry = new InMemoryServiceRegistry(); + private static InMemoryServiceRegistry serviceRegistry = new InMemoryServiceRegistry(); @ClassRule public static RunningPu lunchPu = PuConfigurers.partitionedPu("classpath:/META-INF/spring/p3/lunch-pu.xml") @@ -48,10 +47,6 @@ public void destroy() { astrix.destroy(); } - static { - BasicConfigurator.configure(); - } - @Test public void testName() throws Exception { AstrixConfigurer astrixConfigurer = new AstrixConfigurer(); diff --git a/examples/example-application-runners/src/main/java/runners/LunchPuRunner.java b/examples/example-application-runners/src/main/java/runners/LunchPuRunner.java index 292801065..5d1212240 100644 --- a/examples/example-application-runners/src/main/java/runners/LunchPuRunner.java +++ b/examples/example-application-runners/src/main/java/runners/LunchPuRunner.java @@ -15,8 +15,6 @@ */ package runners; -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; @@ -30,7 +28,6 @@ public static void main(String[] args) { System.setProperty(AstrixSettings.EXPORT_ASTRIX_MBEANS.name(), "true"); System.setProperty("configSourceId", GlobalConfigSourceRegistry.register(mapConfigSource)); PuApp.run("classpath:/META-INF/spring/lunch-pu.xml"); - Logger.getLogger("com.avanza").setLevel(Level.DEBUG); } } diff --git a/examples/example-application-runners/src/main/resources/log4j2.xml b/examples/example-application-runners/src/main/resources/log4j2.xml new file mode 100644 index 000000000..a241b62fa --- /dev/null +++ b/examples/example-application-runners/src/main/resources/log4j2.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/lunch-grader-parent/lunch-grader-pu/pom.xml b/examples/lunch-grader-parent/lunch-grader-pu/pom.xml index ef334b7d1..0fac9b1c1 100644 --- a/examples/lunch-grader-parent/lunch-grader-pu/pom.xml +++ b/examples/lunch-grader-parent/lunch-grader-pu/pom.xml @@ -75,10 +75,7 @@ org.apache.logging.log4j log4j-slf4j-impl - - - org.apache.logging.log4j - log4j-1.2-api + runtime diff --git a/examples/lunch-grader-parent/lunch-grader-pu/src/test/java/lunch/grader/pu/LunchClient.java b/examples/lunch-grader-parent/lunch-grader-pu/src/test/java/lunch/grader/pu/LunchClient.java index 193480588..11b2c2ea8 100644 --- a/examples/lunch-grader-parent/lunch-grader-pu/src/test/java/lunch/grader/pu/LunchClient.java +++ b/examples/lunch-grader-parent/lunch-grader-pu/src/test/java/lunch/grader/pu/LunchClient.java @@ -15,19 +15,15 @@ */ package lunch.grader.pu; -import lunch.api.LunchRestaurant; -import lunch.api.LunchService; - -import org.apache.log4j.Level; -import org.apache.log4j.Logger; - import com.avanza.astrix.context.AstrixConfigurer; import com.avanza.astrix.context.AstrixContext; +import lunch.api.LunchRestaurant; +import lunch.api.LunchService; + public class LunchClient { public static void main(String[] args) throws InterruptedException { - Logger.getLogger("com.avanza.astrix").setLevel(Level.DEBUG); AstrixConfigurer configurer = new AstrixConfigurer(); AstrixContext AstrixContext = configurer.configure(); LunchService lunchService = AstrixContext.waitForBean(LunchService.class, 5000); diff --git a/examples/lunch-grader-parent/lunch-grader-pu/src/test/resources/log4j2.xml b/examples/lunch-grader-parent/lunch-grader-pu/src/test/resources/log4j2.xml new file mode 100644 index 000000000..20d922723 --- /dev/null +++ b/examples/lunch-grader-parent/lunch-grader-pu/src/test/resources/log4j2.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/lunch-web/pom.xml b/examples/lunch-web/pom.xml index 7548845eb..3549babf6 100644 --- a/examples/lunch-web/pom.xml +++ b/examples/lunch-web/pom.xml @@ -8,8 +8,7 @@ lunch-web - 2.1.5.RELEASE - 5.1.7.RELEASE + 2.5.0 @@ -17,7 +16,6 @@ org.springframework.boot spring-boot-starter-web - ${spring.boot.version} org.springframework.boot @@ -28,7 +26,6 @@ org.springframework.boot spring-boot-starter-jetty - ${spring.boot.version} @@ -69,10 +66,7 @@ org.apache.logging.log4j log4j-slf4j-impl - - - org.apache.logging.log4j - log4j-1.2-api + runtime @@ -101,78 +95,10 @@ org.springframework.boot - spring-boot-versions + spring-boot-dependencies ${spring.boot.version} - - - ${spring.groupId} - spring-beans - ${spring.version} - - - ${spring.groupId} - spring-core - ${spring.version} - - - ${spring.groupId} - spring-expression - ${spring.version} - - - ${spring.groupId} - spring-jdbc - ${spring.version} - - - ${spring.groupId} - spring-context - ${spring.version} - - - ${spring.groupId} - spring-web - ${spring.version} - - - ${spring.groupId} - spring-orm - ${spring.version} - - - ${spring.groupId} - spring-oxm - ${spring.version} - - - ${spring.groupId} - spring-webmvc - ${spring.version} - - - ${spring.groupId} - spring-aop - ${spring.version} - - - ${spring.groupId} - spring-test - ${spring.version} - - - ${spring.groupId} - spring-context-support - ${spring.version} - - - ${spring.groupId} - spring-tx - ${spring.version} - - - ${spring.groupId} - spring-aspects - ${spring.version} + pom + import @@ -193,9 +119,7 @@ repackage - - executable - + executable diff --git a/examples/lunch-web/src/main/java/lunch/web/WebAppConfig.java b/examples/lunch-web/src/main/java/lunch/web/WebAppConfig.java index a3159943e..037332142 100644 --- a/examples/lunch-web/src/main/java/lunch/web/WebAppConfig.java +++ b/examples/lunch-web/src/main/java/lunch/web/WebAppConfig.java @@ -15,24 +15,21 @@ */ package lunch.web; -import lunch.api.LunchService; -import lunch.api.LunchUtil; -import lunch.grader.api.LunchRestaurantGrader; - -import org.apache.log4j.BasicConfigurator; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import com.avanza.astrix.spring.AstrixFrameworkBean; +import lunch.api.LunchService; +import lunch.api.LunchUtil; +import lunch.grader.api.LunchRestaurantGrader; + @Configuration public class WebAppConfig { @Bean public AstrixFrameworkBean astrixFrameworkBean() { - BasicConfigurator.configure(); - org.apache.log4j.Logger.getLogger("com.avanza.astrix").setLevel(org.apache.log4j.Level.DEBUG); AstrixFrameworkBean result = new AstrixFrameworkBean(); result.setSubsystem("lunch-web"); result.setConsumedAstrixBeans(LunchService.class, LunchRestaurantGrader.class, LunchUtil.class); diff --git a/examples/lunch-web/src/main/resources/log4j2.xml b/examples/lunch-web/src/main/resources/log4j2.xml new file mode 100644 index 000000000..20d922723 --- /dev/null +++ b/examples/lunch-web/src/main/resources/log4j2.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/pom.xml b/examples/pom.xml index d8f40f780..edc96b70b 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -66,100 +66,18 @@ astrix-test-util ${project.version} - - - - ${spring.groupId} - spring-beans - ${spring.version} - - - ${spring.groupId} - spring-core - ${spring.version} - - - ${spring.groupId} - spring-expression - ${spring.version} - - - ${spring.groupId} - spring-jdbc - ${spring.version} - - - ${spring.groupId} - spring-context - ${spring.version} - - - ${spring.groupId} - spring-web - ${spring.version} - - - ${spring.groupId} - spring-orm - ${spring.version} - - - ${spring.groupId} - spring-oxm - ${spring.version} - - - ${spring.groupId} - spring-webmvc - ${spring.version} - - - ${spring.groupId} - spring-aop - ${spring.version} - - - ${spring.groupId} - spring-test - ${spring.version} - - - ${spring.groupId} - spring-context-support - ${spring.version} - - - ${spring.groupId} - spring-tx - ${spring.version} - - - ${spring.groupId} - spring-aspects - ${spring.version} - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - ${project.build.sourceEncoding} - true - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + diff --git a/pom.xml b/pom.xml index 83ca3f064..7f7fd1cdc 100644 --- a/pom.xml +++ b/pom.xml @@ -129,35 +129,34 @@ 11 2.17.1 - 5.1.7.RELEASE - org.springframework + 5.3.7 1.7.32 - 14.5.0 + 16.1.0 1.3.8 1.5.18 0.4.1 - 2.11.2 + 2.12.3 4.13.2 - 5.7.2 - 1.3 - 3.8.0 + 5.8.2 + 2.2 + 3.12.4 1.0.0 - 3.1.2 + 4.1.21 4.1.69.Final 0.0.8 0.0.3 - 1.0.1 + 2.0.0 3.2.4 3.3.0 3.1.0 - 3.8.1 + 3.10.0 3.1.2 2.8.1 3.0.0-M1 3.0.0-M4 - 3.2.0 + 3.2.2 2.10.4 3.2.0 3.2.0 @@ -179,8 +178,10 @@ io.dropwizard.metrics - metrics-core + metrics-bom ${dropwizard.version} + pom + import @@ -192,7 +193,7 @@ - ${spring.groupId} + org.springframework spring-framework-bom ${spring.version} pom @@ -267,6 +268,12 @@ junit junit ${junit.version} + + + org.hamcrest + hamcrest-core + + org.junit @@ -277,15 +284,10 @@ org.hamcrest - hamcrest-library + hamcrest ${hamcrest.version} - - org.hamcrest - hamcrest-core - ${hamcrest.version} - - + org.mockito mockito-core @@ -482,13 +484,6 @@ true true - - - org.ow2.asm - asm - 6.2 - - diff --git a/tutorial/trading-api-parent/trading-pu/pom.xml b/tutorial/trading-api-parent/trading-pu/pom.xml index 9199f8a96..561b4f4f4 100644 --- a/tutorial/trading-api-parent/trading-pu/pom.xml +++ b/tutorial/trading-api-parent/trading-pu/pom.xml @@ -25,6 +25,7 @@ org.apache.logging.log4j log4j-slf4j-impl + runtime