From ac531e30d13d6714e2ac61f7329e6adc130aa288 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 24 May 2019 12:23:41 +0200
Subject: untested switch to EAAF-components 1.0.7

---
 id/server/idserverlib/pom.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 4d8843ead..1fd6b3695 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -74,7 +74,6 @@
     <dependency>
     	<groupId>at.gv.egiz.components</groupId>
     	<artifactId>egiz-spring-api</artifactId>
-    	<version>0.1</version>
     </dependency>
     
     <dependency>
@@ -244,6 +243,10 @@
 			<groupId>commons-discovery</groupId>
 			<artifactId>commons-discovery</artifactId>
 		</dependency> -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+    		<artifactId>commons-text</artifactId>
+		</dependency>
  		<dependency>
 			<groupId>commons-fileupload</groupId>
 			<artifactId>commons-fileupload</artifactId>
-- 
cgit v1.2.3


From 66859cd53d4181350525e91c4d35071932675ca7 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 29 May 2019 14:04:44 +0200
Subject: refactoring from MOA-ID 3.4.x to MOA E-ID Proxy 4.0.x

---
 id/server/idserverlib/pom.xml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 1fd6b3695..67a5a6e68 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -175,12 +175,21 @@
             </exclusions>
         </dependency>
 				
-				<dependency>
-					<groupId>commons-collections</groupId>
-					<artifactId>commons-collections</artifactId>
-				</dependency>
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+		</dependency>
 				
-		  <dependency>
+		<dependency>				
+			<groupId>javax.xml.ws</groupId>
+    		<artifactId>jaxws-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.jws</groupId>
+    		<artifactId>javax.jws-api</artifactId>
+		</dependency>
+				
+		<dependency>
         	<groupId>org.apache.cxf</groupId>
         	<artifactId>cxf-rt-frontend-jaxws</artifactId>
     	</dependency>
-- 
cgit v1.2.3


From d7b6e57eeb37ef02ceadfe51ca730bccbed939c6 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 7 Jun 2019 10:46:34 +0200
Subject: update third-party libs

---
 id/server/idserverlib/pom.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 67a5a6e68..703b2a8a5 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -44,7 +44,7 @@
 		<dependency>
 			<groupId>javax.annotation</groupId>
 			<artifactId>javax.annotation-api</artifactId>
-			<version>1.2</version>
+			<version>1.3.2</version>
 		</dependency>
 
  		<dependency>
@@ -505,12 +505,12 @@
 	    <dependency>
 	    	<groupId>org.apache.commons</groupId>
 	    	<artifactId>commons-pool2</artifactId>
-	    	<version>2.6.0</version>
+	    	<version>2.6.2</version>
 	    </dependency>
 	    <dependency>
 	    	<groupId>redis.clients</groupId>
 	    	<artifactId>jedis</artifactId>
-	    	<version>2.9.0</version>
+	    	<version>3.0.1</version>
 	    </dependency>
 	
 <!-- 	    <dependency>
@@ -527,7 +527,6 @@
 	    <dependency>
     		<groupId>com.fasterxml.jackson.core</groupId>
     		<artifactId>jackson-core</artifactId>
-    		<version>2.9.7</version>
 		</dependency>
 	</dependencies>
 
-- 
cgit v1.2.3


From 54f5d0ba499454bdb3890b38f9a5af67175b8354 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 12 Jun 2019 15:10:03 +0200
Subject: downgrade jedis to solve dependency problems

---
 id/server/idserverlib/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 703b2a8a5..c921dacf8 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -499,7 +499,6 @@
  		<dependency>
 	        <groupId>org.springframework.data</groupId>
 	        <artifactId>spring-data-redis</artifactId>
-	        <version>${org.springframework.data.spring-data-redis}</version>
 	    </dependency>
 	
 	    <dependency>
@@ -510,7 +509,8 @@
 	    <dependency>
 	    	<groupId>redis.clients</groupId>
 	    	<artifactId>jedis</artifactId>
