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.
---
common/pom.xml | 1 -
.../moa/id/auth/MOAIDAuthInitializer.java | 3 +++
id/server/moa-id-commons/pom.xml | 31 ++++++++++++++++++++++
id/server/stork2-commons/pom.xml | 1 -
id/server/stork2-saml-engine/pom.xml | 1 -
spss/handbook/clients/api/pom.xml | 1 -
spss/handbook/clients/pom.xml | 1 -
spss/handbook/clients/referencedData/pom.xml | 1 -
spss/handbook/clients/webservice/pom.xml | 2 --
9 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/common/pom.xml b/common/pom.xml
index 3d790d29b..bde3339d6 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -97,7 +97,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.17</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
index db36356c0..c3575470f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
@@ -148,12 +148,15 @@ public class MOAIDAuthInitializer {
}
}
+ // FIXME[@tlenz]: iaik.prod:iaik_X509TrustManager requires iaik.IAIKRuntimeException (should have been moved from iaik.server.modules (iaik.prod:iaik_moa:1.51))
// Initializes IAIKX509TrustManager logging
+ /*
String log4jConfigURL = System.getProperty("log4j.configuration");
Logger.info("Log4J Configuration: " + log4jConfigURL);
if (log4jConfigURL != null) {
IAIKX509TrustManager.initLog(new LoggerConfigImpl(log4jConfigURL));
}
+ */
// Initializes the Axis secure socket factory for use in calling the
// MOA-SP web service
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>
diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml
index 44ab8ddaf..369e3fa6d 100644
--- a/id/server/stork2-commons/pom.xml
+++ b/id/server/stork2-commons/pom.xml
@@ -41,7 +41,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.17</version>
<exclusions>
<exclusion>
<groupId>javax.jms</groupId>
diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
index 777c7393f..63a84998c 100644
--- a/id/server/stork2-saml-engine/pom.xml
+++ b/id/server/stork2-saml-engine/pom.xml
@@ -124,7 +124,6 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.11.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/spss/handbook/clients/api/pom.xml b/spss/handbook/clients/api/pom.xml
index 581c29e56..0690b65e3 100644
--- a/spss/handbook/clients/api/pom.xml
+++ b/spss/handbook/clients/api/pom.xml
@@ -9,7 +9,6 @@
<groupId>MOA.spss.handbook</groupId>
<artifactId>moa-spss-handbook-apiClient</artifactId>
<packaging>jar</packaging>
- <version>2.0</version>
<name>MOA SP/SS Handbook API Client</name>
<properties>
diff --git a/spss/handbook/clients/pom.xml b/spss/handbook/clients/pom.xml
index c104c6c3b..1dfa3d532 100644
--- a/spss/handbook/clients/pom.xml
+++ b/spss/handbook/clients/pom.xml
@@ -10,7 +10,6 @@
<groupId>MOA.spss.handbook.clients</groupId>
<artifactId>moa-spss-handbook-clients</artifactId>
<packaging>pom</packaging>
- <version>2.0</version>
<name>MOA SP/SS Handbook Clients</name>
<modules>
diff --git a/spss/handbook/clients/referencedData/pom.xml b/spss/handbook/clients/referencedData/pom.xml
index 3a220fd4d..e9370cd44 100644
--- a/spss/handbook/clients/referencedData/pom.xml
+++ b/spss/handbook/clients/referencedData/pom.xml
@@ -10,7 +10,6 @@
<groupId>MOA.spss.handbook</groupId>
<artifactId>moa-spss-handbook-referencedData</artifactId>
<packaging>war</packaging>
- <version>2.0</version>
<name>MOA SP/SS Handbook Referenced Data</name>
<properties>
diff --git a/spss/handbook/clients/webservice/pom.xml b/spss/handbook/clients/webservice/pom.xml
index 50850b592..9a98ce472 100644
--- a/spss/handbook/clients/webservice/pom.xml
+++ b/spss/handbook/clients/webservice/pom.xml
@@ -6,10 +6,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>MOA.spss.handbook.clients</groupId>
<artifactId>moa-spss-handbook-webserviceClient</artifactId>
<packaging>jar</packaging>
- <version>2.0</version>
<name>MOA SP/SS Handbook WebService Client</name>
<properties>
--
cgit v1.2.3