From 7f1c5affaa9358bef6995371dc08c8f0c981a849 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Tue, 4 Mar 2014 20:06:41 +0100
Subject: resolving problems related to commons and slf4j libraries

---
 id/pom.xml | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'id/pom.xml')

diff --git a/id/pom.xml b/id/pom.xml
index db4ee137e..bd3344638 100644
--- a/id/pom.xml
+++ b/id/pom.xml
@@ -24,4 +24,36 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <build>
+        <plugins>
+            <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>
+        </plugins>
+    </build>
+
 </project>
-- 
cgit v1.2.3


From 7d97b32f6b70e83c878cad30cc0d25b2a35b8eed Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 6 Mar 2014 09:39:27 +0100
Subject: change MOA-ID version to 2.0-RC1

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

(limited to 'id/pom.xml')

diff --git a/id/pom.xml b/id/pom.xml
index db4ee137e..a696f5c71 100644
--- a/id/pom.xml
+++ b/id/pom.xml
@@ -9,7 +9,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>id</artifactId>
     <packaging>pom</packaging>
-    <version>1.9.98-SNAPSHOT</version>
+    <version>2.0-RC1</version>
     <name>MOA ID</name>
 
     <modules>
-- 
cgit v1.2.3


From 60ac2a89fce86eb1e8344eb22535cfdd0b9aa147 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Fri, 14 Mar 2014 18:37:56 +0100
Subject: attr

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

(limited to 'id/pom.xml')

diff --git a/id/pom.xml b/id/pom.xml
index bd3344638..5eb67cc9f 100644
--- a/id/pom.xml
+++ b/id/pom.xml
@@ -43,6 +43,11 @@
                                         <!-- <exclude>commons-logging</exclude> -->
                                         <exclude>org.slf4j:1.5*</exclude>
                                         <exclude>org.slf4j:1.6*</exclude>
+                                        <exclude>SamlEngine:1.1*</exclude>
+                                        <exclude>SamlEngine:1.2*</exclude>
+                                        <exclude>Commons:1.1*</exclude>
+                                        <exclude>Commons:1.2*</exclude>
+
                                         <!--   <exclude>org.springframework:2.*</exclude>
                                            <exclude>org.springframework:3.0.*</exclude>     -->
                                     </excludes>
-- 
cgit v1.2.3


From a59a9af21d2bfa5200db09b168ed92af0fe3fca4 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 17 Mar 2014 12:25:31 +0100
Subject: change version to 2.0-RC2

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

(limited to 'id/pom.xml')

diff --git a/id/pom.xml b/id/pom.xml
index a696f5c71..2d91afc1d 100644
--- a/id/pom.xml
+++ b/id/pom.xml
@@ -9,7 +9,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>id</artifactId>
     <packaging>pom</packaging>
-    <version>2.0-RC1</version>
+    <version>2.0-RC2</version>
     <name>MOA ID</name>
 
     <modules>
-- 
cgit v1.2.3


From 740e0755f8093fb0a14a8273b487379c04ec19d3 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 21 Mar 2014 11:03:55 +0100
Subject: change version of MOA-ID-Auth to 2.0-RC3

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

(limited to 'id/pom.xml')

diff --git a/id/pom.xml b/id/pom.xml
index 2d91afc1d..ba8cd0f8a 100644
--- a/id/pom.xml
+++ b/id/pom.xml
@@ -9,7 +9,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>id</artifactId>
     <packaging>pom</packaging>
-    <version>2.0-RC2</version>
+    <version>2.0-RC3</version>
     <name>MOA ID</name>
 
     <modules>
-- 
cgit v1.2.3


From 5f39bc056a8e8409d1608228443d12e13812f297 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 24 Mar 2014 12:44:24 +0100
Subject: update version to 2.0.0

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

(limited to 'id/pom.xml')

diff --git a/id/pom.xml b/id/pom.xml
index 61f1ec2b3..6b96451fa 100644
--- a/id/pom.xml
+++ b/id/pom.xml
@@ -9,12 +9,12 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>id</artifactId>
     <packaging>pom</packaging>
-    <version>2.0-RC3</version>
+    <version>2.0.0</version>
     <name>MOA ID</name>
 
     <modules>
         <module>oa</module>
-        <module>templates</module>
+<!--         <module>templates</module> -->
         <module>server</module>
         <module>ConfigWebTool</module>
     </modules>
-- 
cgit v1.2.3