-	    	<version>3.0.1</version>
+	    	<!-- version>3.0.1</version -->
+	    	<version>2.10.2</version>
 	    </dependency>
 	
 <!-- 	    <dependency>
-- 
cgit v1.2.3


From b0a0f1baf5a17df00c61d151c03ba3e6f6a99685 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 5 Aug 2019 14:40:23 +0200
Subject: change version structure of project

---
 id/server/idserverlib/pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index c921dacf8..ae70a6a7e 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -4,12 +4,11 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>3.x</version>
+		<version>4.0.1-snapshot</version>
 	</parent>
 
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-lib</artifactId>
-	<version>${moa-id-version}</version>
 	<packaging>jar</packaging>
 	<name>MOA ID API</name>
 
-- 
cgit v1.2.3


From 9ac6dded6ec870f6d6ae03dbb43214ef2489e3c3 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 5 Aug 2019 15:21:30 +0200
Subject: update paths to maven repos

---
 id/server/idserverlib/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index ae70a6a7e..b12b2cb17 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -20,7 +20,7 @@
 		<repository>
 			<id>shibboleth.internet2.edu</id>
 			<name>Internet2</name>
-			<url>https://build.shibboleth.net/nexus/content/groups/public/</url>
+			<url>https://apps.egiz.gv.at/shibboleth_nexus/</url>
 		</repository>
 	</repositories>
 
-- 
cgit v1.2.3


From 00bdab2679d27e0b6db21fe97915211c7d771c52 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 5 Aug 2019 16:00:30 +0200
Subject: test profiles to switch between Java <=8 and Java > 8

---
 id/server/idserverlib/pom.xml | 276 +++++++++++++++++++++++++-----------------
 1 file changed, 165 insertions(+), 111 deletions(-)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index b12b2cb17..b576c7a87 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -529,90 +529,174 @@
 		</dependency>
 	</dependencies>
 
+	<profiles>
+		<profile>
+			<id>java8</id>
+			<activation>
+				<jdk>[1.7,1.8]</jdk>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>3.0.1</version>
+						<dependencies>
+							<dependency>
+		    					<groupId>javax.annotation</groupId>
+		    					<artifactId>javax.annotation-api</artifactId>
+							    <version>1.3.1</version>
+							    <scope>compile</scope>
+							</dependency>
+						</dependencies>
+						<configuration>
+							<charset>UTF-8</charset>
+							<docencoding>UTF-8</docencoding>
+							<quiet>true</quiet>
+							<author>false</author>
+							<version>false</version>
+							<use>true</use>
+						  <failOnError>false</failOnError>
+							<excludePackageNames>at.gv.egovernment.moa.spss.server.*;at.gv.egovernment.moa.spss.api.impl.*;at.gv.egovernment.moa.spss.impl.*;at.gv.egovernment.moa.id.client.*</excludePackageNames>
+							<tags>
+								<tag>
+									<name>pre</name>
+									<placement>a</placement>
+									<head>Preconditions:</head>
+								</tag>
+								<tag>
+									<name>post</name>
+									<placement>a</placement>
+									<head>Postconditions:</head>
+								</tag>
+							</tags>
+							<links>
+								<link>http://docs.oracle.com/javase/7/docs/api/</link>
+								<link>http://logging.apache.org/log4j/docs/api/</link>
+							</links>
+							<target>1.7</target>
+						</configuration>
+						<executions>
+							<execution>
+								<id>generate-javadoc</id>
+								<phase>package</phase>
+								<goals>
+									<goal>jar</goal>
+								</goals>	
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<version>${surefire.version}</version>
+						<configuration>
+							<threadCount>1</threadCount>
+						</configuration>
+						<dependencies>
+							<dependency>
+								<groupId>org.apache.maven.surefire</groupId>
+								<artifactId>surefire-junit47</artifactId>
+								<version>${surefire.version}</version>
+							</dependency>
+						</dependencies>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>java9</id>
+			<activation>
+				<jdk>[1.9,1.99)</jdk>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>3.0.1</version>
+						<dependencies>
+							<dependency>
+		    					<groupId>javax.annotation</groupId>
+		    					<artifactId>javax.annotation-api</artifactId>
+							    <version>1.3.1</version>
+							    <scope>compile</scope>
+							</dependency>
+						</dependencies>
+						<configuration>
+							<charset>UTF-8</charset>
+							<docencoding>UTF-8</docencoding>
+							<quiet>true</quiet>
+							<author>false</author>
+							<version>false</version>
+							<use>true</use>
+						  <failOnError>false</failOnError>
+							<excludePackageNames>at.gv.egovernment.moa.spss.server.*;at.gv.egovernment.moa.spss.api.impl.*;at.gv.egovernment.moa.spss.impl.*;at.gv.egovernment.moa.id.client.*</excludePackageNames>
+							<tags>
+								<tag>
+									<name>pre</name>
+									<placement>a</placement>
+									<head>Preconditions:</head>
+								</tag>
+								<tag>
+									<name>post</name>
+									<placement>a</placement>
+									<head>Postconditions:</head>
+								</tag>
+							</tags>
+							<links>
+								<link>http://docs.oracle.com/javase/7/docs/api/</link>
+								<link>http://logging.apache.org/log4j/docs/api/</link>
+							</links>
+							<target>1.7</target>
+						</configuration>
+						<executions>
+							<execution>
+								<id>generate-javadoc</id>
+								<phase>package</phase>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+								<configuration>
+									<!-- <additionalparam>-Xdoclint:none ${additionalparam}</additionalparam> -->
+		                			<additionalparam>--add-modules ALL-SYSTEM ${additionalparam}</additionalparam>
+		                			<additionalOptions>--add-modules ALL-SYSTEM</additionalOptions>
+		            			</configuration>	
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<version>${surefire.version}</version>
+						<configuration>
+							<threadCount>1</threadCount>
+							<argLine>--add-modules java.xml.bind</argLine>
+						</configuration>
+						<dependencies>
+							<dependency>
+								<groupId>org.apache.maven.surefire</groupId>
+								<artifactId>surefire-junit47</artifactId>
+								<version>${surefire.version}</version>
+							</dependency>
+						</dependencies>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
 	<build>
