From 74d8c83f76074d2d0df784cb4a305c586a702d25 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 9 Mar 2016 13:41:09 +0100
Subject: move moa-common to moa-id-common, because MOA-SPSS becomes a seperate
 project

---
 id/server/moa-id-commons/pom.xml | 297 +++++++++++++++------------------------
 1 file changed, 113 insertions(+), 184 deletions(-)

(limited to 'id/server/moa-id-commons/pom.xml')

diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index d242147f1..90b391b42 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -61,6 +61,47 @@
     			<version>0.2</version>
     		</dependency>        
     
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_jce_full</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_moa</artifactId>
+        </dependency>
+    
+        <dependency>
+					<groupId>iaik.prod</groupId>
+					<artifactId>iaik_X509TrustManager</artifactId>
+				</dependency>
+    
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>${jodatime.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jul-to-slf4j</artifactId>
+        </dependency>
+        <dependency>
+						<groupId>org.slf4j</groupId>
+						<artifactId>slf4j-log4j12</artifactId>
+				</dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+    
+    
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
@@ -78,34 +119,44 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
+            <groupId>jaxen</groupId>
+            <artifactId>jaxen</artifactId>
         </dependency>
-				<dependency>
-					<groupId>commons-httpclient</groupId>
-					<artifactId>commons-httpclient</artifactId>
-				</dependency>
-<!-- 				<dependency>
-					 <groupId>org.apache.httpcomponents</groupId>
-					 <artifactId>httpclient</artifactId>
-				</dependency> -->
         <dependency>
-            <groupId>MOA</groupId>
-            <artifactId>moa-common</artifactId>
-            <type>jar</type>
+            <groupId>saxpath</groupId>
+            <artifactId>saxpath</artifactId>
         </dependency>
-<!--
         <dependency>
-            <groupId>MOA</groupId>
-            <artifactId>moa-common</artifactId>
-            <type>compile</type>
+            <groupId>xalan-bin-dist</groupId>
+            <artifactId>xalan</artifactId>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>xalan-bin-dist</groupId>
+            <artifactId>xml-apis</artifactId>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>xalan-bin-dist</groupId>
+            <artifactId>serializer</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
         </dependency>
--->
-
 
         <dependency>
-					<groupId>iaik.prod</groupId>
-					<artifactId>iaik_X509TrustManager</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+				<dependency>
+					<groupId>commons-httpclient</groupId>
+					<artifactId>commons-httpclient</artifactId>
 				</dependency>
 
 				<dependency>
@@ -125,38 +176,6 @@
 					<artifactId>jaxb2-basics-runtime</artifactId>
 					<version>0.11.0</version>
 				</dependency>
-
-<!--         <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.1-api</artifactId>
-            <version>1.0.0.Final</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jvnet.hyperjaxb3</groupId>
-            <artifactId>hyperjaxb3-ejb-runtime</artifactId>
-            <version>0.5.6</version>
-        </dependency>
-                
-         <dependency>
-            <groupId>org.jvnet.hyperjaxb3</groupId>
-            <artifactId>maven-hyperjaxb3-plugin</artifactId>
-            <version>0.5.6</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.hibernate.javax.persistence</groupId>
-                    <artifactId>hibernate-jpa-2.0-api</artifactId>
-                </exclusion>
-                <exclusion>
-                	<artifactId>spring</artifactId>
-                	<groupId>org.springframework</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency> -->
         
         <dependency>
             <groupId>mysql</groupId>
@@ -188,11 +207,13 @@
 		</dependency>
 		
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
+    	<groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.2</version>
+      <scope>test</scope>
 		</dependency>
 
+
 		<!-- for testing only ?  -->
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -228,60 +249,8 @@
     </dependencies>
 
     <build>
-        <defaultGoal>install</defaultGoal>
-
-        <pluginManagement>
-        	<plugins>
-				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-<!-- 				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.jvnet.hyperjaxb3</groupId>
-										<artifactId>maven-hyperjaxb3-plugin</artifactId>
-										<versionRange>0.5.6</versionRange>
-										<goals>
-											<goal>generate</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin> -->
-        	</plugins>
-        
-        </pluginManagement>
-
-        <plugins>
-<!-- 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.9.1</version>
-				<executions>
-					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>${project.build.directory}/generated-sources/xjc</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin> -->
-                      
+    	<plugins>
+        <defaultGoal>install</defaultGoal>                      
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -310,26 +279,6 @@
                 </executions>
             </plugin>
 
-<!--             <plugin>
-                <groupId>org.jvnet.hyperjaxb3</groupId>
-                <artifactId>maven-hyperjaxb3-plugin</artifactId>
-                <version>0.5.6</version>
-                <executions>
-                	<execution>                    
-                    <phase>generate-sources</phase>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <extension>true</extension>
-                    <schemaDirectory>src/main/resources</schemaDirectory>
-                    <bindingDirectory>src/main/resources</bindingDirectory>
-                    <persistenceXml>src/main/resources/persistence_template.xml</persistenceXml>
-                    <generatePackage>at.gv.egovernment.moa.id.commons.db.dao.config.deprecated</generatePackage>
-                </configuration>
-            </plugin> -->
             <plugin>
                 <inherited>true</inherited>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -375,69 +324,49 @@
     </executions>
   </plugin>
 
-
-<!--             <plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.5</version>
+                <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <charset>UTF-8</charset>
-                    <docencoding>UTF-8</docencoding>
-                    <quiet>true</quiet>
-                    <author>false</author>
-                    <version>false</version>
-                    <use>true</use>
-                    <excludePackageNames>
-                        at.gv.egovernment.moa.spss.server.*;at.gv.egovernment.moa.spss.api.impl.*;at.gv.egovernment.moa.spss.impl.*
-                    </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://java.sun.com/j2se/1.4/docs/api/</link>
-                        <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-                        <link>http://logging.apache.org/log4j/docs/api/</link>
-                    </links>
-                    <target>1.5</target>
+                    <archive>
+                        <addMavenDescriptor>false</addMavenDescriptor>
+                    </archive>
                 </configuration>
                 <executions>
                     <execution>
-                        <id>generate-javadoc</id>
-                        <phase>package</phase>
                         <goals>
-                            <goal>jar</goal>
+                            <goal>test-jar</goal>
                         </goals>
                     </execution>
                 </executions>
-            </plugin> -->
-   
-<!--            	 <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>
+            <plugin>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>1.1.1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-banned-dependencies</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <bannedDependencies>
+                                    <searchTransitive>true</searchTransitive>
+                                    <excludes>
+                                        <!-- <exclude>commons-logging</exclude> -->
+                                        <exclude>org.slf4j:1.5*</exclude>
+                                        <exclude>org.slf4j:1.6*</exclude>
+                                        <!--   <exclude>org.springframework:2.*</exclude>
+                                           <exclude>org.springframework:3.0.*</exclude>     -->
+                                    </excludes>
+                                </bannedDependencies>
+                            </rules>
+                            <fail>true</fail>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
                   
                 <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
                 <plugin>
-- 
cgit v1.2.3


From 989f5cfa9c9c6f60ce6e161983be8434ca87a698 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 9 Mar 2016 16:01:38 +0100
Subject: remove MOA-SPSS from buildpath and add MOA-SPSS container-modul

---
 id/server/moa-id-commons/pom.xml | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

(limited to 'id/server/moa-id-commons/pom.xml')

diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 90b391b42..bbaba6a50 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -249,11 +249,11 @@
     </dependencies>
 
     <build>
-    	<plugins>
-        <defaultGoal>install</defaultGoal>                      
-            <plugin>
+    	<plugins>                 
+             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.0.2</version>
                 <configuration>
                     <source>1.7</source>
                     <target>1.7</target>
@@ -263,9 +263,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <skipIfEmpty>true</skipIfEmpty>
-                    <skip>true</skip>
-                    <skipTests>true</skipTests>
                     <archive>
                         <addMavenDescriptor>false</addMavenDescriptor>
                     </archive>
@@ -279,18 +276,8 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <inherited>true</inherited>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-
 <!-- CLI for 2.x to 3.x migragtion -->
-  <plugin>
+<!--   <plugin>
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-jar-plugin</artifactId>
     <version>2.4</version>
@@ -303,7 +290,7 @@
         </manifest>
       </archive>
     </configuration>
-  </plugin>
+  </plugin> -->
   <plugin>
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-dependency-plugin</artifactId>
-- 
cgit v1.2.3


From f67427831d1f8c49ce6c474691b880d90a42b584 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 14 Mar 2016 09:17:57 +0100
Subject: refactor the GUI generation for user interaction

---
 id/server/moa-id-commons/pom.xml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'id/server/moa-id-commons/pom.xml')

diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index bbaba6a50..c722b265e 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -50,6 +50,33 @@
 
 
     <dependencies>
+    		<dependency>
+    			 <groupId>at.gv.util</groupId>
+           <artifactId>egovutils</artifactId>
+           <exclusions>
+           		<exclusion>
+           			<groupId>*</groupId>
+           			<artifactId>*</artifactId>
+           		</exclusion>
+           </exclusions>
+    		</dependency>
+    
+       	<dependency>
+    			 <groupId>org.opensaml</groupId>
+  				 <artifactId>opensaml</artifactId>
+           <exclusions>
+           		<exclusion>
+           			<groupId>*</groupId>
+           			<artifactId>*</artifactId>
+           		</exclusion>
+           </exclusions>
+    		</dependency>
+    
+       <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+    
     		<dependency>
 	    		<groupId>at.gv.egiz.components</groupId>
 	    		<artifactId>egiz-configuration-api</artifactId>
-- 
cgit v1.2.3


From b9b9539464cf84c8c2e317ee94cc6f032fdd8cca Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 17 Mar 2016 07:56:26 +0100
Subject: add missing maven repo. for openSAML impl. jars

---
 id/server/moa-id-commons/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'id/server/moa-id-commons/pom.xml')

diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index c722b265e..2fc72119e 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -23,6 +23,11 @@
                     <name>local</name>
                     <url>file:${basedir}/../../../repository</url>
                 </repository>
