remove unsed or double included depentencies

8 files changed, 17 insertions, 19 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/Constants.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/Constants.java
index 61880b0cb..567978cae 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/Constants.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/Constants.java
@@ -25,7 +25,7 @@ package at.gv.egovernment.moa.id.configuration;
 import java.util.Hashtable;
 import java.util.Map;
 
-import edu.emory.mathcs.backport.java.util.Collections;
+import java.util.Collections;
 
 public class Constants {
 	
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index e10266154..c1ea05e4b 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -301,6 +301,10 @@
 					<artifactId>axis</artifactId>

 					<groupId>org.apache.axis</groupId>

 				</exclusion>

+				<exclusion>

+					<artifactId>bcprov-jdk16</artifactId>

+					<groupId>org.bouncycastle</groupId>

+				</exclusion>

 			</exclusions>

 		</dependency>

 	</dependencies>

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20Protocol.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20Protocol.java
index 9dac8d5a0..182f07675 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20Protocol.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20Protocol.java
@@ -25,7 +25,7 @@ import at.gv.egovernment.moa.util.MiscUtil;
 
 import com.google.gson.JsonObject;
 
-import edu.emory.mathcs.backport.java.util.Arrays;
+import java.util.Arrays;
 
 public class OAuth20Protocol implements IModulInfo {
 	
@@ -35,7 +35,6 @@ public class OAuth20Protocol implements IModulInfo {
 	public static final String AUTH_ACTION = "AUTH";
 	public static final String TOKEN_ACTION = "TOKEN";
 	
-	@SuppressWarnings("unchecked")
 	public static final List<String> DEFAULTREQUESTEDATTRFORINTERFEDERATION = Arrays.asList(
 			new String[] {
 					PVPConstants.EID_SECTOR_FOR_IDENTIFIER_NAME,
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/AttributQueryAction.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/AttributQueryAction.java
index 71d1c26d4..9f8b6610f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/AttributQueryAction.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/AttributQueryAction.java
@@ -37,7 +37,7 @@ import org.opensaml.saml2.core.Response;
 import org.opensaml.ws.message.encoder.MessageEncodingException;
 import org.opensaml.xml.security.SecurityException;
 
-import edu.emory.mathcs.backport.java.util.Arrays;
+import java.util.Arrays;
 
 import at.gv.egovernment.moa.id.auth.builder.AuthenticationDataBuilder;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
@@ -60,11 +60,9 @@ import at.gv.egovernment.moa.logging.Logger;
  */
 public class AttributQueryAction implements IAction {
 
-	@SuppressWarnings("unchecked")
 	private final static List<String> DEFAULTSTORKATTRIBUTES = Arrays.asList(
 			new String[]{PVPConstants.EID_STORK_TOKEN_NAME});	
 	
-	@SuppressWarnings("unchecked")
 	private final static List<String> DEFAULTMANDATEATTRIBUTES = Arrays.asList(
 			new String[]{	PVPConstants.MANDATE_FULL_MANDATE_NAME, 
 							PVPConstants.MANDATE_PROF_REP_OID_NAME});
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java
index 7f8ea91bd..0da846f9e 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java
@@ -55,7 +55,7 @@ import org.opensaml.xml.io.MarshallingException;
 import org.opensaml.xml.security.SecurityException;
 import org.opensaml.xml.signature.SignableXMLObject;
 
-import edu.emory.mathcs.backport.java.util.Arrays;
+import java.util.Arrays;
 
 import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.auth.exception.InvalidProtocolRequestException;
@@ -120,7 +120,6 @@ public class PVP2XProtocol implements IModulInfo, MOAIDAuthConstants {
 
 	private static HashMap<String, IAction> actions = new HashMap<String, IAction>();
 	
-	@SuppressWarnings("unchecked")
 	public static final List<String> DEFAULTREQUESTEDATTRFORINTERFEDERATION = Arrays.asList(
 			new String[] {
 					PVPConstants.EID_SECTOR_FOR_IDENTIFIER_NAME
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1Protocol.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1Protocol.java
index dafcb9987..399e7fa22 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1Protocol.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1Protocol.java
@@ -22,6 +22,7 @@
  *******************************************************************************/
 package at.gv.egovernment.moa.id.protocols.saml1;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 
@@ -30,8 +31,6 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringEscapeUtils;
 
-import edu.emory.mathcs.backport.java.util.Arrays;
-
 import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.auth.exception.AuthenticationException;
 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
@@ -57,7 +56,6 @@ public class SAML1Protocol implements IModulInfo, MOAIDAuthConstants {
 
 	public static final String GETARTIFACT = "GetArtifact";
 
-	@SuppressWarnings("unchecked")
 	public static final List<String> DEFAULTREQUESTEDATTRFORINTERFEDERATION = Arrays.asList(
 			new String[] {
 					PVPConstants.BPK_NAME,
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOAAttributeProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOAAttributeProvider.java
index 21d6f2718..5b8e4bd5d 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOAAttributeProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOAAttributeProvider.java
@@ -88,7 +88,7 @@ public class MOAAttributeProvider {
             newAttribute.setStatus("Available");
             newAttribute.setIsRequired(isRequired);
             Logger.info("Got attribute value: " + attributeValue);
-            newAttribute.setValue(new ArrayList<String>(edu.emory.mathcs.backport.java.util.Collections.singletonList(attributeValue)));
+            newAttribute.setValue(new ArrayList<String>(Collections.singletonList(attributeValue)));
             attributeList.add(newAttribute);
         } catch (InvocationTargetException e) {
             Logger.error("Invocation target exception while getting attribute: " + storkAttribute);
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 02915ef18..0a3351edb 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -79,11 +79,11 @@
 					<artifactId>iaik_X509TrustManager</artifactId>
 				</dependency>
 
-        <!-- dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-xjc</artifactId>
-            <version>2.2.7</version>
-        </dependency -->
+				<dependency>
+					<groupId>com.sun.xml.bind</groupId>
+					<artifactId>jaxb-xjc</artifactId>
+					<version>2.2.7</version>
+				</dependency>
 
         <dependency>
             <groupId>org.hibernate.javax.persistence</groupId>
@@ -96,7 +96,7 @@
             <artifactId>hyperjaxb3-ejb-runtime</artifactId>
             <version>0.5.6</version>
         </dependency>
-        <dependency>
+<!--         <dependency>
             <groupId>org.jvnet.hyperjaxb3</groupId>
             <artifactId>maven-hyperjaxb3-plugin</artifactId>
             <version>0.5.6</version>
@@ -114,7 +114,7 @@
                 	<groupId>org.springframework</groupId>
                 </exclusion>
             </exclusions>
-        </dependency>
+        </dependency> -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>