Update versions and properties for proper alignment

(cherry picked from commit c8be651218b736c072bc1f04e2c32cdd81b72d4e)
This commit is contained in:
Martin Kanis 2018-12-19 11:34:27 +01:00 committed by Stian Thorgersen
parent a18ed95e94
commit 7eacb43042
6 changed files with 9 additions and 11 deletions

View file

@ -21,6 +21,7 @@
<xstream.version>1.4.10</xstream.version>
<antlr-runtime.version>3.5.2</antlr-runtime.version>
<ant.version>1.8.4</ant.version>
<ant-launcher.version>1.8.4</ant-launcher.version>
<maven.version>3.3.9</maven.version>
<wagon.version>3.0.0</wagon.version>
<plexus-classworlds.version>2.5.2</plexus-classworlds.version>
@ -77,7 +78,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
<version>${ant.version}</version>
<version>${ant-launcher.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>

View file

@ -63,6 +63,7 @@
<h2.version>1.4.193</h2.version>
<javax.persistence.version>2.2</javax.persistence.version>
<hibernate.core.version>5.3.6.Final</hibernate.core.version>
<hibernate.c3p0.version>5.3.6.Final</hibernate.c3p0.version>
<infinispan.version>9.3.1.Final</infinispan.version>
<jackson.version>2.9.5</jackson.version>
<javax.mail.version>1.6.1</javax.mail.version>
@ -75,7 +76,9 @@
<jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>1.0.3.Final</jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>
<log4j.version>1.2.17</log4j.version>
<resteasy.version>3.6.1.Final</resteasy.version>
<resteasy.undertow.version>3.6.1.Final</resteasy.undertow.version>
<owasp.html.sanitizer.version>20180219.1</owasp.html.sanitizer.version>
<slf4j-api.version>1.7.22</slf4j-api.version>
<slf4j.version>1.7.22</slf4j.version>
<sun.istack.version>3.0.5</sun.istack.version>
<sun.jaxb.version>2.3.0</sun.jaxb.version>
@ -304,7 +307,7 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-undertow</artifactId>
<version>${resteasy.version}</version>
<version>${resteasy.undertow.version}</version>
<exclusions>
<exclusion>
<groupId>io.undertow</groupId>
@ -444,7 +447,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-c3p0</artifactId>
<version>${hibernate.core.version}</version>
<version>${hibernate.c3p0.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@ -571,7 +574,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
<version>${slf4j-api.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>

View file

@ -1483,7 +1483,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.2</version>
<version>1.8.4</version>
<type>jar</type>
</dependency>

View file

@ -57,12 +57,10 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>

View file

@ -54,12 +54,10 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>

View file

@ -54,12 +54,10 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>