+               	<repository>
+										<id>shibboleth.internet2.edu</id>
+										<name>Internet2</name>
+										<url>https://build.shibboleth.net/nexus/content/groups/public/</url>
+								</repository>
                 <repository>
                     <id>hyberjaxb</id>
                     <url>http://repository.highsource.org/maven2/releases/</url>
-- 
cgit v1.2.3


From 23cded37cfe100bf51480c08827166666e464c6c Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 18 Mar 2016 11:35:31 +0100
Subject: update slf4j

---
 id/server/moa-id-commons/pom.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'id/server/moa-id-commons/pom.xml')

diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 2fc72119e..d0cd08844 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -128,10 +128,14 @@
 						<groupId>org.slf4j</groupId>
 						<artifactId>slf4j-log4j12</artifactId>
 				</dependency>
-        <dependency>
+<!--         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-        </dependency>
+        </dependency> -->
+<!--         <dependency>
+					<groupId>org.apache.logging.log4j</groupId>
+					<artifactId>log4j-core</artifactId>
+				</dependency> -->
     
     
         <dependency>
-- 
cgit v1.2.3


From 54a26c8e353069abacefe5232f8270bec6b3cc60 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 21 Mar 2016 15:49:24 +0100
Subject: update libs

---
 id/server/moa-id-commons/pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'id/server/moa-id-commons/pom.xml')

diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index d0cd08844..df38c8384 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -270,10 +270,16 @@
 			<scope>test</scope>
 		</dependency>
 		
-		<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>
+			<version>2.1.1</version>
 		</dependency>
 
 		<dependency>
-- 
cgit v1.2.3


From f5970e6aa4f621e870db8a9337fb00598cd85703 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 22 Mar 2016 08:49:49 +0100
Subject: update third party libs

---
 id/server/moa-id-commons/pom.xml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'id/server/moa-id-commons/pom.xml')

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>
-- 
cgit v1.2.3