From 290b98bf433ecd7389ec3d55fba6529c79f11e58 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 24 Mar 2014 14:21:29 +0100
Subject: update JavaDoc to 2.9.1

---
 id/assembly-auth.xml          | 6 +++---
 id/assembly-proxy.xml         | 6 +++---
 id/server/proxy/pom.xml       | 2 +-
 spss/server/serverlib/pom.xml | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml
index 9fa082ac2..9b5d7275c 100644
--- a/id/assembly-auth.xml
+++ b/id/assembly-auth.xml
@@ -64,7 +64,7 @@
 			<binaries>
 				<includeDependencies>true</includeDependencies>
 				<outputDirectory>/</outputDirectory>
-				<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+				<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
 				<dependencySets>
 					<dependencySet>
 						<includes>
@@ -110,7 +110,7 @@
 			<binaries>
 				<includeDependencies>false</includeDependencies>
 				<outputDirectory>/</outputDirectory>
-				<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+				<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
 				<unpack>false</unpack>
 			</binaries>
 		</moduleSet>
@@ -137,7 +137,7 @@
 			<binaries>
 				<includeDependencies>false</includeDependencies>
 				<outputDirectory>/</outputDirectory>
-				<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+				<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
 				<unpack>false</unpack>
 			</binaries>
 		</moduleSet>
diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml
index 3f70474b6..396afd84b 100644
--- a/id/assembly-proxy.xml
+++ b/id/assembly-proxy.xml
@@ -51,7 +51,7 @@
 			<binaries>
 				<includeDependencies>true</includeDependencies>
 				<outputDirectory>/</outputDirectory>
-				<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+				<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
 				<dependencySets>
 					<dependencySet>
 						<includes>
@@ -61,7 +61,7 @@
 							<include>xalan-bin-dist:serializer</include>
 						</includes>
 						<outputDirectory>/endorsed</outputDirectory>
-						<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
 					</dependencySet>
 					<dependencySet>
 						<includes>
@@ -71,7 +71,7 @@
 							<include>iaik.prod:iaik_Pkcs11Wrapper:jar</include>
 						</includes>
 						<outputDirectory>/ext</outputDirectory>
-						<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
 					</dependencySet>
 				</dependencySets>
 				<unpack>false</unpack>
diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 2df990325..3d4d8c74d 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -20,7 +20,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-proxy</artifactId>
-	<version>2.0</version>
+	<version>2.0.0</version>
 	<packaging>war</packaging>
 	<name>MOA ID-Proxy WebService</name>
 	
diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index 288004a66..4eb2a2218 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -197,7 +197,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.2</version>
+				<version>2.9.1</version>
 				<configuration>
 					<quiet>true</quiet>
 					<author>false</author>
-- 
cgit v1.2.3