From b445b300db3a6895647f7f939f63e6b1f52ac0a3 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Tue, 25 Nov 2014 12:03:02 +0100
Subject: Fix build.

- Remove svn metadata.
- Fix local repository (inappropriate xalan-bin-dist dependency file names and copy-past error in dependency pom).
- Switch jdk 1.5/1.6 to 1.7.
- Exclude non working tests.
---
 id/server/moa-id-commons/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 2ca351e81..834a19d03 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -146,8 +146,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -195,8 +195,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.0.2</version>
                 <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
                 </configuration>
             </plugin>
 
-- 
cgit v1.2.3


From 0ed0a7702850b2001aaa8d5b194708a96e90dea3 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Fri, 9 Jan 2015 11:25:10 +0100
Subject: Apply several fixes.

- Disable erroneous IAIK PKI logger initialization (should be addressed by.
- Remove redundant maven-dependency version declarations.
- Fix maven/eclipse lifecyle warning problem.
---
 id/server/moa-id-commons/pom.xml | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 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 834a19d03..8f2fbd628 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -139,6 +139,37 @@
                 </excludes>
             </resource>
         </resources>
+        
+        <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>
                 
-- 
cgit v1.2.3


From 38ae8cb883ab73603f490d62b4cac38c51ac43e1 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 19 Jan 2015 12:10:48 +0100
Subject: update libraries  -> joda-time 2.7  -> slf4j 2.7.10  -> struts2
 2.3.20  -> commons-codec 1.10  -> hibernate 4.3.8.Final  -> mySQL-connector
 5.1.34  -> opensaml 2.6.4  -> xmltooling 2.6.4

---
 id/server/moa-id-commons/pom.xml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 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 2ca351e81..21286585e 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -46,17 +46,17 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>4.3.6.Final</version>
+            <version>4.3.8.Final</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-c3p0</artifactId>
-            <version>4.3.6.Final</version>
+            <version>4.3.8.Final</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
-            <version>4.3.6.Final</version>
+            <version>4.3.8.Final</version>
         </dependency>
 
         <dependency>
@@ -64,10 +64,14 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.3.2</version>
         </dependency>
-        <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>
@@ -118,7 +122,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.33</version>
+            <version>5.1.34</version>
         </dependency>
     </dependencies>
 
-- 
cgit v1.2.3


From d28e5b6e0d0793558f3328c5a420c17bdd606104 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 16 Apr 2015 13:48:50 +0200
Subject: update library versions

---
 id/server/moa-id-commons/pom.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 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 c504a7f0c..27beeaaf3 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -46,23 +46,22 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>4.3.8.Final</version>
+            <version>${hibernate.version}</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-c3p0</artifactId>
-            <version>4.3.8.Final</version>
+            <version>${hibernate.version}</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
-            <version>4.3.8.Final</version>
+            <version>${hibernate.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.3.2</version>
         </dependency>
 				<dependency>
 					<groupId>commons-httpclient</groupId>
@@ -122,7 +121,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.34</version>
+            <version>${mysql-connector.java}</version>
         </dependency>
     </dependencies>
 
-- 
cgit v1.2.3


From 3060411f3e02094e5d3dbd44f1037cfd3ce4c5aa Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Mon, 11 May 2015 16:47:25 +0200
Subject: adjustments for idea deployment

---
 id/server/moa-id-commons/pom.xml | 10 +++++++++-
 1 file changed, 9 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 27beeaaf3..05fd67568 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -76,8 +76,16 @@
             <artifactId>moa-common</artifactId>
             <type>jar</type>
         </dependency>
+<!--
+        <dependency>
+            <groupId>MOA</groupId>
+            <artifactId>moa-common</artifactId>
+            <type>compile</type>
+        </dependency>
+-->
 
-				<dependency>
+
+        <dependency>
 					<groupId>iaik.prod</groupId>
 					<artifactId>iaik_X509TrustManager</artifactId>
 				</dependency>
-- 
cgit v1.2.3