-		<plugins>
-<!-- 		        <plugin>
-            		<groupId>org.codehaus.mojo</groupId>
-            		<artifactId>properties-maven-plugin</artifactId>
-            		<version>1.0-alpha-2</version>
-            		<executions>
-                		<execution>
-                    		<phase>initialize</phase>
-                    		<goals>
-                        		<goal>read-project-properties</goal>
-                    		</goals>
-                    		<configuration>
-    	                   		<files>
-		                            <file>${basedir}/../../../moa-id.properties</file>
-      		                  </files>
-          		          </configuration>
-              		  </execution>
-            		</executions>
-        		</plugin> -->
-        		        		
-				<plugin>
-	        <groupId>org.apache.maven.plugins</groupId>
-	        <artifactId>maven-dependency-plugin</artifactId>
-	        <version>2.8</version>
-	        <executions>
-	        </executions>
-	      </plugin>
+		<plugins>     		        		
+			<plugin>
+	        	<groupId>org.apache.maven.plugins</groupId>
+	        	<artifactId>maven-dependency-plugin</artifactId>
+	        	<version>2.8</version>
+	        	<executions>
+	        	</executions>
+	      	</plugin>
 
+			
 
-						<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.0.1</version>
-				<dependencies>
-					<dependency>
-    					<groupId>javax.annotation</groupId>
-    					<artifactId>javax.annotation-api</artifactId>
-					    <version>1.3.1</version>
-					    <scope>compile</scope>
-					</dependency>
-				</dependencies>
-				<configuration>
-					<charset>UTF-8</charset>
-					<docencoding>UTF-8</docencoding>
-					<quiet>true</quiet>
-					<author>false</author>
-					<version>false</version>
-					<use>true</use>
-				  <failOnError>false</failOnError>
-					<excludePackageNames>at.gv.egovernment.moa.spss.server.*;at.gv.egovernment.moa.spss.api.impl.*;at.gv.egovernment.moa.spss.impl.*;at.gv.egovernment.moa.id.client.*</excludePackageNames>
-					<tags>
-						<tag>
-							<name>pre</name>
-							<placement>a</placement>
-							<head>Preconditions:</head>
-						</tag>
-						<tag>
-							<name>post</name>
-							<placement>a</placement>
-							<head>Postconditions:</head>
-						</tag>
-					</tags>
-					<links>
-						<link>http://docs.oracle.com/javase/7/docs/api/</link>
-						<link>http://logging.apache.org/log4j/docs/api/</link>
-					</links>
-					<target>1.7</target>
-				</configuration>
-				<executions>
-					<execution>
-						<id>generate-javadoc</id>
-						<phase>package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<!-- <additionalparam>-Xdoclint:none ${additionalparam}</additionalparam> -->
-                			<additionalparam>--add-modules ALL-SYSTEM ${additionalparam}</additionalparam>
-                			<additionalOptions>--add-modules ALL-SYSTEM</additionalOptions>
-            			</configuration>	
-					</execution>
-				</executions>
-			</plugin>
+		
              <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -627,13 +711,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-<!-- 				<configuration>
