diff options
| author | Thomas Knall <t.knall@datentechnik-innovation.com> | 2015-01-09 11:25:10 +0100 |
|---|---|---|
| committer | Thomas Knall <t.knall@datentechnik-innovation.com> | 2015-01-09 11:25:10 +0100 |
| commit | 0ed0a7702850b2001aaa8d5b194708a96e90dea3 (patch) | |
| tree | 197be9266f28a0956cabe60e1da3d5c1e792fe18 /id | |
| parent | 7133df83104f3e885ee1b7532f64c058f392a412 (diff) | |
| download | moa-id-spss-0ed0a7702850b2001aaa8d5b194708a96e90dea3.tar.gz moa-id-spss-0ed0a7702850b2001aaa8d5b194708a96e90dea3.tar.bz2 moa-id-spss-0ed0a7702850b2001aaa8d5b194708a96e90dea3.zip | |
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.
Diffstat (limited to 'id')
| -rw-r--r-- | id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java | 3 | ||||
| -rw-r--r-- | id/server/moa-id-commons/pom.xml | 31 | ||||
| -rw-r--r-- | id/server/stork2-commons/pom.xml | 1 | ||||
| -rw-r--r-- | id/server/stork2-saml-engine/pom.xml | 1 |
4 files changed, 34 insertions, 2 deletions
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>
|