Merge pull request #14999 from panos-kakos/JAVA-25997

[JAVA-25997] Clean up
This commit is contained in:
Kasra Madadipouya 2023-10-23 21:54:28 +02:00 committed by GitHub
commit ee407c2cd8
17 changed files with 93 additions and 80 deletions

View File

@ -149,7 +149,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven.version}</version>
<version>${maven-war-plugin.version}</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
@ -166,7 +166,7 @@
<easymock.version>3.6</easymock.version>
<shedlock.version>2.1.0</shedlock.version>
<javassist.version>3.22.0-GA</javassist.version>
<maven.version>3.2.2</maven.version>
<maven-war-plugin.version.version>3.2.2</maven-war-plugin.version.version>
</properties>
</project>

View File

@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>${apache-commons-text.version}</version>
<version>${commons-text.version}</version>
</dependency>
</dependencies>
@ -84,7 +84,7 @@
<awaitility.version>4.0.2</awaitility.version>
<servlet-api.version>4.0.0</servlet-api.version>
<annotation-api.version>1.3.2</annotation-api.version>
<apache-commons-text.version>1.10.0</apache-commons-text.version>
<commons-text.version>1.10.0</commons-text.version>
</properties>
</project>

View File

@ -27,7 +27,7 @@
<dependency>
<groupId>org.springframework.credhub</groupId>
<artifactId>spring-credhub-starter</artifactId>
<version>2.2.0</version>
<version>${spring-credhub-starter.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
@ -36,8 +36,7 @@
</dependencies>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<spring-credhub-starter.version>2.2.0</spring-credhub-starter.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

View File

@ -66,12 +66,12 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>${activemq.broker.version}</version>
<version>${activemq-broker.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq.tooling</groupId>
<artifactId>activemq-junit</artifactId>
<version>${activemq.junit.version}</version>
<version>${activemq-junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@ -187,8 +187,8 @@
<wildfly.version>8.2.1.Final</wildfly.version>
<javax.ejb-api.version>3.2</javax.ejb-api.version>
<springframework.version>5.2.3.RELEASE</springframework.version>
<activemq.broker.version>5.16.3</activemq.broker.version>
<activemq.junit.version>5.16.3</activemq.junit.version>
<activemq-broker.version>5.16.3</activemq-broker.version>
<activemq-junit.version>5.16.3</activemq-junit.version>
<mockito.version>2.21.0</mockito.version>
<maven-dependency-plugin.version>2.8</maven-dependency-plugin.version>
<wildfly-ejb.version>8.2.1.Final</wildfly-ejb.version>

View File

@ -53,7 +53,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${testcontainers-kafka.version}</version>
<version>${testcontainers-junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@ -65,6 +65,7 @@
<properties>
<testcontainers-kafka.version>1.16.2</testcontainers-kafka.version>
<testcontainers-junit-jupiter.version>1.16.2</testcontainers-junit-jupiter.version>
</properties>
</project>

View File

@ -26,12 +26,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
<version>3.0.5</version>
<version>${spring-boot-starter-actuator.version}</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
<version>1.10.5</version>
<version>${micrometer-registry-prometheus.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.kafka</groupId>
@ -90,6 +90,8 @@
</build>
<properties>
<spring-boot-starter-actuator.version>3.0.5</spring-boot-starter-actuator.version>
<micrometer-registry-prometheus.version>1.10.5</micrometer-registry-prometheus.version>
<testcontainers-kafka.version>1.16.2</testcontainers-kafka.version>
</properties>

View File

@ -33,7 +33,7 @@
<dependency>
<groupId>io.katharsis</groupId>
<artifactId>katharsis-spring</artifactId>
<version>${katharsis.version}</version>
<version>${katharsis-spring.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
@ -132,7 +132,7 @@
</profiles>
<properties>
<katharsis.version>3.0.2</katharsis.version>
<katharsis-spring.version>3.0.2</katharsis-spring.version>
<reflections.version>0.9.10</reflections.version>
<cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
</properties>

View File

@ -37,24 +37,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
</configuration>
</plugin>
</plugins>
</build>
<properties>
<spring-mobile-device.version>1.1.5.RELEASE</spring-mobile-device.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>
</project>

View File

@ -27,7 +27,7 @@
<dependency>
<groupId>org.springframework.pulsar</groupId>
<artifactId>spring-pulsar-spring-boot-starter</artifactId>
<version>0.2.0</version>
<version>${spring-pulsar-spring-boot-starter.version}</version>
</dependency>
<dependency>
@ -46,4 +46,8 @@
</plugins>
</build>
<properties>
<spring-pulsar-spring-boot-starter.version>0.2.0</spring-pulsar-spring-boot-starter.version>
</properties>
</project>

View File

@ -76,12 +76,12 @@
<dependency>
<groupId>io.reactivex.rxjava2</groupId>
<artifactId>rxjava</artifactId>
<version>${rxjava-version}</version>
<version>${rxjava.version}</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>${project-reactor-test}</version>
<version>${project-reactor-test.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@ -110,11 +110,11 @@
<properties>
<reactor-spring.version>1.0.1.RELEASE</reactor-spring.version>
<rxjava-version>2.1.12</rxjava-version>
<rxjava.version>2.1.12</rxjava.version>
<johnzon.version>1.1.3</johnzon.version>
<jsonb-api.version>1.0</jsonb-api.version>
<geronimo-json_1.1_spec.version>1.0</geronimo-json_1.1_spec.version>
<project-reactor-test>3.1.6.RELEASE</project-reactor-test>
<project-reactor-test.version>3.1.6.RELEASE</project-reactor-test.version>
</properties>
</project>

View File

@ -43,16 +43,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
</configuration>
</plugin>
</plugins>
</build>
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>
</project>

View File

@ -28,7 +28,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
<configuration>
<warSourceDirectory>src/main/webapp</warSourceDirectory>
<failOnMissingWebXml>false</failOnMissingWebXml>

View File

@ -34,7 +34,7 @@
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.0</version>
<version>${jakarta.xml.bind-api.version}</version>
</dependency>
<dependency>
@ -58,7 +58,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
<version>3.1.0</version>
<version>${jaxb2-maven-plugin.version}</version>
<executions>
<execution>
<id>xjc</id>
@ -79,7 +79,7 @@
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<version>0.15.3</version>
<version>${maven-jaxb2-plugin.version}</version>
<executions>
<execution>
<goals>
@ -103,5 +103,8 @@
<properties>
<java.version>17</java.version>
<jakarta.xml.bind-api.version>4.0.0</jakarta.xml.bind-api.version>
<jaxb2-maven-plugin.version>3.1.0</jaxb2-maven-plugin.version>
<maven-jaxb2-plugin.version>0.15.3</maven-jaxb2-plugin.version>
</properties>
</project>

View File

@ -29,22 +29,22 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>6.0.10.Final</version>
<version>${hibernate-validator.version}</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</version>
<version>${validation-api.version}</version>
</dependency>
<dependency>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator</artifactId>
<version>3.3.4</version>
<version>${openapi-generator.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.10.0.pr3</version>
<version>${jackson-databind.version}</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
@ -62,7 +62,7 @@
<plugin>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId>
<version>5.1.0</version>
<version>${openapi-generator-maven-plugin.version}</version>
<executions>
<execution>
<goals>
@ -97,6 +97,11 @@
<springfox-version>3.0.0</springfox-version>
<log4j2.version>2.17.1</log4j2.version>
<springdoc.version>1.7.0</springdoc.version>
<hibernate-validator.version>6.0.10.Final</hibernate-validator.version>
<validation-api.version>2.0.1.Final</validation-api.version>
<openapi-generator.version>3.3.4</openapi-generator.version>
<jackson-databind.version>2.10.0.pr3</jackson-databind.version>
<openapi-generator-maven-plugin.version>5.1.0</openapi-generator-maven-plugin.version>
</properties>
</project>

View File

@ -34,55 +34,55 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${swagger-annotations-version}</version>
<version>${swagger-annotations.version}</version>
</dependency>
<!-- @Nullable annotation -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
<version>${findbugs-jsr305.version}</version>
</dependency>
<!-- HTTP client: Spring RestTemplate -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring-web-version}</version>
<version>${spring-web.version}</version>
</dependency>
<!-- JSON processing: jackson -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson-version}</version>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson-version}</version>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-version}</version>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson-version}</version>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.openapitools</groupId>
<artifactId>jackson-databind-nullable</artifactId>
<version>${jackson-databind-nullable-version}</version>
<version>${jackson-databind-nullable.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson-version}</version>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.github.joschi.jackson</groupId>
<artifactId>jackson-datatype-threetenbp</artifactId>
<version>${jackson-threetenbp-version}</version>
<version>${jackson-threetenbp.version}</version>
</dependency>
<!-- test dependencies -->
<dependency>
@ -94,7 +94,7 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
<version>${javax.annotation-api.version}</version>
</dependency>
</dependencies>
@ -103,7 +103,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M1</version>
<version>${maven-enforcer-plugin.version}</version>
<executions>
<execution>
<id>enforce-maven</id>
@ -123,7 +123,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12</version>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<systemProperties>
<property>
@ -154,7 +154,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<version>${maven-jar-plugin.version}</version>
<executions>
<execution>
<goals>
@ -169,7 +169,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.10</version>
<version>${build-helper-maven-plugin.version}</version>
<executions>
<execution>
<id>add_sources</id>
@ -200,7 +200,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@ -209,7 +209,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<version>${maven-javadoc-plugin.version}</version>
<executions>
<execution>
<id>attach-javadocs</id>
@ -222,7 +222,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<version>${maven-source-plugin.version}</version>
<executions>
<execution>
<id>attach-sources</id>
@ -243,7 +243,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<version>${maven-gpg-plugin.version}</version>
<executions>
<execution>
<id>sign-artifacts</id>
@ -260,14 +260,25 @@
</profiles>
<properties>
<swagger-annotations-version>1.5.22</swagger-annotations-version>
<spring-web-version>4.3.9.RELEASE</spring-web-version>
<jackson-version>2.11.1</jackson-version>
<swagger-annotations.version>1.5.22</swagger-annotations.version>
<spring-web.version>4.3.9.RELEASE</spring-web.version>
<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
<jackson.version>2.11.1</jackson.version>
<!-- <jackson-databind-version>2.10.1</jackson-databind-version> -->
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
<jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<jackson-databind-nullable.version>0.2.1</jackson-databind-nullable.version>
<jackson-threetenbp.version>2.9.10</jackson-threetenbp.version>
<maven-plugin.version>1.0.0</maven-plugin.version>
<junit-jupiter.version>5.8.1</junit-jupiter.version>
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version>
<maven-surefire-plugin.version>2.12</maven-surefire-plugin.version>
<maven-jar-plugin.version>2.2</maven-jar-plugin.version>
<build-helper-maven-plugin.version>1.10</build-helper-maven-plugin.version>
<maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
<maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
<maven-source-plugin.version>2.2.1</maven-source-plugin.version>
<maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
</properties>
</project>

View File

@ -40,13 +40,13 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${swagger-annotations-version}</version>
<version>${swagger-annotations.version}</version>
</dependency>
<!-- HTTP client: Spring RestTemplate -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring-web-version}</version>
<version>${spring-web.version}</version>
</dependency>
<!-- JSON processing: jackson -->
<dependency>
@ -77,12 +77,12 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${jodatime-version}</version>
<version>${jodatime.version}</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
<version>${javax.annotation-api.version}</version>
</dependency>
</dependencies>
@ -189,9 +189,10 @@
</profiles>
<properties>
<swagger-annotations-version>1.5.15</swagger-annotations-version>
<spring-web-version>4.3.9.RELEASE</spring-web-version>
<jodatime-version>2.9.9</jodatime-version>
<swagger-annotations.version>1.5.15</swagger-annotations.version>
<spring-web.version>4.3.9.RELEASE</spring-web.version>
<jodatime.version>2.9.9</jodatime.version>
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<maven-jar-plugin.version>2.2</maven-jar-plugin.version>
<maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
<maven-source-plugin.version>2.2.1</maven-source-plugin.version>

View File

@ -36,7 +36,7 @@
<dependency>
<groupId>org.springframework.vault</groupId>
<artifactId>spring-vault-core</artifactId>
<version>${spring.vault.core.version}</version>
<version>${spring-vault-core.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
@ -69,18 +69,20 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>auth</artifactId>
<version>2.20.140</version>
<version>${auth.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-vault-config</artifactId>
<version>3.1.3</version>
<version>${spring-cloud-starter-vault-config.version}</version>
</dependency>
</dependencies>
<properties>
<spring.vault.core.version>2.3.4</spring.vault.core.version>
<spring-vault-core.version>2.3.4</spring-vault-core.version>
<auth.version>2.20.140</auth.version>
<spring-cloud-starter-vault-config.version>3.1.3</spring-cloud-starter-vault-config.version>
<java.version>17</java.version>
</properties>