aboutsummaryrefslogtreecommitdiff
path: root/id
diff options
context:
space:
mode:
Diffstat (limited to 'id')
-rw-r--r--id/ConfigWebTool/pom.xml26
-rw-r--r--id/history.txt22
-rw-r--r--id/moa-spss-container/pom.xml2
-rw-r--r--id/oa/pom.xml6
-rw-r--r--id/readme_3.1.0-RC2.txt1
-rw-r--r--id/server/auth-edu/pom.xml5
-rw-r--r--id/server/idserverlib/pom.xml4
-rw-r--r--id/server/moa-id-commons/pom.xml10
8 files changed, 44 insertions, 32 deletions
diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index ecb956bb8..c672d32a6 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -57,17 +57,19 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency>
<dependency>
<groupId>MOA.id.server</groupId>
<artifactId>moa-id-commons</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>hibernate-c3p0</artifactId>
+ <groupId>org.hibernate</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -180,8 +182,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>openws</artifactId>
- <!-- <version>${openws-version}</version> -->
- <version>1.5.4</version>
+ <version>1.5.6</version>
<exclusions>
<exclusion>
<artifactId>log4j-over-slf4j</artifactId>
@@ -198,16 +199,23 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>javassist</artifactId>
+ <groupId>javassist</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-json-plugin</artifactId>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- </dependency>
+ </dependency> -->
+
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
diff --git a/id/history.txt b/id/history.txt
index 254c5cd11..ab081c9d5 100644
--- a/id/history.txt
+++ b/id/history.txt
@@ -8,23 +8,27 @@ Version MOA-ID Release 3.1.0: Änderungen seit Version MOA-ID 3.0.2
- Überarbeitung der Weboberfläche des Konfigurationstools
- Update der beigelegten Templates (BKU-Auswahl, SSO Assertion Conformation,
Front-Channel Single LogOut, ...)
+ - Inkludierung der neuen Logos für Karte und Handy-Signatur
- Optimierung des internen Prozessablaufs
- Kleinere Bug-Fixes
- Update von Libraries
> mysql:mysql-connector-java 5.1.38
- > org.slf4j:jcl-over-slf4j 1.7.13
- > org.slf4j:jul-to-slf4j 1.7.13
- > org.slf4j:slf4j-api 1.7.13
- > org.slf4j:slf4j-log4j12 1.7.13
- > apache:cxf 3.1.4
- > org.springframework 4.2.4.RELEASE
+ > org.slf4j:jcl-over-slf4j 1.7.19
+ > org.slf4j:jul-to-slf4j 1.7.19
+ > org.slf4j:slf4j-api 1.7.19
+ > org.slf4j:slf4j-log4j12 1.7.19
+ > apache:cxf 3.1.5
+ > org.springframework 4.2.5.RELEASE
+ > opensaml 2.6.6
+ > xmlsec 2.0.6
> commons:collections3 3.2.2
> commons:collections4 4.1
> org.apache.struts:struts2-core 2.3.24.1
> org.apache.struts:struts2-json-plugin 2.3.24.1
- > org.hibernate:hibernate-core 4.3.11.Final
- > org.hibernate:hibernate-entitymanager 4.3.11.Final
- > org.hibernate:hibernate-c3p0 4.3.11.Final
+ > org.hibernate:hibernate-core 5.1.0.Final
+ > org.hibernate:hibernate-entitymanager 5.1.0.Final
+ > org.hibernate:hibernate-c3p0 5.1.0.Final
+ > commons-dbcp2 2.1.1
> com.google.http-client:google-http-client-jackson2 1.21.0
> com.google.oauth-client:google-oauth-client-jetty 1.21.0
diff --git a/id/moa-spss-container/pom.xml b/id/moa-spss-container/pom.xml
index fb08989b4..32bea1974 100644
--- a/id/moa-spss-container/pom.xml
+++ b/id/moa-spss-container/pom.xml
@@ -121,7 +121,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/id/oa/pom.xml b/id/oa/pom.xml
index 8abd75461..c2eb6238c 100644
--- a/id/oa/pom.xml
+++ b/id/oa/pom.xml
@@ -70,11 +70,11 @@
<version>1.2</version>
<scope>provided</scope>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.opensaml</groupId>
@@ -98,7 +98,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/id/readme_3.1.0-RC2.txt b/id/readme_3.1.0-RC2.txt
index cdf2fb928..f06dd4f19 100644
--- a/id/readme_3.1.0-RC2.txt
+++ b/id/readme_3.1.0-RC2.txt
@@ -16,6 +16,7 @@ history.txt im gleichen Verzeichnis).
- Änderung der von MOA-ID verwendeten PVP 2.x EntityID
- Überarbeitung der Weboberfläche des Konfigurationstools
- Überarbeitung aller GUI Templates (BKU-Auswahl, Fehlermeldungen, ...)
+ - Inkludierung der neuen Logos für Karte und Handy-Signatur
- Optimierung der internen Prozesse
- Kleinere Bug-Fixes
- Update von Libraries
diff --git a/id/server/auth-edu/pom.xml b/id/server/auth-edu/pom.xml
index fc6b8fe23..090bb985b 100644
--- a/id/server/auth-edu/pom.xml
+++ b/id/server/auth-edu/pom.xml
@@ -206,6 +206,11 @@
<version>${moa-id-version}</version>
</dependency>
+<!-- <dependency>
+ <groupId>org.apache.santuario</groupId>
+ <artifactId>xmlsec</artifactId>
+ </dependency> -->
+
<!-- transitive dependencies we don't want to include into the war -->
<dependency>
<groupId>iaik.prod</groupId>
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index b226f01b3..fcadf1f36 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>6.1.1</version>
+ <version>6.9.10</version>
<scope>test</scope>
</dependency>
@@ -312,7 +312,7 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.4.178</version>
+ <version>1.4.191</version>
<scope>test</scope>
</dependency>
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index df38c8384..ea9e06fd6 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -245,7 +245,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
@@ -266,16 +266,10 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.4.178</version>
+ <version>1.4.191</version>
<scope>test</scope>
</dependency>
-<!-- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
- </dependency> -->
-
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>