JAVA-7133: POM Properties Cleanup (eugenp#11229)

kwoyke · web-flow · commit 3252bebde697 · 2021-09-16T22:34:26.000+05:30
* JAVA-7133: Use common org.slf4j.version property

* JAVA-7133: Use common logback.version property
diff --git a/apache-libraries/pom.xml b/apache-libraries/pom.xml
@@ -201,7 +201,6 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <avro.version>1.8.2</avro.version>
-        <slf4j.version>1.7.25</slf4j.version>
         <beam.version>2.19.0</beam.version>
         <assertj.version>3.9.0</assertj.version>
         <bval.version>1.1.2</bval.version>
diff --git a/apache-thrift/pom.xml b/apache-thrift/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>${org.slf4j.slf4j-simple.version}</version>
+            <version>${org.slf4j.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -61,7 +61,6 @@
     <properties>
         <thrift.version>0.10.0</thrift.version>
         <maven-thrift.version>0.1.11</maven-thrift.version>
-        <org.slf4j.slf4j-simple.version>1.7.12</org.slf4j.slf4j-simple.version>
         <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
     </properties>
 
diff --git a/core-groovy-2/pom.xml b/core-groovy-2/pom.xml
@@ -166,7 +166,6 @@
         <hsqldb.version>2.4.0</hsqldb.version>
         <spock-core.version>1.1-groovy-2.4</spock-core.version>
         <groovy-wslite.version>1.1.3</groovy-wslite.version>
-        <logback.version>1.2.3</logback.version>
         <groovy.version>2.5.7</groovy.version>
         <assembly.plugin.version>3.1.0</assembly.plugin.version>
         <compiler.plugin.version>3.8.0</compiler.plugin.version>
diff --git a/deeplearning4j/pom.xml b/deeplearning4j/pom.xml
@@ -39,12 +39,12 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
+            <version>${org.slf4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>${slf4j.version}</version>
+            <version>${org.slf4j.version}</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.datavec/datavec-api -->
         <dependency>
@@ -62,7 +62,6 @@
     <properties>
         <dl4j.version>0.9.1</dl4j.version> <!-- Latest non beta version -->
         <httpclient.version>4.3.5</httpclient.version>
-        <slf4j.version>1.7.5</slf4j.version>
     </properties>
 
 </project>
diff --git a/ethereum/pom.xml b/ethereum/pom.xml
@@ -99,7 +99,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            <version>${slf4j.version}</version>
+            <version>${org.slf4j.version}</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -204,8 +204,6 @@
         <spring.boot.version>1.5.6.RELEASE</spring.boot.version>
         <mockito.version>2.21.0</mockito.version>
         <jsonpath.version>2.4.0</jsonpath.version>
-        <logback.version>1.2.3</logback.version>
-        <slf4j.version>1.7.25</slf4j.version>
         <spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
         <compiler.plugin.version>3.1</compiler.plugin.version>
     </properties>
diff --git a/libraries-data-2/pom.xml b/libraries-data-2/pom.xml
@@ -104,12 +104,12 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
+            <version>${org.slf4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>${slf4j.version}</version>
+            <version>${org.slf4j.version}</version>
         </dependency>
         <dependency>
             <groupId>com.univocity</groupId>
@@ -161,7 +161,6 @@
         <suanshu.version>4.0.0</suanshu.version>
         <derive4j.version>1.1.0</derive4j.version>
         <assertj.version>3.6.2</assertj.version>
-        <slf4j.version>1.7.25</slf4j.version>
         <awaitility.version>3.0.0</awaitility.version>
         <univocity.version>2.8.4</univocity.version>
         <guava.version>29.0-jre</guava.version>
diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml
@@ -108,7 +108,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
+            <version>${org.slf4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.storm</groupId>
@@ -173,7 +173,6 @@
         <hazelcast.version>3.8.4</hazelcast.version>
         <org.apache.crunch.crunch-core.version>0.15.0</org.apache.crunch.crunch-core.version>
         <org.apache.hadoop.hadoop-client>2.2.0</org.apache.hadoop.hadoop-client>
-        <slf4j.version>1.7.25</slf4j.version>
         <jmapper.version>1.6.0.1</jmapper.version>
     </properties>
 
diff --git a/logging-modules/logback/pom.xml b/logging-modules/logback/pom.xml
@@ -69,7 +69,6 @@
     </dependencies>
 
     <properties>
-        <logback.version>1.2.3</logback.version>
         <logback.contrib.version>0.1.5</logback.contrib.version>
         <docx4j.version>3.3.5</docx4j.version>
         <javax.mail.version>1.4.7</javax.mail.version>
diff --git a/micronaut/pom.xml b/micronaut/pom.xml
@@ -61,7 +61,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>${lombok.version}</version>
+            <version>${logback.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -145,7 +145,6 @@
         <micronaut.version>1.0.0.RC2</micronaut.version>
         <jdk.version>1.8</jdk.version>
         <annotation.api.version>1.3.2</annotation.api.version>
-        <lombok.version>1.2.3</lombok.version>
         <reactor.version>3.1.6.RELEASE</reactor.version>
         <compiler.plugin.version>3.7.0</compiler.plugin.version>
         <shade.plugin.version>3.1.0</shade.plugin.version>
diff --git a/persistence-modules/hibernate-libraries/pom.xml b/persistence-modules/hibernate-libraries/pom.xml
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
+            <version>${org.slf4j.version}</version>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
@@ -174,12 +174,10 @@
         <javassist.version>3.27.0-GA</javassist.version>
         <jaxb.version>2.3.1</jaxb.version>
         <log4jdbc.version>2.0.0</log4jdbc.version>
-        <logback.version>1.2.3</logback.version>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
         <maven.compiler.version>3.8.1</maven.compiler.version>
         <maven.version>3.8.1</maven.version>
         <mysql.version>8.0.19</mysql.version>
-        <slf4j.version>1.7.30</slf4j.version>
         <spring-boot.version>2.1.3.RELEASE</spring-boot.version>
     </properties>
 
diff --git a/restx/pom.xml b/restx/pom.xml
@@ -99,7 +99,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>${logback-classic.version}</version>
+            <version>${logback.version}</version>
         </dependency>
         <dependency>
             <groupId>io.restx</groupId>
@@ -149,7 +149,6 @@
 
     <properties>
         <restx.version>0.35-rc4</restx.version>
-        <logback-classic.version>1.2.3</logback-classic.version>
     </properties>
 
 </project>
diff --git a/spf4j/spf4j-aspects-app/pom.xml b/spf4j/spf4j-aspects-app/pom.xml
@@ -99,7 +99,6 @@
 
     <properties>
         <spf4j.version>8.9.0</spf4j.version>
-        <org.slf4j.version>1.7.21</org.slf4j.version>
         <compiler.plugin.version>3.8.0</compiler.plugin.version>
         <dependency.plugin.version>3.1.1</dependency.plugin.version>
     </properties>
diff --git a/spf4j/spf4j-core-app/pom.xml b/spf4j/spf4j-core-app/pom.xml
@@ -105,7 +105,6 @@
 
     <properties>
         <spf4j.version>8.9.0</spf4j.version>
-        <org.slf4j.version>1.7.21</org.slf4j.version>
         <compiler.plugin.version>3.8.0</compiler.plugin.version>
         <dependency.plugin.version>3.1.1</dependency.plugin.version>
     </properties>
diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml b/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml
@@ -62,8 +62,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <logback.version>1.2.3</logback.version>
-    </properties>
-
 </project>
diff --git a/spring-security-modules/spring-security-web-sockets/pom.xml b/spring-security-modules/spring-security-web-sockets/pom.xml
@@ -103,7 +103,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>${logback-classic.version}</version>
+            <version>${logback.version}</version>
         </dependency>
         <!-- Servlet -->
         <dependency>
@@ -180,7 +180,6 @@
     <properties>
         <hibernate-core.version>5.2.10.Final</hibernate-core.version>
         <spring-data-jpa.version>1.11.3.RELEASE</spring-data-jpa.version>
-        <logback-classic.version>1.2.3</logback-classic.version>
         <spring-boot-starter-test.version>1.5.10.RELEASE</spring-boot-starter-test.version>
         <cargo-maven2-plugin.version>1.7.6</cargo-maven2-plugin.version>
     </properties>
diff --git a/vertx-and-rxjava/pom.xml b/vertx-and-rxjava/pom.xml
@@ -47,7 +47,6 @@
 
     <properties>
         <vertx.version>3.5.0.Beta1</vertx.version>
-        <logback.version>1.2.3</logback.version>
     </properties>
 
 </project>
diff --git a/vraptor/pom.xml b/vraptor/pom.xml
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>${slf4j-log4j12.version}</version>
+            <version>${org.slf4j.version}</version>
         </dependency>
         <dependency>
             <groupId>br.com.caelum.vraptor</groupId>
@@ -117,7 +117,6 @@
         <weld.version>2.1.2.Final</weld.version>
         <el.version>2.2</el.version>
         <hibernate-validator.version>5.1.1.Final</hibernate-validator.version>
-        <slf4j-log4j12.version>1.7.5</slf4j-log4j12.version>
         <vraptor-freemarker.version>4.1.0-RC3</vraptor-freemarker.version>
         <vraptor-hibernate.version>4.0.4</vraptor-hibernate.version>
         <mysql-connector.version>8.0.8-dmr</mysql-connector.version>
