Merge pull request #6902 from amit2103/BAEL-14249

[BAEL-14249] - POM Properties Cleanup
This commit is contained in:
Loredana Crusoveanu
2019-05-06 23:22:19 +03:00
committed by GitHub
105 changed files with 46 additions and 243 deletions
-1
View File
@@ -60,7 +60,6 @@
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<junit.version>4.10</junit.version>
<meecrowave-junit.version>1.2.0</meecrowave-junit.version>
<okhttp.version>3.10.0</okhttp.version>
<meecrowave-jpa.version>1.2.1</meecrowave-jpa.version>
-1
View File
@@ -59,7 +59,6 @@
</build>
<properties>
<jstl.version>1.2</jstl.version>
<org.apache.httpcomponents.version>4.5.2</org.apache.httpcomponents.version>
<velocity-version>1.7</velocity-version>
<velocity-tools-version>2.0</velocity-tools-version>
+1 -2
View File
@@ -27,7 +27,7 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>${hamcrest-core.version}</version>
<version>${org.hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -64,7 +64,6 @@
<cdi-api.version>2.0.SP1</cdi-api.version>
<weld-se-core.version>3.0.5.Final</weld-se-core.version>
<aspectjweaver.version>1.9.2</aspectjweaver.version>
<hamcrest-core.version>1.3</hamcrest-core.version>
<assertj-core.version>3.10.0</assertj-core.version>
<spring.version>5.1.2.RELEASE</spring.version>
</properties>
@@ -34,8 +34,5 @@
</plugin>
</plugins>
</build>
<properties>
<java.version>1.8</java.version>
</properties>
</project>
@@ -35,8 +35,4 @@
</plugins>
</build>
<properties>
<java.version>1.8</java.version>
</properties>
</project>
+3 -8
View File
@@ -88,7 +88,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax-servlet.version}</version>
<version>${javax.servlet-api.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet.jsp.jstl</groupId>
@@ -98,7 +98,7 @@
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>javax.servlet.jsp-api</artifactId>
<version>${javax-jsp.version}</version>
<version>${javax.servlet.jsp-api.version}</version>
</dependency>
<!-- Logging -->
@@ -160,7 +160,7 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>${hamcrest.version}</version>
<version>${org.hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -213,12 +213,7 @@
<web3j.core.version>3.3.1</web3j.core.version>
<spring.boot.version>1.5.6.RELEASE</spring.boot.version>
<mockito.version>2.21.0</mockito.version>
<hamcrest.version>1.3</hamcrest.version>
<javax-jsp.version>2.3.1</javax-jsp.version>
<javax-servlet.version>3.1.0</javax-servlet.version>
<jsonpath.version>2.4.0</jsonpath.version>
<jstl.version>1.2</jstl.version>
<junit.version>4.12</junit.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>
-1
View File
@@ -30,7 +30,6 @@
</dependencies>
<properties>
<lombok.version>1.16.18</lombok.version>
<google-cloud-storage.version>1.16.0</google-cloud-storage.version>
</properties>
-1
View File
@@ -120,7 +120,6 @@
<!-- Don't let your Mac use a crazy non-standard encoding -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<junit.version>4.11</junit.version>
<gwt.version>2.8.2</gwt.version>
</properties>
-1
View File
@@ -67,7 +67,6 @@
<commons-lang3.version>3.5</commons-lang3.version>
<commons-collections4.version>4.1</commons-collections4.version>
<joda-time.version>2.9.6</joda-time.version>
<lombok.version>1.16.10</lombok.version>
</properties>
</project>
-1
View File
@@ -60,7 +60,6 @@
<properties>
<junit.jupiter.version>5.0.0-M4</junit.jupiter.version>
<junit-vintage.version>4.12.0-M4</junit-vintage.version>
<h2.version>1.4.195</h2.version>
<log4j-core.version>2.8.2</log4j-core.version>
<junit-platform-surefire-provider.version>1.0.0-M4</junit-platform-surefire-provider.version>
</properties>
-1
View File
@@ -41,7 +41,6 @@
</build>
<properties>
<jackson.version>2.9.7</jackson.version>
<log4j-core.version>2.8.2</log4j-core.version>
</properties>
+2 -3
View File
@@ -31,9 +31,9 @@
<version>${rest-assured.version}</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<groupId>com.h2</groupId>
<artifactId>h2</artifactId>
<version>${h2database.version}</version>
<version>${h2.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -62,7 +62,6 @@
<properties>
<jersey-container-servlet.version>2.25.1</jersey-container-servlet.version>
<h2database.version>1.4.195</h2database.version>
<rest-assured.version>3.0.3</rest-assured.version>
<log4j-core.version>2.8.2</log4j-core.version>
<javamelody-core.version>1.69.0</javamelody-core.version>
+1 -4
View File
@@ -172,7 +172,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax.servlet.version}</version>
<version>${javax.servlet-api.version}</version>
<scope>provided</scope>
</dependency>
@@ -295,9 +295,6 @@
</profiles>
<properties>
<!-- various -->
<jstl.version>1.2</jstl.version>
<javax.servlet.version>3.1.0</javax.servlet.version>
<!-- util -->
<guava.version>19.0</guava.version>
<commons-lang3.version>3.5</commons-lang3.version>
-2
View File
@@ -64,8 +64,6 @@
<!-- Hystrix -->
<hystrix-core.version>1.5.8</hystrix-core.version>
<rxjava-core.version>0.20.7</rxjava-core.version>
<!-- Testing -->
<hamcrest-all.version>1.3</hamcrest-all.version>
<!-- maven plugins -->
<maven-war-plugin.version>2.6</maven-war-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
@@ -53,7 +53,7 @@
<artifactItem>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2-version}</version>
<version>${h2.version}</version>
<type>jar</type>
<outputDirectory>
${project.build.directory}/liberty/wlp/usr/servers/defaultServer/lib/global
@@ -64,8 +64,4 @@
</plugin>
</plugins>
</build>
<properties>
<h2-version>1.4.197</h2-version>
</properties>
</project>
@@ -53,7 +53,7 @@
<artifactItem>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2-version}</version>
<version>${h2.version}</version>
<type>jar</type>
<outputDirectory>
${project.build.directory}/liberty/wlp/usr/servers/defaultServer/lib/global
@@ -64,8 +64,4 @@
</plugin>
</plugins>
</build>
<properties>
<h2-version>1.4.197</h2-version>
</properties>
</project>
-1
View File
@@ -72,7 +72,6 @@
<javaee-version>8.0</javaee-version>
<liberty-maven-plugin.version>2.3</liberty-maven-plugin.version>
<openliberty-runtime.version>18.0.0.1</openliberty-runtime.version>
<h2-version>1.4.197</h2-version>
<maven-war-plugin.version>3.2.2</maven-war-plugin.version>
</properties>
+1 -3
View File
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
<version>${jmh-generator-annprocess.version}</version>
<version>${jmh-generator.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -127,8 +127,6 @@
<org.slf4j.version>1.7.21</org.slf4j.version>
<logback.version>1.1.7</logback.version>
<jmh-core.version>1.19</jmh-core.version>
<jmh-generator-annprocess.version>1.19</jmh-generator-annprocess.version>
<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
<maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
+2 -3
View File
@@ -18,12 +18,12 @@
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
<version>${jmh.version}</version>
<version>${jmh-core.version}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
<version>${jmh.version}</version>
<version>${jmh-generator.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -44,7 +44,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<jmh.version>1.21</jmh.version>
<assertj.version>3.11.1</assertj.version>
</properties>
</project>
+2 -3
View File
@@ -18,12 +18,12 @@
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
<version>${jmh.version}</version>
<version>${jmh-core.version}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
<version>${jmh.version}</version>
<version>${jmh-generator.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -106,7 +106,6 @@
<properties>
<!-- util -->
<jmh.version>1.21</jmh.version>
<commons-lang3.version>3.5</commons-lang3.version>
<vavr.version>0.9.0</vavr.version>
<protonpack.version>1.15</protonpack.version>
+1 -3
View File
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>${hamcrest-library.version}</version>
<version>${org.hamcrest.version}</version>
<scope>test</scope>
</dependency>
@@ -136,12 +136,10 @@
<commons-codec.version>1.10</commons-codec.version>
<!-- testing -->
<assertj.version>3.6.1</assertj.version>
<jmh-core.version>1.19</jmh-core.version>
<icu4j.version>61.1</icu4j.version>
<guava.version>27.0.1-jre</guava.version>
<emoji-java.version>4.0.0</emoji-java.version>
<junit-jupiter-api.version>5.3.1</junit-jupiter-api.version>
<hamcrest-library.version>1.3</hamcrest-library.version>
<passay.version>1.3.1</passay.version>
<commons-text.version>1.4</commons-text.version>
<ahocorasick.version>0.4.0</ahocorasick.version>
+2 -4
View File
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
<version>${jmh-core.version}</version>
<version>${jmh-generator.version}</version>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>${hamcrest-library.version}</version>
<version>${org.hamcrest.version}</version>
<scope>test</scope>
</dependency>
@@ -132,12 +132,10 @@
<commons-codec.version>1.10</commons-codec.version>
<!-- testing -->
<assertj.version>3.6.1</assertj.version>
<jmh-core.version>1.19</jmh-core.version>
<icu4j.version>61.1</icu4j.version>
<guava.version>27.0.1-jre</guava.version>
<emoji-java.version>4.0.0</emoji-java.version>
<junit-jupiter-api.version>5.3.1</junit-jupiter-api.version>
<hamcrest-library.version>1.3</hamcrest-library.version>
<passay.version>1.3.1</passay.version>
<commons-text.version>1.4</commons-text.version>
<ahocorasick.version>0.4.0</ahocorasick.version>
+1 -3
View File
@@ -48,7 +48,7 @@
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>javax.servlet.jsp-api</artifactId>
<version>${jsp.version}</version>
<version>${javax.servlet.jsp-api.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -90,7 +90,5 @@
<commons-fileupload.version>1.3.3</commons-fileupload.version>
<commons-io.version>2.6</commons-io.version>
<javax.servlet-api.version>4.0.1</javax.servlet-api.version>
<jstl.version>1.2</jstl.version>
<jsp.version>2.3.1</jsp.version>
</properties>
</project>
-3
View File
@@ -527,10 +527,8 @@
<com.sun.faces.jsf.version>2.2.14</com.sun.faces.jsf.version>
<httpclient.version>4.5</httpclient.version>
<arquillian-drone-bom.version>2.0.1.Final</arquillian-drone-bom.version>
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
<graphene-webdriver.version>2.1.0.Final</graphene-webdriver.version>
<maven-dependency-plugin.version>2.8</maven-dependency-plugin.version>
<jstl.version>1.2</jstl.version>
<jsp-api.version>2.2</jsp-api.version>
<ozark.version>20160715</ozark.version>
<jboss-batch-api.version>1.0.0.Final</jboss-batch-api.version>
@@ -538,7 +536,6 @@
<jboss-transaction-api.version>1.0.0.Final</jboss-transaction-api.version>
<jboss-marshalling.version>1.4.2.Final</jboss-marshalling.version>
<weld.version>2.1.1.Final</weld.version>
<h2.version>1.4.178</h2.version>
<jersey-container-jetty-servlet.version>2.22.1</jersey-container-jetty-servlet.version>
</properties>
+1 -6
View File
@@ -67,7 +67,7 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
<version>${javax.servlet.version}</version>
<version>${javax.servlet-api.version}</version>
</dependency>
<!-- Primefaces -->
@@ -99,11 +99,6 @@
<com.sun.faces.version>2.2.14</com.sun.faces.version>
<javax.el.version>3.0.0</javax.el.version>
<!--Tomcat -->
<javax.servlet.version>3.1.0</javax.servlet.version>
<jstl.version>1.2</jstl.version>
<!-- maven plugins -->
<maven-war-plugin.version>2.6</maven-war-plugin.version>
-1
View File
@@ -83,7 +83,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<hsqldb.version>2.4.1</hsqldb.version>
<spring-boot.version>2.0.4.RELEASE</spring-boot.version>
</properties>
-3
View File
@@ -95,14 +95,11 @@
<assertj.version>3.6.2</assertj.version>
<commons.io.version>2.5</commons.io.version>
<commons.dbutils.version>1.6</commons.dbutils.version>
<h2.version>1.4.196</h2.version>
<commons.collections.version>4.1</commons.collections.version>
<junit.version>4.12</junit.version>
<org.hamcrest.java-hamcrest.version>2.0.0.0</org.hamcrest.java-hamcrest.version>
<commons-codec-version>1.10.L001</commons-codec-version>
<xchart-version>3.5.2</xchart-version>
<commons-net.version>3.6</commons-net.version>
<hamcrest-all.version>1.3</hamcrest-all.version>
<common-math3.version>3.6.1</common-math3.version>
</properties>
-2
View File
@@ -432,9 +432,7 @@
<properties>
<storm.version>1.2.2</storm.version>
<kryo.version>4.0.1</kryo.version>
<h2.version>1.4.196</h2.version>
<reladomo.version>16.5.1</reladomo.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<ormlite.version>5.0</ormlite.version>
<kafka.version>1.0.0</kafka.version>
<ignite.version>2.4.0</ignite.version>
-1
View File
@@ -73,7 +73,6 @@
<properties>
<linkrest.version>2.9</linkrest.version>
<cayenne.version>4.0.B1</cayenne.version>
<h2.version>1.4.196</h2.version>
<jersey.version>2.25.1</jersey.version>
</properties>
+2 -5
View File
@@ -29,13 +29,13 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax.servlet.version}</version>
<version>${javax.servlet-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.library}</version>
<version>${jackson.version}</version>
</dependency>
<!--log4j dependencies -->
@@ -98,12 +98,9 @@
</build>
<properties>
<log4j.version>1.2.17</log4j.version>
<log4j2.version>2.7</log4j2.version>
<disruptor.version>3.3.6</disruptor.version>
<jbosslogging.version>3.3.0.Final</jbosslogging.version>
<javax.servlet.version>3.1.0</javax.servlet.version>
<jackson.library>2.9.7</jackson.library>
<maven-war-plugin.version>2.4</maven-war-plugin.version>
</properties>

Some files were not shown because too many files have changed in this diff Show More