From e58df0e51e3c4907b290ae5badd38966209ca430 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Franti=C5=A1ek=20Bu=C4=8D=C3=ADk?=
<bucik@ics.muni.cz>
Date: Fri, 29 May 2020 11:04:13 +0200
Subject: [PATCH] Updated dependencies versions
---
pom.xml | 156 +++++++++++++++++++++++++-------------------------------
1 file changed, 69 insertions(+), 87 deletions(-)
diff --git a/pom.xml b/pom.xml
index fb64f083b..74337f5a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,10 +65,6 @@
</mailingList>
</mailingLists>
- <properties>
- <java-version>1.8</java-version>
- <org.slf4j-version>1.7.25</org.slf4j-version>
- </properties>
<description>A reference implementation of OpenID Connect (http://openid.net/connect/), OAuth 2.0, and UMA built on top of Java, Spring, and Spring Security. The project contains a fully functioning server, client, and utility library.</description>
<url>https://github.com/mitreid-connect</url>
<build>
@@ -355,100 +351,113 @@
<url>https://travis-ci.org/mitreid-connect/OpenID-Connect-Java-Spring-Server</url>
</ciManagement>
+ <properties>
+ <java-version>1.8</java-version>
+ <spring.version>4.3.27.RELEASE</spring.version>
+ <spring-security.version>4.2.8.RELEASE</spring-security.version>
+ <spring-security-oauth2.version>2.4.1.RELEASE</spring-security-oauth2.version>
+ <jackson.version>2.11.0</jackson.version>
+ <jstl.version>1.2</jstl.version>
+ <servlet-api.version>4.0.1</servlet-api.version>
+ <jsp-api.version>2.2</jsp-api.version>
+ <mysql.version>8.0.20</mysql.version>
+ <hsqldb.version>2.4.0</hsqldb.version>
+ <eclipse-persistence.version>2.7.7</eclipse-persistence.version>
+ <javax-persistence.version>2.2.1</javax-persistence.version>
+ <hikari.version>2.12.0</hikari.version>
+ <org.slf4j-version>1.7.30</org.slf4j-version>
+ <log4j-core.version>2.13.3</log4j-core.version>
+ <junit-jupiter-api.version>5.6.2</junit-jupiter-api.version>
+ <easymock.version>4.2</easymock.version>
+ <mockito-all.version>1.10.19</mockito-all.version>
+ <guava.version>29.0-jre</guava.version>
+ <gson.version>2.8.6</gson.version>
+ <httpclient.version>4.5.12</httpclient.version>
+ <nimbus-jose-jwt.version>8.17.1</nimbus-jose-jwt.version>
+ <bcprov-jdk15on.version>1.65.01</bcprov-jdk15on.version>
+ <commons-io.version>2.7</commons-io.version>
+ <wro4j-extensions.version>1.9.0</wro4j-extensions.version>
+ </properties>
+
<dependencyManagement>
<dependencies>
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
- <version>4.3.22.RELEASE</version>
+ <version>${spring.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
-
- <!-- Jackson -->
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.9.8</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>2.9.8</version>
- </dependency>
-
<!-- Spring Security -->
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-bom</artifactId>
- <version>4.2.11.RELEASE</version>
+ <version>${spring-security.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.security.oauth</groupId>
<artifactId>spring-security-oauth2</artifactId>
- <version>2.1.0.RELEASE</version>
+ <version>${spring-security-oauth2.version}</version>
+ </dependency>
+ <!-- Jackson -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
</dependency>
-
<!-- Servlet -->
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId>
- <version>1.2</version>
+ <version>${jstl.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <version>${jsp-api.version}</version>
<scope>provided</scope>
</dependency>
-
<!-- Database -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.42</version>
+ <version>${mysql.version}</version>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>2.3.4</version>
- </dependency>
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>42.0.0.jre7</version>
- </dependency>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc6</artifactId>
- <version>11.1.0.7.0</version>
+ <version>${hsqldb.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpa</artifactId>
- <version>2.7.4</version>
+ <version>${eclipse-persistence.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>javax.persistence</artifactId>
- <version>2.2.1</version>
+ <version>${javax-persistence.version}</version>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
- <version>2.6.1</version>
+ <version>${hikari.version}</version>
</dependency>
-
-
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -473,9 +482,9 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j-core.version}</version>
<exclusions>
<exclusion>
<groupId>javax.mail</groupId>
@@ -496,37 +505,26 @@
</exclusions>
<scope>runtime</scope>
</dependency>
-
<!-- Test -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${junit-jupiter-api.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>3.4</version>
+ <version>${easymock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
+ <version>${mockito-all.version}</version>
<scope>test</scope>
</dependency>
<!-- MITREid Connect components -->
- <dependency>
- <groupId>org.mitre</groupId>
- <artifactId>openid-connect-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.mitre</groupId>
- <artifactId>openid-connect-client</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.mitre</groupId>
<artifactId>openid-connect-server</artifactId>
@@ -544,33 +542,21 @@
<version>${project.version}</version>
<type>warpath</type>
</dependency>
- <dependency>
- <groupId>org.mitre</groupId>
- <artifactId>uma-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.mitre</groupId>
- <artifactId>uma-server-webapp</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
-
<!-- Other libraries -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>27.0-jre</version>
+ <version>${guava.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.8.0</version>
+ <version>${gson.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.3</version>
+ <version>${httpclient.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -581,27 +567,27 @@
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
- <version>5.4</version>
+ <version>${nimbus-jose-jwt.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
- <version>[1.52,)</version>
+ <version>${bcprov-jdk15on.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.core</artifactId>
- <version>2.7.4</version>
+ <version>${eclipse-persistence.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-io</artifactId>
- <version>1.3.2</version>
+ <version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-extensions</artifactId>
- <version>1.8.0</version>
+ <version>${wro4j-extensions.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -634,10 +620,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>