-				<skip>true</skip>
-				<skipTests>true</skipTests>
-					<archive>
-						<addMavenDescriptor>false</addMavenDescriptor>
-					</archive>
-				</configuration> -->
 				<executions>
 					<execution>
 						<goals>
@@ -642,29 +719,6 @@
 					</execution>
 				</executions>
 			</plugin>
-
-			<!-- enable co-existence of testng and junit -->
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>${surefire.version}</version>
-				<configuration>
-					<threadCount>1</threadCount>
-					<argLine>--add-modules java.xml.bind</argLine>
-				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>org.apache.maven.surefire</groupId>
-						<artifactId>surefire-junit47</artifactId>
-						<version>${surefire.version}</version>
-					</dependency>
-<!-- 					<dependency>
-						<groupId>org.apache.maven.surefire</groupId>
-						<artifactId>surefire-testng</artifactId>
-						<version>${surefire.version}</version>
-					</dependency> -->
-				</dependencies>
-			</plugin>
-
 		</plugins>
 
 	</build>
-- 
cgit v1.2.3


From 31e23d3cedeecf980e39b9637237cb8f3d01ad9f Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 11 Dec 2019 16:08:19 +0100
Subject: change version to 4.1.0

---
 id/server/idserverlib/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index b576c7a87..39f6068e4 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>4.0.1-snapshot</version>
+		<version>4.1.0</version>
 	</parent>
 
 	<groupId>MOA.id.server</groupId>
-- 
cgit v1.2.3


From ada57605a8127ee25cbb6c2999addf721ab17db1 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 13 Dec 2019 09:33:04 +0100
Subject: fix problem with old Redis library fix configuration GUI

---
 id/server/idserverlib/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 39f6068e4..02069517c 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -509,7 +509,7 @@
 	    	<groupId>redis.clients</groupId>
 	    	<artifactId>jedis</artifactId>
 	    	<!-- version>3.0.1</version -->
-	    	<version>2.10.2</version>
+	    	<version>3.1.0</version>
 	    </dependency>
 	
 <!-- 	    <dependency>
-- 
cgit v1.2.3


From 222e9ba48d45fc1e644e40d25998ebf7ba34046f Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 19 Feb 2020 14:59:30 +0100
Subject: switch to version 4.1.1

---
 id/server/idserverlib/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 02069517c..f254e3724 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>4.1.0</version>
+		<version>4.1.1</version>
 	</parent>
 
 	<groupId>MOA.id.server</groupId>
-- 
cgit v1.2.3


From e82fd34793ae92e755f6b203fbcad53ee3d9581e Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 6 Apr 2020 10:03:25 +0200
Subject: switch to next snapshot version

---
 id/server/idserverlib/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index f254e3724..87b9f0952 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>4.1.1</version>
+		<version>4.1.2-SNAPSHOT</version>
 	</parent>
 
 	<groupId>MOA.id.server</groupId>
-- 
cgit v1.2.3