You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/08/11 14:44:54 UTC
cxf-fediz git commit: Updating a few dependencies
Repository: cxf-fediz
Updated Branches:
refs/heads/master 613852a99 -> 83711e912
Updating a few dependencies
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/83711e91
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/83711e91
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/83711e91
Branch: refs/heads/master
Commit: 83711e912ac2f639582b2cf2e00632491d609e1b
Parents: 613852a
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Aug 11 15:44:47 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Aug 11 15:44:47 2017 +0100
----------------------------------------------------------------------
.../org/apache/cxf/fediz/core/RequestState.java | 16 +++----
plugins/pom.xml | 2 +-
pom.xml | 50 ++++----------------
services/idp-core/pom.xml | 2 +-
.../service/oidc/clients/ClientCodeGrants.java | 2 +-
services/sts/pom.xml | 2 +-
systests/custom/pom.xml | 1 -
systests/cxf/pom.xml | 1 -
systests/federation/samlsso/pom.xml | 1 -
systests/federation/unknown-subject/pom.xml | 1 -
systests/federation/wsfed/pom.xml | 1 -
systests/idp/pom.xml | 1 -
systests/kerberos/pom.xml | 1 -
systests/ldap/pom.xml | 1 -
systests/oidc/pom.xml | 1 -
systests/samlsso/pom.xml | 1 -
16 files changed, 22 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/83711e91/plugins/core/src/main/java/org/apache/cxf/fediz/core/RequestState.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/RequestState.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/RequestState.java
index 8192413..5bbe814 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/RequestState.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/RequestState.java
@@ -52,14 +52,14 @@ public class RequestState implements Serializable {
String webAppDomain,
String state,
long createdAt) {
- setTargetAddress(targetAddress);
- setIdpServiceAddress(idpServiceAddress);
- setRequestId(requestId);
- setIssuerId(issuerId);
- setWebAppContext(webAppContext);
- setWebAppDomain(webAppDomain);
- setState(state);
- setCreatedAt(createdAt);
+ this.targetAddress = targetAddress;
+ this.idpServiceAddress = idpServiceAddress;
+ this.requestId = requestId;
+ this.issuerId = issuerId;
+ this.webAppContext = webAppContext;
+ this.webAppDomain = webAppDomain;
+ this.state = state;
+ this.createdAt = createdAt;
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/83711e91/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 1e3e19b..24b5414 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -44,7 +44,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.4</version>
+ <version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/83711e91/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4f3340f..fe477ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,9 +47,9 @@
<cxf.build-utils.version>3.2.0</cxf.build-utils.version>
<dbcp.version>2.1.1</dbcp.version>
<easymock.version>3.4</easymock.version>
- <ehcache.version>2.10.3</ehcache.version>
+ <ehcache.version>2.10.4</ehcache.version>
<hsqldb.version>2.3.4</hsqldb.version>
- <htmlunit.version>2.24</htmlunit.version>
+ <htmlunit.version>2.27</htmlunit.version>
<javassist.version>3.16.1-GA</javassist.version>
<javax.el.version>2.2</javax.el.version>
<javax.validation.version>1.1.0.Final</javax.validation.version>
@@ -61,10 +61,10 @@
<openjpa.version>2.4.2</openjpa.version>
<servlet.version>2.5</servlet.version>
<slf4j.version>1.7.22</slf4j.version>
- <spring.version>4.3.5.RELEASE</spring.version>
- <spring.security.version>4.2.2.RELEASE</spring.security.version>
+ <spring.version>4.3.10.RELEASE</spring.version>
+ <spring.security.version>4.2.3.RELEASE</spring.security.version>
<tomcat8.version>8.5.12</tomcat8.version>
- <wss4j.version>2.1.9</wss4j.version>
+ <wss4j.version>2.1.10</wss4j.version>
<tomcat.url>http://localhost:8080/manager/text</tomcat.url>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -261,12 +261,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.12</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xmlbeans-maven-plugin</artifactId>
- <version>2.3.3</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -275,16 +270,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>3.0.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<configuration>
@@ -318,7 +303,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
<configuration>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
@@ -395,24 +380,9 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.20</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.9</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>3.5</version>
- </plugin>
<!-- TODO commented out for now
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -601,7 +571,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.11</version>
+ <version>0.12</version>
<configuration>
<numUnapprovedLicenses>350</numUnapprovedLicenses>
<excludeSubProjects>false</excludeSubProjects>
@@ -644,7 +614,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0</version>
</plugin>
</plugins>
</pluginManagement>
@@ -673,7 +643,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
+ <version>3.6.1</version>
<configuration>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/83711e91/services/idp-core/pom.xml
----------------------------------------------------------------------
diff --git a/services/idp-core/pom.xml b/services/idp-core/pom.xml
index c70d8af..93af355 100644
--- a/services/idp-core/pom.xml
+++ b/services/idp-core/pom.xml
@@ -185,7 +185,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
- <version>3.2.4</version>
+ <version>3.2.5</version>
</dependency>
<!--
<dependency>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/83711e91/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientCodeGrants.java
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientCodeGrants.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientCodeGrants.java
index eece486..280141e 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientCodeGrants.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientCodeGrants.java
@@ -29,7 +29,7 @@ public class ClientCodeGrants {
private List<ServerAuthorizationCodeGrant> codeGrants = new LinkedList<ServerAuthorizationCodeGrant>();
public ClientCodeGrants(Client c, List<ServerAuthorizationCodeGrant> codeGrants) {
this.client = c;
- this.setCodeGrants(codeGrants);
+ this.codeGrants = codeGrants;
}
public Client getClient() {
return client;
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/83711e91/services/sts/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/pom.xml b/services/sts/pom.xml
index 001b8f8..d40bcc1 100644
--- a/services/sts/pom.xml
+++ b/services/sts/pom.xml
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-core</artifactId>
- <version>2.2.1.RELEASE</version>
+ <version>2.3.1.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/83711e91/systests/custom/pom.xml
----------------------------------------------------------------------
diff --git a/systests/custom/pom.xml b/systests/custom/pom.xml
index ee52b5d..89c6111 100644
--- a/systests/custom/pom.xml
+++ b/systests/custom/pom.xml
@@ -191,7 +191,6 @@
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
<executions>
<execution>
<id>copy-customised-spring-sec-to-idp</id>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/83711e91/systests/cxf/pom.xml
----------------------------------------------------------------------
diff --git a/systests/cxf/pom.xml b/systests/cxf/pom.xml
index 162ef7e..d11a258 100644
--- a/systests/cxf/pom.xml
+++ b/systests/cxf/pom.xml
@@ -202,7 +202,6 @@
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
<executions>
<execution>
<id>copy-resources</id>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/83711e91/systests/federation/samlsso/pom.xml
----------------------------------------------------------------------
diff --git a/systests/federation/samlsso/pom.xml b/systests/federation/samlsso/pom.xml
index 587a5a9..def8725 100644
--- a/systests/federation/samlsso/pom.xml
+++ b/systests/federation/samlsso/pom.xml
@@ -198,7 +198,6 @@
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
<executions>
<execution>
<id>copy-entities-to-idp</id>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/83711e91/systests/federation/unknown-subject/pom.xml
----------------------------------------------------------------------
diff --git a/systests/federation/unknown-subject/pom.xml b/systests/federation/unknown-subject/pom.xml
index d8383f6..e15f805 100644
--- a/systests/federation/unknown-subject/pom.xml
+++ b/systests/federation/unknown-subject/pom.xml
@@ -195,7 +195,6 @@
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
<executions>
<execution>
<id>copy-entities-to-idp</id>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/83711e91/systests/federation/wsfed/pom.xml
----------------------------------------------------------------------
diff --git a/systests/federation/wsfed/pom.xml b/systests/federation/wsfed/pom.xml
index 0a40f20..ff533ab 100644
--- a/systests/federation/wsfed/pom.xml
+++ b/systests/federation/wsfed/pom.xml
@@ -207,7 +207,6 @@
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
<executions>
<execution>
<id>copy-entities-to-idp</id>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/83711e91/systests/idp/pom.xml
----------------------------------------------------------------------
diff --git a/systests/idp/pom.xml b/systests/idp/pom.xml
index a9f3db2..e1d2a3c 100644
--- a/systests/idp/pom.xml
+++ b/systests/idp/pom.xml
@@ -161,7 +161,6 @@
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
<executions>
<execution>
<id>copy-entities-to-idp</id>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/83711e91/systests/kerberos/pom.xml
----------------------------------------------------------------------
diff --git a/systests/kerberos/pom.xml b/systests/kerberos/pom.xml
index e508ff8..2d20519 100644
--- a/systests/kerberos/pom.xml
+++ b/systests/kerberos/pom.xml
@@ -179,7 +179,6 @@
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
<executions>
<execution>
<id>copy-entities-to-sts</id>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/83711e91/systests/ldap/pom.xml
----------------------------------------------------------------------
diff --git a/systests/ldap/pom.xml b/systests/ldap/pom.xml
index fd1c5e8..e5f5d64 100644
--- a/systests/ldap/pom.xml
+++ b/systests/ldap/pom.xml
@@ -197,7 +197,6 @@
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
<executions>
<execution>
<id>copy-entities-to-sts</id>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/83711e91/systests/oidc/pom.xml
----------------------------------------------------------------------
diff --git a/systests/oidc/pom.xml b/systests/oidc/pom.xml
index bb0d1cd..741aed3 100644
--- a/systests/oidc/pom.xml
+++ b/systests/oidc/pom.xml
@@ -197,7 +197,6 @@
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
<executions>
<execution>
<id>copy-entities-to-idp</id>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/83711e91/systests/samlsso/pom.xml
----------------------------------------------------------------------
diff --git a/systests/samlsso/pom.xml b/systests/samlsso/pom.xml
index 8d47459..be459e9 100644
--- a/systests/samlsso/pom.xml
+++ b/systests/samlsso/pom.xml
@@ -155,7 +155,6 @@
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
<executions>
<execution>
<id>copy-entities-to-idp</id>