Merge branch 'master' into JAVA-18133

This commit is contained in:
timis1 2023-02-23 18:58:49 +02:00 committed by GitHub
commit 910bae6d29
12 changed files with 81 additions and 34 deletions

View File

@ -14,4 +14,4 @@ This module contains articles about core Groovy concepts
- [A Quick Guide to Working with Web Services in Groovy](https://www.baeldung.com/groovy-web-services)
- [Categories in Groovy](https://www.baeldung.com/groovy-categories)
- [How to Determine the Data Type in Groovy](https://www.baeldung.com/groovy-determine-data-type)
- [[<-- Prev]](/core-groovy)
- [[<-- Prev]](/core-groovy-modules/core-groovy)

View File

@ -17,7 +17,7 @@ public class ClassWithSuppressWarningsNames implements Serializable {
list.add(Integer.valueOf(value));
}
@SuppressWarnings("deprecated")
@SuppressWarnings("deprecation")
void suppressDeprecatedWarning() {
ClassWithSuppressWarningsNames cls = new ClassWithSuppressWarningsNames();
cls.deprecatedMethod(); // no warning here

View File

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

View File

@ -179,17 +179,16 @@
<serenity.version>1.9.9</serenity.version>
<serenity.jbehave.version>1.9.0</serenity.jbehave.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>
<awaitility.version>3.0.0</awaitility.version>
<hoverfly-java.version>0.8.1</hoverfly-java.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>
<dbunit.version>2.7.0</dbunit.version>
<archunit.version>0.14.1</archunit.version>
<modelassert.version>1.0.0</modelassert.version>
<h2.version>2.1.214</h2.version>
</properties>
</project>

54
pom.xml
View File

@ -337,6 +337,7 @@
<!-- <module>clojure</module> --> <!-- Not a maven project -->
<module>core-java-modules</module>
<module>couchbase</module>
<!-- <module>ethereum</module> --> <!-- JAVA-6001 -->
@ -359,7 +360,7 @@
<module>jaxb</module>
<module>jersey</module>
<module>jhipster-5</module>
<module>jmeter</module>
<module>jmh</module>
<module>jsf</module>
@ -377,7 +378,6 @@
<module>libraries-data-db</module>
<module>libraries-security</module>
<module>libraries-server-2</module>
<module>libraries-testing</module>
<module>logging-modules</module>
<module>lombok-modules</module>
@ -399,8 +399,6 @@
<module>performance-tests</module>
<module>persistence-modules</module>
<module>rule-engines-modules</module>
<module>security-modules</module>
<module>vavr-modules</module>
@ -454,7 +452,6 @@
<module>spf4j</module>
<module>spring-4</module>
<module>spring-aop</module>
<module>spring-aop-2</module>
<module>spring-batch</module>
<module>spring-bom</module>
<module>spring-boot-modules</module>
@ -597,7 +594,6 @@
<module>core-java-modules</module>
<module>couchbase</module>
<module>custom-pmd</module>
<module>drools</module>
<!-- <module>ethereum</module> --> <!-- JAVA-6001 -->
<!-- <module>gradle-modules</module> --> <!-- Not a maven project -->
@ -618,7 +614,6 @@
<module>jaxb</module>
<module>jersey</module>
<module>jhipster-5</module>
<module>jmeter</module>
<module>jmh</module>
<module>jsf</module>
@ -636,7 +631,6 @@
<module>libraries-data-db</module>
<module>libraries-security</module>
<module>libraries-server-2</module>
<module>libraries-testing</module>
<module>logging-modules</module>
<module>lombok-modules</module>
@ -657,8 +651,6 @@
<module>performance-tests</module>
<module>persistence-modules</module>
<module>rule-engines-modules</module>
<module>security-modules</module>
<module>vavr-modules</module>
@ -703,8 +695,6 @@
<module>server-modules</module>
<module>spf4j</module>
<module>spring-4</module>
<module>spring-aop</module>
<module>spring-aop-2</module>
<module>spring-batch</module>
<module>spring-bom</module>
<module>spring-boot-modules</module>
@ -859,6 +849,9 @@
</build>
<modules>
<module>spring-aop</module>
<module>jmeter</module>
<module>spring-aop-2</module>
<module>algorithms-modules</module>
<module>apache-libraries</module>
<module>apache-poi</module>
@ -866,7 +859,10 @@
<module>di-modules</module>
<module>asciidoctor</module>
<module>aws-modules</module>
<module>couchbase</module>
<module>core-groovy-modules</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-jigsaw</module>
@ -904,7 +900,7 @@
<module>core-java-modules/core-java-networking-3</module>
<module>core-java-modules/core-java-strings</module>
<module>core-java-modules/core-java-httpclient</module>
<module>custom-pmd</module>
<module>custom-pmd</module>
<module>spring-core-6</module>
<module>data-structures</module>
<module>ddd-contexts</module>
@ -915,6 +911,7 @@
<module>apache-httpclient-2</module>
<module>kubernetes-modules/kubernetes-spring</module>
<module>libraries-concurrency</module>
<module>libraries-testing</module>
<module>maven-modules/compiler-plugin-java-9</module>
<module>maven-modules/maven-generate-war</module>
<module>maven-modules/multimodulemavenproject</module>
@ -931,8 +928,12 @@
<module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
<module>testing-modules/testing-assertions</module>
<module>persistence-modules/fauna</module>
<module>rule-engines-modules</module>
<module>reactive-systems</module>
<module>rxjava-modules</module>
<module>lightrun</module>
<module>tablesaw</module>
<module>geotools</module>
@ -956,7 +957,7 @@
<module>asm</module>
<module>atomikos</module>
<module>atomix</module>
<module>axon</module>
<!-- <module>axon</module>--><!-- JAVA-18408 -->
<module>bazel</module>
<module>code-generation</module>
@ -1046,7 +1047,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<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>
</profile>
@ -1080,6 +1082,9 @@
<module>di-modules</module>
<module>asciidoctor</module>
<module>aws-modules</module>
<module>couchbase</module>
<module>core-groovy-modules</module>
<module>core-java-modules/core-java-9</module>
<module>core-java-modules/core-java-9-improvements</module>
@ -1118,17 +1123,21 @@
<module>core-java-modules/core-java-networking-3</module>
<module>core-java-modules/core-java-strings</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>data-structures</module>
<module>ddd-contexts</module>
<module>deeplearning4j</module>
<module>jmeter</module>
<module>docker-modules</module>
<module>drools</module>
<module>guava-modules</module>
<module>apache-httpclient-2</module>
<module>kubernetes-modules/kubernetes-spring</module>
<module>libraries-concurrency</module>
<module>libraries-testing</module>
<module>maven-modules/compiler-plugin-java-9</module>
<module>maven-modules/maven-generate-war</module>
<module>maven-modules/multimodulemavenproject</module>
@ -1145,8 +1154,12 @@
<module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
<module>testing-modules/testing-assertions</module>
<module>persistence-modules/fauna</module>
<module>rule-engines-modules</module>
<module>reactive-systems</module>
<module>rxjava-modules</module>
<module>lightrun</module>
<module>tablesaw</module>
<module>geotools</module>
@ -1169,7 +1182,7 @@
<module>asm</module>
<module>atomikos</module>
<module>atomix</module>
<module>axon</module>
<!-- <module>axon</module>--><!-- JAVA-18408 -->
<module>bazel</module>
<module>code-generation</module>
@ -1263,7 +1276,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<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>
</profile>
@ -1334,8 +1348,8 @@
<jstl.version>1.2</jstl.version>
<jackson.version>2.13.3</jackson.version>
<commons-fileupload.version>1.4</commons-fileupload.version>
<junit-platform.version>1.8.1</junit-platform.version>
<junit-jupiter.version>5.8.1</junit-jupiter.version>
<junit-platform.version>1.9.2</junit-platform.version>
<junit-jupiter.version>5.9.2</junit-jupiter.version>
<junit-platform-surefire-provider.version>1.3.2</junit-platform-surefire-provider.version>
<directory-maven-plugin.version>0.3.1</directory-maven-plugin.version>
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>

View File

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

View File

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

View File

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

View File

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

View File

@ -39,8 +39,22 @@
</dependency>
</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>
<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>
</project>

View File

@ -69,11 +69,20 @@
</systemPropertyVariables>
</configuration>
</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>
</build>
<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>
</project>

View File

@ -15,6 +15,12 @@
</parent>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-engine</artifactId>
@ -39,7 +45,7 @@
</dependencies>
<properties>
<log4j2.version>2.17.1</log4j2.version>
<log4j2.version>2.19.0</log4j2.version>
</properties>
</project>