Skip to content

Commit 0b7379f

Browse files
authored
[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
1 parent 8278e57 commit 0b7379f

File tree

9 files changed

+70
-26
lines changed

9 files changed

+70
-26
lines changed

couchbase/pom.xml

+7-2
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,16 @@
6464
<version>${commons-lang3.version}</version>
6565
<scope>test</scope>
6666
</dependency>
67+
<dependency>
68+
<groupId>javax.annotation</groupId>
69+
<artifactId>javax.annotation-api</artifactId>
70+
<version>1.3.2</version>
71+
</dependency>
6772
</dependencies>
6873

6974
<properties>
70-
<couchbase.client.version>2.5.0</couchbase.client.version>
71-
<spring-framework.version>4.3.5.RELEASE</spring-framework.version>
75+
<couchbase.client.version>2.7.2</couchbase.client.version>
76+
<spring-framework.version>5.3.25</spring-framework.version>
7277
</properties>
7378

7479
</project>

libraries-testing/pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -179,17 +179,16 @@
179179
<serenity.version>1.9.9</serenity.version>
180180
<serenity.jbehave.version>1.9.0</serenity.jbehave.version>
181181
<serenity.jira.version>1.9.0</serenity.jira.version>
182-
<serenity.plugin.version>1.9.27</serenity.plugin.version>
182+
<serenity.plugin.version>3.6.12</serenity.plugin.version>
183183
<jsonassert.version>1.5.0</jsonassert.version>
184184
<awaitility.version>3.0.0</awaitility.version>
185185
<hoverfly-java.version>0.8.1</hoverfly-java.version>
186186
<spring.version>4.3.8.RELEASE</spring.version>
187-
<spring-mock-mvc.version>4.1.1</spring-mock-mvc.version>
187+
<spring-mock-mvc.version>5.3.0</spring-mock-mvc.version>
188188
<java-hamcrest.version>2.0.0.0</java-hamcrest.version>
189189
<dbunit.version>2.7.0</dbunit.version>
190190
<archunit.version>0.14.1</archunit.version>
191191
<modelassert.version>1.0.0</modelassert.version>
192-
<h2.version>2.1.214</h2.version>
193192
</properties>
194193

195194
</project>

pom.xml

+32-15
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@
337337
<!-- <module>clojure</module> --> <!-- Not a maven project -->
338338

339339
<module>core-java-modules</module>
340+
340341
<module>couchbase</module>
341342

342343
<module>drools</module>
@@ -360,7 +361,7 @@
360361
<module>jaxb</module>
361362
<module>jersey</module>
362363
<module>jhipster-5</module>
363-
<module>jmeter</module>
364+
364365
<module>jmh</module>
365366

366367
<module>jsf</module>
@@ -378,7 +379,6 @@
378379
<module>libraries-data-db</module>
379380
<module>libraries-security</module>
380381
<module>libraries-server-2</module>
381-
<module>libraries-testing</module>
382382
<module>logging-modules</module>
383383
<module>lombok-modules</module>
384384

@@ -400,8 +400,6 @@
400400
<module>performance-tests</module>
401401
<module>persistence-modules</module>
402402

403-
<module>rule-engines-modules</module>
404-
405403
<module>security-modules</module>
406404

407405
<module>vavr-modules</module>
@@ -455,7 +453,6 @@
455453
<module>spf4j</module>
456454
<module>spring-4</module>
457455
<module>spring-aop</module>
458-
<module>spring-aop-2</module>
459456
<module>spring-batch</module>
460457
<module>spring-bom</module>
461458
<module>spring-boot-modules</module>
@@ -598,6 +595,7 @@
598595

599596
<module>core-java-modules</module>
600597
<module>couchbase</module>
598+
601599
<module>drools</module>
602600
<!-- <module>ethereum</module> --> <!-- JAVA-6001 -->
603601
<!-- <module>gradle-modules</module> --> <!-- Not a maven project -->
@@ -618,7 +616,6 @@
618616
<module>jaxb</module>
619617
<module>jersey</module>
620618
<module>jhipster-5</module>
621-
<module>jmeter</module>
622619
<module>jmh</module>
623620

624621
<module>jsf</module>
@@ -636,7 +633,6 @@
636633
<module>libraries-data-db</module>
637634
<module>libraries-security</module>
638635
<module>libraries-server-2</module>
639-
<module>libraries-testing</module>
640636
<module>logging-modules</module>
641637
<module>lombok-modules</module>
642638

@@ -657,8 +653,6 @@
657653
<module>performance-tests</module>
658654
<module>persistence-modules</module>
659655

660-
<module>rule-engines-modules</module>
661-
662656
<module>security-modules</module>
663657

664658
<module>vavr-modules</module>
@@ -703,8 +697,6 @@
703697
<module>server-modules</module>
704698
<module>spf4j</module>
705699
<module>spring-4</module>
706-
<module>spring-aop</module>
707-
<module>spring-aop-2</module>
708700
<module>spring-batch</module>
709701
<module>spring-bom</module>
710702
<module>spring-boot-modules</module>
@@ -859,14 +851,20 @@
859851
</build>
860852

861853
<modules>
854+
<module>spring-aop</module>
855+
<module>jmeter</module>
856+
<module>spring-aop-2</module>
862857
<module>algorithms-modules</module>
863858
<module>apache-libraries</module>
864859
<module>apache-poi</module>
865860
<module>apache-velocity</module>
866861
<module>di-modules</module>
867862
<module>asciidoctor</module>
868863
<module>aws-modules</module>
864+
865+
<module>couchbase</module>
869866
<module>core-groovy-modules</module>
867+
870868
<module>core-java-modules/core-java-9</module>
871869
<module>core-java-modules/core-java-9-improvements</module>
872870
<module>core-java-modules/core-java-9-jigsaw</module>
@@ -904,7 +902,7 @@
904902
<module>core-java-modules/core-java-networking-3</module>
905903
<module>core-java-modules/core-java-strings</module>
906904
<module>core-java-modules/core-java-httpclient</module>
907-
<module>custom-pmd</module>
905+
<module>custom-pmd</module>
908906
<module>spring-core-6</module>
909907
<module>data-structures</module>
910908
<module>ddd-contexts</module>
@@ -914,6 +912,7 @@
914912
<module>apache-httpclient-2</module>
915913
<module>kubernetes-modules/kubernetes-spring</module>
916914
<module>libraries-concurrency</module>
915+
<module>libraries-testing</module>
917916
<module>maven-modules/compiler-plugin-java-9</module>
918917
<module>maven-modules/maven-generate-war</module>
919918
<module>maven-modules/multimodulemavenproject</module>
@@ -930,8 +929,12 @@
930929
<module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
931930
<module>testing-modules/testing-assertions</module>
932931
<module>persistence-modules/fauna</module>
932+
933+
<module>rule-engines-modules</module>
934+
933935
<module>reactive-systems</module>
934936
<module>rxjava-modules</module>
937+
935938
<module>lightrun</module>
936939
<module>tablesaw</module>
937940
<module>geotools</module>
@@ -1045,7 +1048,8 @@
10451048
<properties>
10461049
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
10471050
<java.version>11</java.version>
1048-
<java.version>11</java.version>
1051+
<maven.compiler.source>11</maven.compiler.source>
1052+
<maven.compiler.target>11</maven.compiler.target>
10491053
</properties>
10501054
</profile>
10511055

@@ -1079,6 +1083,9 @@
10791083
<module>di-modules</module>
10801084
<module>asciidoctor</module>
10811085
<module>aws-modules</module>
1086+
1087+
<module>couchbase</module>
1088+
10821089
<module>core-groovy-modules</module>
10831090
<module>core-java-modules/core-java-9</module>
10841091
<module>core-java-modules/core-java-9-improvements</module>
@@ -1117,16 +1124,21 @@
11171124
<module>core-java-modules/core-java-networking-3</module>
11181125
<module>core-java-modules/core-java-strings</module>
11191126
<module>core-java-modules/core-java-httpclient</module>
1120-
<module>custom-pmd</module>
1127+
<module>spring-aop</module>
1128+
<module>spring-aop-2</module>
1129+
1130+
<module>custom-pmd</module>
11211131
<module>spring-core-6</module>
11221132
<module>data-structures</module>
11231133
<module>ddd-contexts</module>
11241134
<module>deeplearning4j</module>
1135+
<module>jmeter</module>
11251136
<module>docker-modules</module>
11261137
<module>guava-modules</module>
11271138
<module>apache-httpclient-2</module>
11281139
<module>kubernetes-modules/kubernetes-spring</module>
11291140
<module>libraries-concurrency</module>
1141+
<module>libraries-testing</module>
11301142
<module>maven-modules/compiler-plugin-java-9</module>
11311143
<module>maven-modules/maven-generate-war</module>
11321144
<module>maven-modules/multimodulemavenproject</module>
@@ -1143,8 +1155,12 @@
11431155
<module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
11441156
<module>testing-modules/testing-assertions</module>
11451157
<module>persistence-modules/fauna</module>
1158+
1159+
<module>rule-engines-modules</module>
1160+
11461161
<module>reactive-systems</module>
11471162
<module>rxjava-modules</module>
1163+
11481164
<module>lightrun</module>
11491165
<module>tablesaw</module>
11501166
<module>geotools</module>
@@ -1261,7 +1277,8 @@
12611277
<properties>
12621278
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12631279
<java.version>11</java.version>
1264-
<java.version>11</java.version>
1280+
<maven.compiler.source>11</maven.compiler.source>
1281+
<maven.compiler.target>11</maven.compiler.target>
12651282
</properties>
12661283
</profile>
12671284

rule-engines-modules/easy-rules/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</dependencies>
2424

2525
<properties>
26-
<easy-rules.version>3.0.0</easy-rules.version>
26+
<easy-rules.version>4.1.0</easy-rules.version>
2727
</properties>
2828

2929
</project>

rule-engines-modules/evrete/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</dependencies>
3131

3232
<properties>
33-
<evrete.version>2.1.04</evrete.version>
33+
<evrete.version>3.0.01</evrete.version>
3434
</properties>
3535

3636
</project>

rule-engines-modules/openl-tablets/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</dependencies>
2929

3030
<properties>
31-
<openl.version>5.19.4</openl.version>
31+
<openl.version>5.26.5</openl.version>
3232
</properties>
3333

3434
</project>

rule-engines-modules/rulebook/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</dependencies>
2424

2525
<properties>
26-
<rulebook.version>0.6.2</rulebook.version>
26+
<rulebook.version>0.12</rulebook.version>
2727
</properties>
2828

2929
</project>

spring-aop-2/pom.xml

+15-1
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,22 @@
3939
</dependency>
4040
</dependencies>
4141

42+
<build>
43+
<plugins>
44+
<plugin>
45+
<groupId>org.apache.maven.plugins</groupId>
46+
<artifactId>maven-war-plugin</artifactId>
47+
<version>${maven-war-plugin.version}</version>
48+
<configuration>
49+
<failOnMissingWebXml>false</failOnMissingWebXml>
50+
</configuration>
51+
</plugin>
52+
</plugins>
53+
</build>
54+
4255
<properties>
43-
<aspectj-plugin.version>1.11</aspectj-plugin.version>
56+
<aspectj-plugin.version>1.14.0</aspectj-plugin.version>
57+
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
4458
</properties>
4559

4660
</project>

spring-aop/pom.xml

+10-1
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,20 @@
6969
</systemPropertyVariables>
7070
</configuration>
7171
</plugin>
72+
<plugin>
73+
<groupId>org.apache.maven.plugins</groupId>
74+
<artifactId>maven-war-plugin</artifactId>
75+
<version>${maven-war-plugin.version}</version>
76+
<configuration>
77+
<failOnMissingWebXml>false</failOnMissingWebXml>
78+
</configuration>
79+
</plugin>
7280
</plugins>
7381
</build>
7482

7583
<properties>
76-
<aspectj-plugin.version>1.11</aspectj-plugin.version>
84+
<aspectj-plugin.version>1.14.0</aspectj-plugin.version>
85+
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
7786
</properties>
7887

7988
</project>

0 commit comments

Comments
 (0)