From 2b986b919ec2057b3770af31f3307c46306e60cb Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 31 Mar 2014 15:01:45 +0200 Subject: exclude Spring Framework from HyperJAXB plugin --- id/server/moa-id-commons/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'id') diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml index e494033a0..c8593ee5f 100644 --- a/id/server/moa-id-commons/pom.xml +++ b/id/server/moa-id-commons/pom.xml @@ -75,6 +75,10 @@ org.hibernate.javax.persistence hibernate-jpa-2.0-api + + org.springframework + spring + -- cgit v1.2.3 From c864d453105f08786c24ce932b0b9a349058fd68 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 31 Mar 2014 15:11:16 +0200 Subject: Update commons-io.jar to version 2.4 --- id/oa/pom.xml | 7 ++----- pom.xml | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'id') diff --git a/id/oa/pom.xml b/id/oa/pom.xml index cc2bff4b0..9b6f4525c 100644 --- a/id/oa/pom.xml +++ b/id/oa/pom.xml @@ -61,18 +61,15 @@ org.opensaml opensaml - 2.6.0 - + org.opensaml xmltooling - 1.4.0 - + javax.servlet servlet-api provided - 2.4 jstl diff --git a/pom.xml b/pom.xml index c12743d20..97cb94155 100644 --- a/pom.xml +++ b/pom.xml @@ -475,7 +475,7 @@ commons-io commons-io - 1.3.2 + 2.4 -- cgit v1.2.3 From 8e595eec1e3418e3c71037fc2c3752a243fc49d6 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 31 Mar 2014 15:36:27 +0200 Subject: update slf4j to version 1.7.6 --- common/pom.xml | 10 +++++----- id/server/idserverlib/pom.xml | 10 +++++----- id/server/stork2-saml-engine/pom.xml | 14 +++++++------- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'id') diff --git a/common/pom.xml b/common/pom.xml index dba1c60fe..b3fc943ff 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -72,27 +72,27 @@ org.slf4j slf4j-api - 1.7.5 + 1.7.6 org.slf4j slf4j-simple - 1.7.5 + 1.7.6 org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.6 org.slf4j log4j-over-slf4j - 1.7.5 + 1.7.6 org.slf4j jul-to-slf4j - 1.7.5 + 1.7.6 diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 4c9a5e768..fd0c3737a 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -138,27 +138,27 @@ org.slf4j slf4j-api - 1.7.5 + 1.7.6 org.slf4j slf4j-simple - 1.7.5 + 1.7.6 org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.6 org.slf4j log4j-over-slf4j - 1.7.5 + 1.7.6 org.slf4j jul-to-slf4j - 1.7.5 + 1.7.6 diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml index 9b294f6d6..ec328e039 100644 --- a/id/server/stork2-saml-engine/pom.xml +++ b/id/server/stork2-saml-engine/pom.xml @@ -54,7 +54,7 @@ org.opensaml opensaml - ${opensaml.version} + org.slf4j @@ -82,33 +82,33 @@ org.slf4j slf4j-api - 1.7.5 + 1.7.6 org.slf4j slf4j-simple - 1.7.5 + 1.7.6 org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.6 org.slf4j log4j-over-slf4j - 1.7.5 + 1.7.6 org.slf4j jul-to-slf4j - 1.7.5 + 1.7.6 commons-io commons-io - 2.2 + 2.4 compile -- cgit v1.2.3 From ab536c2da230c4e96ffd589ef1828da193197e84 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 31 Mar 2014 15:58:49 +0200 Subject: update WebServiceTools to version 2.3 --- id/server/idserverlib/pom.xml | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'id') diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index fd0c3737a..46f79c8ff 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -68,25 +68,17 @@ axis - - - - - com.sun.xml.ws - jaxws-tools - 2.1.7 + 2.3 - - + javax.mail mail -- cgit v1.2.3 From c1842312eab80c1d6a013dfa294459a2d354c7b8 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 31 Mar 2014 16:20:01 +0200 Subject: remove unused regexp.jar --- id/server/idserverlib/pom.xml | 7 ++++--- pom.xml | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'id') diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 46f79c8ff..b37c11faa 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -216,11 +216,12 @@ org.opensaml xmltooling - - + + + -- cgit v1.2.3 From 52bcaffeccf3e163e4073004ca4dfd86474cfac5 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 31 Mar 2014 16:27:42 +0200 Subject: update Google OAuth libraries -jsontoken to 1.1 -OAuth to 1.18.0-rc --- id/server/idserverlib/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'id') diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index b37c11faa..052d6d63e 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -237,7 +237,7 @@ com.googlecode.jsontoken jsontoken - 1.0 + 1.1 @@ -250,13 +250,13 @@ com.google.http-client google-http-client-jackson2 - 1.17.0-rc + 1.18.0-rc test com.google.oauth-client google-oauth-client-jetty - 1.17.0-rc + 1.18.0-rc test -- cgit v1.2.3 From 4645963011550f50dd1a40186d5896b468f010d1 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 31 Mar 2014 16:48:57 +0200 Subject: update Struts to version 2.3.16.1 --- id/ConfigWebTool/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'id') diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml index 25dbcc25d..a412858d8 100644 --- a/id/ConfigWebTool/pom.xml +++ b/id/ConfigWebTool/pom.xml @@ -97,12 +97,12 @@ org.apache.struts struts2-core - 2.3.14.3 + 2.3.16.1 org.apache.struts struts2-json-plugin - 2.3.14.3 + 2.3.16.1 -- cgit v1.2.3 From 779030ed2d7091183b3faf13fec57fa270d46c3a Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Tue, 1 Apr 2014 14:02:19 +0200 Subject: change version to 2.0.1 --- common/pom.xml | 2 +- id/ConfigWebTool/pom.xml | 4 ++-- id/oa/pom.xml | 4 ++-- id/pom.xml | 4 ++-- id/server/auth/pom.xml | 2 +- id/server/idserverlib/pom.xml | 2 +- id/server/moa-id-commons/pom.xml | 2 +- id/server/pom.xml | 2 +- id/server/proxy/pom.xml | 2 +- id/server/stork2-commons/pom.xml | 5 +++++ id/server/stork2-saml-engine/pom.xml | 2 +- pom.xml | 16 ++++++++-------- spss/pom.xml | 2 +- spss/server/serverlib/pom.xml | 2 +- spss/server/serverws/pom.xml | 2 +- spss/server/tools/pom.xml | 2 +- 16 files changed, 30 insertions(+), 25 deletions(-) (limited to 'id') diff --git a/common/pom.xml b/common/pom.xml index b3fc943ff..fffb1a460 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -3,7 +3,7 @@ MOA MOA - 2.0.0 + 2.0.1 4.0.0 moa-common diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml index a412858d8..1b29b68de 100644 --- a/id/ConfigWebTool/pom.xml +++ b/id/ConfigWebTool/pom.xml @@ -2,13 +2,13 @@ MOA id - 2.0.0 + 2.0.1 4.0.0 MOA.id moa-id-configuration - 1.0.0 + 1.0.1 war MOA-ID 2.0 Configuration Tool Web based Configuration Tool for MOA-ID 2.x diff --git a/id/oa/pom.xml b/id/oa/pom.xml index 9b6f4525c..b88f560fb 100644 --- a/id/oa/pom.xml +++ b/id/oa/pom.xml @@ -4,14 +4,14 @@ MOA id - 2.0.0 + 2.0.1 4.0.0 MOA.id moa-id-oa war - 2.0.0 + 2.0.1 MOA Sample OA diff --git a/id/pom.xml b/id/pom.xml index 6b96451fa..7bf09edfa 100644 --- a/id/pom.xml +++ b/id/pom.xml @@ -3,13 +3,13 @@ MOA MOA - 2.0.0 + 2.0.1 4.0.0 id pom - 2.0.0 + 2.0.1 MOA ID diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index 1f8417ea2..618429a8e 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -2,7 +2,7 @@ MOA.id moa-id - 2.0.0 + 2.0.1 4.0.0 diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 052d6d63e..ae4c57fc8 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -3,7 +3,7 @@ MOA.id moa-id - 2.0.0 + 2.0.1 4.0.0 diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml index c8593ee5f..5da911f89 100644 --- a/id/server/moa-id-commons/pom.xml +++ b/id/server/moa-id-commons/pom.xml @@ -3,7 +3,7 @@ MOA.id moa-id - 2.0.0 + 2.0.1 moa-id-commons moa-id-commons diff --git a/id/server/pom.xml b/id/server/pom.xml index ccb958508..d748c01eb 100644 --- a/id/server/pom.xml +++ b/id/server/pom.xml @@ -4,7 +4,7 @@ MOA id - 2.0.0 + 2.0.1 4.0.0 diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml index 3d4d8c74d..e47b31144 100644 --- a/id/server/proxy/pom.xml +++ b/id/server/proxy/pom.xml @@ -2,7 +2,7 @@ MOA.id moa-id - 2.0.0 + 2.0.1 diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml index 04b35f5f5..b13035307 100644 --- a/id/server/stork2-commons/pom.xml +++ b/id/server/stork2-commons/pom.xml @@ -1,5 +1,10 @@ + + MOA.id + moa-id + 2.0.1 + 4.0.0 eu.stork Commons diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml index ec328e039..e4af3d90e 100644 --- a/id/server/stork2-saml-engine/pom.xml +++ b/id/server/stork2-saml-engine/pom.xml @@ -3,7 +3,7 @@ MOA.id moa-id - 2.0.0 + 2.0.1 4.0.0 diff --git a/pom.xml b/pom.xml index 90284c712..83d686eae 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ MOA MOA pom - 2.0.0 + 2.0.1 MOA @@ -47,8 +47,8 @@ true ${env.BUILD_EXECUTEABLE} ${env.BUILD_VERSION} - 1.5 - 1.5 + 1.7 + 1.7 @@ -195,32 +195,32 @@ MOA moa-common - 2.0.0 + 2.0.1 compile MOA.id.server moa-id-lib - 2.0.0 + 2.0.1 compile MOA.spss.server moa-spss-lib - 2.0.0 + 2.0.1 compile MOA moa-common - 2.0.0 + 2.0.1 test-jar test MOA.spss.server moa-spss-tools - 2.0.0 + 2.0.1 test diff --git a/spss/pom.xml b/spss/pom.xml index 799286889..165a09dba 100644 --- a/spss/pom.xml +++ b/spss/pom.xml @@ -3,7 +3,7 @@ MOA MOA - 2.0.0 + 2.0.1 4.0.0 diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml index 4eb2a2218..42cf5bfc9 100644 --- a/spss/server/serverlib/pom.xml +++ b/spss/server/serverlib/pom.xml @@ -9,7 +9,7 @@ MOA.spss.server moa-spss-lib jar - 2.0.0 + 2.0.1 MOA SP/SS API diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml index 76319b676..4f09e940d 100644 --- a/spss/server/serverws/pom.xml +++ b/spss/server/serverws/pom.xml @@ -10,7 +10,7 @@ MOA.spss.server moa-spss-ws war - 2.0.0 + 2.0.1 MOA SP/SS WebService diff --git a/spss/server/tools/pom.xml b/spss/server/tools/pom.xml index 503c49545..acc06ff38 100644 --- a/spss/server/tools/pom.xml +++ b/spss/server/tools/pom.xml @@ -9,7 +9,7 @@ MOA.spss.server moa-spss-tools jar - 2.0.0 + 2.0.1 MOA SP/SS Tools -- cgit v1.2.3