[client] bwIDM-Support started, work in progress...

big changes in pom.xml, please rebuild everything :)

1 files changed, 124 insertions, 78 deletions

diff --git a/dozentenmodul/pom.xml b/dozentenmodul/pom.xml
index f10f830f..21be6768 100644
--- a/dozentenmodul/pom.xml
+++ b/dozentenmodul/pom.xml
@@ -21,7 +21,7 @@
       <name>mltk repo</name>
       <url>http://mltk-services.ruf.uni-freiburg.de:8081/nexus/content/repositories/snapshots/</url>
     </repository>
- </repositories>
+  </repositories>
 
   <build>
     <plugins>
@@ -77,16 +77,47 @@
                     <exclude>META-INF/*.RSA</exclude>
                   </excludes>
                 </filter>
-					 <filter>
-						<artifact>log4j:*</artifact>
-						<includes>
-							<include>**</include>
-						</includes>
-					 </filter>
+                <filter>
+                  <artifact>log4j:*</artifact>
+                  <includes>
+                    <include>**</include>
+                  </includes>
+                </filter>
+                <filter>
+                  <artifact>commons-logging:*</artifact>
+                  <includes>
+                    <include>**</include>
+                  </includes>
+                </filter>
+                <filter>
+                  <artifact>org.opensaml:*</artifact>
+                  <includes>
+                    <include>**</include>
+                  </includes>
+                </filter>
+                <filter>
+                  <artifact>xml-apis:*</artifact>
+                  <includes>
+                    <include>**</include>
+                  </includes>
+                </filter>
+                <filter>
+                  <artifact>xalan:*</artifact>
+                  <includes>
+                    <include>**</include>
+                  </includes>
+                </filter>
+                <filter>
+                  <artifact>xerces:*</artifact>
+                  <includes>
+                    <include>**</include>
+                  </includes>
+                </filter>
               </filters>
               <minimizeJar>true</minimizeJar>
               <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                <transformer
+                  implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>App</mainClass>
                   <manifestEntries>
                     <Version-Timestamp>${maven.build.timestamp}</Version-Timestamp>
@@ -98,74 +129,74 @@
         </executions>
       </plugin>
     </plugins>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<includes>
-					<include>**</include>
-				</includes>
-			</resource>
-			<resource>
-				<directory>src/main/properties</directory>
-				<includes>
-					<include>**/*.properties</include>
-				</includes>
-			</resource>
-		</resources>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>**</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src/main/properties</directory>
+        <includes>
+          <include>**/*.properties</include>
+        </includes>
+      </resource>
+    </resources>
   </build>
 
   <profiles>
-     <profile>
-       <id>mac</id>
-       <activation>
-         <os>
-           <name>mac os x</name>
-         </os>
-       </activation>
-       <properties>
-         <swt.groupId>org.eclipse.swt.carbon</swt.groupId>
-         <swt.artifactId>macosx</swt.artifactId>
-       </properties>
-     </profile>
-     <profile>
-       <id>windows</id>
-       <activation>
-         <os>
-           <family>windows</family>
-         </os>
-       </activation>
-       <properties>
-         <swt.groupId>org.eclipse.swt.org.eclipse.swt.win32.win32.x86.4.3.swt</swt.groupId>
-         <swt.artifactId>org.eclipse.swt.win32.win32.x86</swt.artifactId>
-       </properties>
-     </profile>
-     <profile>
-       <id>linux_64</id>
-       <activation>
-         <os>
-           <name>linux</name>
-           <arch>amd64</arch>
-         </os>
-       </activation>
-       <properties>
-         <swt.groupId>org.eclipse.swt.org.eclipse.swt.gtk.linux.x86_64.4.3.swt</swt.groupId>
-         <swt.artifactId>org.eclipse.swt.gtk.linux.x86_64</swt.artifactId>
-       </properties>
-     </profile>
-     <profile>
-       <id>linux_32</id>
-       <activation>
-         <os>
-           <name>linux</name>
-           <arch>i386</arch>
-         </os>
-       </activation>
-       <properties>
-         <swt.groupId>org.eclipse.swt.org.eclipse.swt.gtk.linux.x86.4.3.swt</swt.groupId>
-         <swt.artifactId>org.eclipse.swt.gtk.linux.x86</swt.artifactId>
-       </properties>
-     </profile>
-   </profiles>
+    <profile>
+      <id>mac</id>
+      <activation>
+        <os>
+          <name>mac os x</name>
+        </os>
+      </activation>
+      <properties>
+        <swt.groupId>org.eclipse.swt.carbon</swt.groupId>
+        <swt.artifactId>macosx</swt.artifactId>
+      </properties>
+    </profile>
+    <profile>
+      <id>windows</id>
+      <activation>
+        <os>
+          <family>windows</family>
+        </os>
+      </activation>
+      <properties>
+        <swt.groupId>org.eclipse.swt.org.eclipse.swt.win32.win32.x86.4.3.swt</swt.groupId>
+        <swt.artifactId>org.eclipse.swt.win32.win32.x86</swt.artifactId>
+      </properties>
+    </profile>
+    <profile>
+      <id>linux_64</id>
+      <activation>
+        <os>
+          <name>linux</name>
+          <arch>amd64</arch>
+        </os>
+      </activation>
+      <properties>
+        <swt.groupId>org.eclipse.swt.org.eclipse.swt.gtk.linux.x86_64.4.3.swt</swt.groupId>
+        <swt.artifactId>org.eclipse.swt.gtk.linux.x86_64</swt.artifactId>
+      </properties>
+    </profile>
+    <profile>
+      <id>linux_32</id>
+      <activation>
+        <os>
+          <name>linux</name>
+          <arch>i386</arch>
+        </os>
+      </activation>
+      <properties>
+        <swt.groupId>org.eclipse.swt.org.eclipse.swt.gtk.linux.x86.4.3.swt</swt.groupId>
+        <swt.artifactId>org.eclipse.swt.gtk.linux.x86</swt.artifactId>
+      </properties>
+    </profile>
+  </profiles>
 
   <dependencies>
     <dependency>
@@ -174,6 +205,11 @@
       <version>3.5.0</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.3</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
       <version>0.9.1</version>
@@ -204,14 +240,14 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-       <groupId>${swt.groupId}</groupId>
-       <artifactId>${swt.artifactId}</artifactId>
-       <version>4.3</version>
-     </dependency>
+      <groupId>${swt.groupId}</groupId>
+      <artifactId>${swt.artifactId}</artifactId>
+      <version>4.3</version>
+    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.17</version>
+      <version>[1.2.10,1.2.20]</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -243,6 +279,16 @@
       <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>de.tudarmstadt.ukp.shibhttpclient</groupId>
+      <artifactId>shib-http-client</artifactId>
+      <version>1.1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.11.0</version>
+    </dependency>
   </dependencies>
 </project>