[JAVA-18169] Moved rule-engines module to jdk9-and-above profile + Up… (#13505)

* [JAVA-18169] Moved rule-engines module to jdk9-and-above profile + Upgraded dependencies

* [JAVA-18155] Moved libraries-testing module to jdk9-and-above profile

* [JAVA-16395] Moved couchbase module to jdk9-and-above profile

* [JAVA-18155] Upgraded libraries versions

* [JAVA-18181] Moved spring-aop module to jdk9-and-above profile

* [JAVA-18182] Moved spring-aop-2 module to jdk9-and-above profile

* [JAVA-18143] Moved jmeter module to jdk9-and-above profile + testing build

* [JAVA-18181]  testing build

* [JAVA-18181]  Added configuration for war plugin

* [JAVA-18182]  Added maven-war-plugin
This commit is contained in:
panos-kakos 2023-02-23 18:47:39 +02:00 committed by GitHub
parent 8278e57e78
commit 0b7379f60d
9 changed files with 70 additions and 26 deletions

View File

@ -64,11 +64,16 @@
<version>${commons-lang3.version}</version> <version>${commons-lang3.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
</dependencies> </dependencies>
<properties> <properties>
<couchbase.client.version>2.5.0</couchbase.client.version> <couchbase.client.version>2.7.2</couchbase.client.version>
<spring-framework.version>4.3.5.RELEASE</spring-framework.version> <spring-framework.version>5.3.25</spring-framework.version>
</properties> </properties>
</project> </project>

View File

@ -179,17 +179,16 @@
<serenity.version>1.9.9</serenity.version> <serenity.version>1.9.9</serenity.version>
<serenity.jbehave.version>1.9.0</serenity.jbehave.version> <serenity.jbehave.version>1.9.0</serenity.jbehave.version>
<serenity.jira.version>1.9.0</serenity.jira.version> <serenity.jira.version>1.9.0</serenity.jira.version>
<serenity.plugin.version>1.9.27</serenity.plugin.version> <serenity.plugin.version>3.6.12</serenity.plugin.version>
<jsonassert.version>1.5.0</jsonassert.version> <jsonassert.version>1.5.0</jsonassert.version>
<awaitility.version>3.0.0</awaitility.version> <awaitility.version>3.0.0</awaitility.version>
<hoverfly-java.version>0.8.1</hoverfly-java.version> <hoverfly-java.version>0.8.1</hoverfly-java.version>
<spring.version>4.3.8.RELEASE</spring.version> <spring.version>4.3.8.RELEASE</spring.version>
<spring-mock-mvc.version>4.1.1</spring-mock-mvc.version> <spring-mock-mvc.version>5.3.0</spring-mock-mvc.version>
<java-hamcrest.version>2.0.0.0</java-hamcrest.version> <java-hamcrest.version>2.0.0.0</java-hamcrest.version>
<dbunit.version>2.7.0</dbunit.version> <dbunit.version>2.7.0</dbunit.version>
<archunit.version>0.14.1</archunit.version> <archunit.version>0.14.1</archunit.version>
<modelassert.version>1.0.0</modelassert.version> <modelassert.version>1.0.0</modelassert.version>
<h2.version>2.1.214</h2.version>
</properties> </properties>
</project> </project>

47
pom.xml
View File

@ -337,6 +337,7 @@
<!-- <module>clojure</module> --> <!-- Not a maven project --> <!-- <module>clojure</module> --> <!-- Not a maven project -->
<module>core-java-modules</module> <module>core-java-modules</module>
<module>couchbase</module> <module>couchbase</module>
<module>drools</module> <module>drools</module>
@ -360,7 +361,7 @@
<module>jaxb</module> <module>jaxb</module>
<module>jersey</module> <module>jersey</module>
<module>jhipster-5</module> <module>jhipster-5</module>
<module>jmeter</module>
<module>jmh</module> <module>jmh</module>
<module>jsf</module> <module>jsf</module>
@ -378,7 +379,6 @@
<module>libraries-data-db</module> <module>libraries-data-db</module>
<module>libraries-security</module> <module>libraries-security</module>
<module>libraries-server-2</module> <module>libraries-server-2</module>
<module>libraries-testing</module>
<module>logging-modules</module> <module>logging-modules</module>
<module>lombok-modules</module> <module>lombok-modules</module>
@ -400,8 +400,6 @@
<module>performance-tests</module> <module>performance-tests</module>
<module>persistence-modules</module> <module>persistence-modules</module>
<module>rule-engines-modules</module>
<module>security-modules</module> <module>security-modules</module>
<module>vavr-modules</module> <module>vavr-modules</module>
@ -455,7 +453,6 @@
<module>spf4j</module> <module>spf4j</module>
<module>spring-4</module> <module>spring-4</module>
<module>spring-aop</module> <module>spring-aop</module>
<module>spring-aop-2</module>
<module>spring-batch</module> <module>spring-batch</module>
<module>spring-bom</module> <module>spring-bom</module>
<module>spring-boot-modules</module> <module>spring-boot-modules</module>
@ -598,6 +595,7 @@
<module>core-java-modules</module> <module>core-java-modules</module>
<module>couchbase</module> <module>couchbase</module>
<module>drools</module> <module>drools</module>
<!-- <module>ethereum</module> --> <!-- JAVA-6001 --> <!-- <module>ethereum</module> --> <!-- JAVA-6001 -->
<!-- <module>gradle-modules</module> --> <!-- Not a maven project --> <!-- <module>gradle-modules</module> --> <!-- Not a maven project -->
@ -618,7 +616,6 @@
<module>jaxb</module> <module>jaxb</module>
<module>jersey</module> <module>jersey</module>
<module>jhipster-5</module> <module>jhipster-5</module>
<module>jmeter</module>
<module>jmh</module> <module>jmh</module>
<module>jsf</module> <module>jsf</module>
@ -636,7 +633,6 @@
<module>libraries-data-db</module> <module>libraries-data-db</module>
<module>libraries-security</module> <module>libraries-security</module>
<module>libraries-server-2</module> <module>libraries-server-2</module>
<module>libraries-testing</module>
<module>logging-modules</module> <module>logging-modules</module>
<module>lombok-modules</module> <module>lombok-modules</module>
@ -657,8 +653,6 @@
<module>performance-tests</module> <module>performance-tests</module>
<module>persistence-modules</module> <module>persistence-modules</module>
<module>rule-engines-modules</module>
<module>security-modules</module> <module>security-modules</module>
<module>vavr-modules</module> <module>vavr-modules</module>
@ -703,8 +697,6 @@
<module>server-modules</module> <module>server-modules</module>
<module>spf4j</module> <module>spf4j</module>
<module>spring-4</module> <module>spring-4</module>
<module>spring-aop</module>
<module>spring-aop-2</module>
<module>spring-batch</module> <module>spring-batch</module>
<module>spring-bom</module> <module>spring-bom</module>
<module>spring-boot-modules</module> <module>spring-boot-modules</module>
@ -859,6 +851,9 @@
</build> </build>
<modules> <modules>
<module>spring-aop</module>
<module>jmeter</module>
<module>spring-aop-2</module>
<module>algorithms-modules</module> <module>algorithms-modules</module>
<module>apache-libraries</module> <module>apache-libraries</module>
<module>apache-poi</module> <module>apache-poi</module>
@ -866,7 +861,10 @@
<module>di-modules</module> <module>di-modules</module>
<module>asciidoctor</module> <module>asciidoctor</module>
<module>aws-modules</module> <module>aws-modules</module>
<module>couchbase</module>
<module>core-groovy-modules</module> <module>core-groovy-modules</module>
<module>core-java-modules/core-java-9</module> <module>core-java-modules/core-java-9</module>
<module>core-java-modules/core-java-9-improvements</module> <module>core-java-modules/core-java-9-improvements</module>
<module>core-java-modules/core-java-9-jigsaw</module> <module>core-java-modules/core-java-9-jigsaw</module>
@ -904,7 +902,7 @@
<module>core-java-modules/core-java-networking-3</module> <module>core-java-modules/core-java-networking-3</module>
<module>core-java-modules/core-java-strings</module> <module>core-java-modules/core-java-strings</module>
<module>core-java-modules/core-java-httpclient</module> <module>core-java-modules/core-java-httpclient</module>
<module>custom-pmd</module> <module>custom-pmd</module>
<module>spring-core-6</module> <module>spring-core-6</module>
<module>data-structures</module> <module>data-structures</module>
<module>ddd-contexts</module> <module>ddd-contexts</module>
@ -914,6 +912,7 @@
<module>apache-httpclient-2</module> <module>apache-httpclient-2</module>
<module>kubernetes-modules/kubernetes-spring</module> <module>kubernetes-modules/kubernetes-spring</module>
<module>libraries-concurrency</module> <module>libraries-concurrency</module>
<module>libraries-testing</module>
<module>maven-modules/compiler-plugin-java-9</module> <module>maven-modules/compiler-plugin-java-9</module>
<module>maven-modules/maven-generate-war</module> <module>maven-modules/maven-generate-war</module>
<module>maven-modules/multimodulemavenproject</module> <module>maven-modules/multimodulemavenproject</module>
@ -930,8 +929,12 @@
<module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module> <module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
<module>testing-modules/testing-assertions</module> <module>testing-modules/testing-assertions</module>
<module>persistence-modules/fauna</module> <module>persistence-modules/fauna</module>
<module>rule-engines-modules</module>
<module>reactive-systems</module> <module>reactive-systems</module>
<module>rxjava-modules</module> <module>rxjava-modules</module>
<module>lightrun</module> <module>lightrun</module>
<module>tablesaw</module> <module>tablesaw</module>
<module>geotools</module> <module>geotools</module>
@ -1045,7 +1048,8 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>11</java.version> <java.version>11</java.version>
<java.version>11</java.version> <maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties> </properties>
</profile> </profile>
@ -1079,6 +1083,9 @@
<module>di-modules</module> <module>di-modules</module>
<module>asciidoctor</module> <module>asciidoctor</module>
<module>aws-modules</module> <module>aws-modules</module>
<module>couchbase</module>
<module>core-groovy-modules</module> <module>core-groovy-modules</module>
<module>core-java-modules/core-java-9</module> <module>core-java-modules/core-java-9</module>
<module>core-java-modules/core-java-9-improvements</module> <module>core-java-modules/core-java-9-improvements</module>
@ -1117,16 +1124,21 @@
<module>core-java-modules/core-java-networking-3</module> <module>core-java-modules/core-java-networking-3</module>
<module>core-java-modules/core-java-strings</module> <module>core-java-modules/core-java-strings</module>
<module>core-java-modules/core-java-httpclient</module> <module>core-java-modules/core-java-httpclient</module>
<module>custom-pmd</module> <module>spring-aop</module>
<module>spring-aop-2</module>
<module>custom-pmd</module>
<module>spring-core-6</module> <module>spring-core-6</module>
<module>data-structures</module> <module>data-structures</module>
<module>ddd-contexts</module> <module>ddd-contexts</module>
<module>deeplearning4j</module> <module>deeplearning4j</module>
<module>jmeter</module>
<module>docker-modules</module> <module>docker-modules</module>
<module>guava-modules</module> <module>guava-modules</module>
<module>apache-httpclient-2</module> <module>apache-httpclient-2</module>
<module>kubernetes-modules/kubernetes-spring</module> <module>kubernetes-modules/kubernetes-spring</module>
<module>libraries-concurrency</module> <module>libraries-concurrency</module>
<module>libraries-testing</module>
<module>maven-modules/compiler-plugin-java-9</module> <module>maven-modules/compiler-plugin-java-9</module>
<module>maven-modules/maven-generate-war</module> <module>maven-modules/maven-generate-war</module>
<module>maven-modules/multimodulemavenproject</module> <module>maven-modules/multimodulemavenproject</module>
@ -1143,8 +1155,12 @@
<module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module> <module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
<module>testing-modules/testing-assertions</module> <module>testing-modules/testing-assertions</module>
<module>persistence-modules/fauna</module> <module>persistence-modules/fauna</module>
<module>rule-engines-modules</module>
<module>reactive-systems</module> <module>reactive-systems</module>
<module>rxjava-modules</module> <module>rxjava-modules</module>
<module>lightrun</module> <module>lightrun</module>
<module>tablesaw</module> <module>tablesaw</module>
<module>geotools</module> <module>geotools</module>
@ -1261,7 +1277,8 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>11</java.version> <java.version>11</java.version>
<java.version>11</java.version> <maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties> </properties>
</profile> </profile>

View File

@ -23,7 +23,7 @@
</dependencies> </dependencies>
<properties> <properties>
<easy-rules.version>3.0.0</easy-rules.version> <easy-rules.version>4.1.0</easy-rules.version>
</properties> </properties>
</project> </project>

View File

@ -30,7 +30,7 @@
</dependencies> </dependencies>
<properties> <properties>
<evrete.version>2.1.04</evrete.version> <evrete.version>3.0.01</evrete.version>
</properties> </properties>
</project> </project>

View File

@ -28,7 +28,7 @@
</dependencies> </dependencies>
<properties> <properties>
<openl.version>5.19.4</openl.version> <openl.version>5.26.5</openl.version>
</properties> </properties>
</project> </project>

View File

@ -23,7 +23,7 @@
</dependencies> </dependencies>
<properties> <properties>
<rulebook.version>0.6.2</rulebook.version> <rulebook.version>0.12</rulebook.version>
</properties> </properties>
</project> </project>

View File

@ -39,8 +39,22 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
</plugins>
</build>
<properties> <properties>
<aspectj-plugin.version>1.11</aspectj-plugin.version> <aspectj-plugin.version>1.14.0</aspectj-plugin.version>
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
</properties> </properties>
</project> </project>

View File

@ -69,11 +69,20 @@
</systemPropertyVariables> </systemPropertyVariables>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
<properties> <properties>
<aspectj-plugin.version>1.11</aspectj-plugin.version> <aspectj-plugin.version>1.14.0</aspectj-plugin.version>
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
</properties> </properties>
</project> </project>