diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-20 16:22:18 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-20 16:22:18 +0200 |
| commit | 57c8ec9d6e1a658907eca8f5386b07e4e483ccf1 (patch) | |
| tree | 7b249b0af6fea4ab4081e6a0d54f06c8bd6fe97c | |
| parent | e147bdb7da8e48c1483c7732a0eb6b6f54699b66 (diff) | |
| download | moa-id-spss-57c8ec9d6e1a658907eca8f5386b07e4e483ccf1.tar.gz moa-id-spss-57c8ec9d6e1a658907eca8f5386b07e4e483ccf1.tar.bz2 moa-id-spss-57c8ec9d6e1a658907eca8f5386b07e4e483ccf1.zip | |
**Temporary BUGFIX***
exclude iaik_pki_module_1.0 which is used by libtsl.1.0 because it produce conflicts with iaik_moa_1.5
(both defines iaik.pki.PKIConfiguration interface, but with different interface specification!!!!)
| -rw-r--r-- | id/server/auth/pom.xml | 10 | ||||
| -rw-r--r-- | id/server/idserverlib/pom.xml | 14 |
2 files changed, 20 insertions, 4 deletions
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index cbc147c0a..577270221 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -29,7 +29,7 @@ <!--testSourceDirectory>${basedir}/../idserverlib/src/test/java</testSourceDirectory--> <plugins> - <plugin> +<!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>properties-maven-plugin</artifactId> <version>1.0-alpha-2</version> @@ -46,7 +46,7 @@ </configuration> </execution> </executions> - </plugin> + </plugin> --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> @@ -94,6 +94,12 @@ <dependency> <groupId>MOA.spss.server</groupId> <artifactId>moa-spss-lib</artifactId> + <exclusions> + <exclusion> + <artifactId>iaik_pki_module</artifactId> + <groupId>iaik</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>MOA.id.server</groupId> diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 687c8843e..8280e631d 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -62,6 +62,16 @@ <dependency>
<groupId>MOA.spss.server</groupId>
<artifactId>moa-spss-lib</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>iaik_pki_module</artifactId>
+ <groupId>iaik</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>axis</groupId>
@@ -278,7 +288,7 @@ <build>
<plugins>
- <plugin>
+<!-- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0-alpha-2</version>
@@ -295,7 +305,7 @@ </configuration>
</execution>
</executions>
- </plugin>
+ </plugin> -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
|