aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--id/assembly-auth.xml6
-rw-r--r--id/assembly-proxy.xml4
-rw-r--r--pom.xml4
-rw-r--r--spss/assembly.xml6
4 files changed, 15 insertions, 5 deletions
diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml
index 986c4c44a..7aaa2217b 100644
--- a/id/assembly-auth.xml
+++ b/id/assembly-auth.xml
@@ -72,7 +72,8 @@
<include>xerces:xercesImpl</include>
<include>xerces:xmlParserAPIs</include>
</includes>
- <outputDirectory>/endorsed</outputDirectory>
+ <outputDirectory>/endorsed</outputDirectory>
+ <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
</dependencySet>
<dependencySet>
<includes>
@@ -82,6 +83,7 @@
<include>iaik.prod:iaik_Pkcs11Wrapper</include>
</includes>
<outputDirectory>/ext</outputDirectory>
+ <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
</dependencySet>
</dependencySets>
<unpack>false</unpack>
@@ -95,7 +97,7 @@
<attachmentClassifier>javadoc</attachmentClassifier>
<includeDependencies>false</includeDependencies>
<outputFileNameMapping>api-doc</outputFileNameMapping>
- <outputDirectory>/doc</outputDirectory>
+ <outputDirectory>/doc/moa_id</outputDirectory>
<unpack>true</unpack>
</binaries>
</moduleSet>
diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml
index cd84be4bc..7e49131d7 100644
--- a/id/assembly-proxy.xml
+++ b/id/assembly-proxy.xml
@@ -50,6 +50,7 @@
<include>xerces:xmlParserAPIs</include>
</includes>
<outputDirectory>/endorsed</outputDirectory>
+ <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
</dependencySet>
<dependencySet>
<includes>
@@ -59,6 +60,7 @@
<include>iaik.prod:iaik_Pkcs11Wrapper</include>
</includes>
<outputDirectory>/ext</outputDirectory>
+ <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
</dependencySet>
</dependencySets>
<unpack>false</unpack>
@@ -72,7 +74,7 @@
<attachmentClassifier>javadoc</attachmentClassifier>
<includeDependencies>false</includeDependencies>
<outputFileNameMapping>api-doc</outputFileNameMapping>
- <outputDirectory>/doc</outputDirectory>
+ <outputDirectory>/doc/moa_id</outputDirectory>
<unpack>true</unpack>
</binaries>
</moduleSet>
diff --git a/pom.xml b/pom.xml
index 0d12f4074..3ee3fce5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -277,8 +277,8 @@
<repositories>
<repository>
- <id>IAIK-MOA</id>
- <name>IAIK MOA Libraries</name>
+ <id>MOA</id>
+ <name>MOA Dependencies</name>
<!--releases>
<enabled>false</enabled>
</releases-->
diff --git a/spss/assembly.xml b/spss/assembly.xml
index aa5666b6f..fb395df19 100644
--- a/spss/assembly.xml
+++ b/spss/assembly.xml
@@ -22,6 +22,8 @@
<include>xerces:xmlParserAPIs</include>
</includes>
<outputDirectory>/endorsed</outputDirectory>
+ <!-- strip version off the artifact file names -->
+ <outputFileNameMapping>${artifactId}.{extension}</outputFileNameMapping>
</dependencySet>
<dependencySet>
<includes>
@@ -31,6 +33,8 @@
<include>iaik.prod:iaik_Pkcs11Wrapper</include>
</includes>
<outputDirectory>/ext</outputDirectory>
+ <!-- strip version off the artifact file names -->
+ <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
</dependencySet>
<dependencySet>
<includes>
@@ -70,6 +74,8 @@
<include>xalan:xalan</include>
</includes>
<outputDirectory>/tools</outputDirectory>
+ <!-- strip version off the artifact file names -->
+ <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
</dependencySet>
</dependencySets>
<outputDirectory>/tools</outputDirectory>