Improved and updated maven build process.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@919 d688527b-c9ab-4aba-bd8d-4036d912da1d

1 files changed, 148 insertions, 160 deletions

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index a10f5eead..0d98d1dc7 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -1,164 +1,152 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-		<groupId>MOA.id</groupId>
-		<artifactId>server</artifactId>
-		<version>1.4.0</version>
-  </parent>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>MOA.id</groupId>
+        <artifactId>moa-id</artifactId>
+        <version>1.4.0</version>
+    </parent>
 
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>MOA.id.server</groupId>
-  <artifactId>idserverlib</artifactId>
-  <packaging>jar</packaging>
-  <version>1.4.0</version>
-  <name>MOA ID Serverlibrary</name>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>MOA.id.server</groupId>
+    <artifactId>moa-id-lib</artifactId>
+    <packaging>jar</packaging>
+    <version>1.4.0</version>
+    <name>MOA ID API</name>
+
+    <properties>
+        <repositoryPath>${basedir}/../../../repository</repositoryPath>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>axis</groupId>
+            <artifactId>axis</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xmlParserAPIs</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-discovery</groupId>
+            <artifactId>commons-discovery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>dav4j</groupId>
+            <artifactId>dav4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>httpsclient</groupId>
+            <artifactId>httpsclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>MOA</groupId>
+            <artifactId>moa-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>MOA</groupId>
+            <artifactId>moa-common-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>MOA.spss.server</groupId>
+            <artifactId>moa-spss-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_moa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_ecc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_jce_full</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_ixsil</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_X509TrustManager</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <quiet>true</quiet>
+                    <author>false</author>
+                    <version>false</version>
+                    <use>true</use>
+                    <excludePackageNames>
+                        at.gv.egovernment.moa.spss.server.*;at.gv.egovernment.moa.spss.api.impl.*;at.gv.egovernment.moa.spss.impl.*
+                    </excludePackageNames>
+                    <tags>
+                        <tag>
+                            <name>pre</name>
+                            <placement>a</placement>
+                            <head>Preconditions:</head>
+                        </tag>
+                        <tag>
+                            <name>post</name>
+                            <placement>a</placement>
+                            <head>Postconfitions:</head>
+                        </tag>
+                    </tags>
+                    <link>http://java.sun.com/j2se/1.4/docs/api/</link>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>generate-javadoc</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
-  <properties>
-  	<thirdPartyLib>${basedir}/../../../buildhelper</thirdPartyLib>
-  </properties>
-  
-  <dependencies>
-    <dependency>
-      <groupId>javaext</groupId>
-      <artifactId>activation</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>axis</groupId>
-      <artifactId>axis</artifactId>
-      <version>1.4</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.xml</groupId>
-      <artifactId>jaxrpc-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>mail</groupId>
-      <artifactId>mail</artifactId>
-<!--      <version>1.5</version>-->
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-<!--			<version>2.3-fcs</version>-->
-			<scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>saaj</groupId>
-      <artifactId>saaj</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>jaxp-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>dom</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>sax</artifactId>
-    </dependency>
-	    <dependency>
-	      <groupId>xerces</groupId>
-	      <artifactId>xercesImpl</artifactId>
-	    </dependency>    
-	    <dependency>
-	      <groupId>xerces</groupId>
-	      <artifactId>xmlParserAPIs</artifactId>
-	    </dependency>  
-	    <dependency>
-	      <groupId>jaxen</groupId>
-	      <artifactId>jaxen-core</artifactId>
-	    </dependency>
-	    <dependency>
-	      <groupId>jaxen</groupId>
-	      <artifactId>jaxen-dom</artifactId>
-	    </dependency>
-	    <dependency>
-	      <groupId>jaxen</groupId>
-	      <artifactId>saxpath</artifactId>
-	    </dependency>
-	    <dependency>
-	      <groupId>xalan</groupId>
-	      <artifactId>xalan</artifactId>
-	    </dependency>
-	    <dependency>
-	      <groupId>junit</groupId>
-	      <artifactId>junit</artifactId>
-	    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jsse</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jnet</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jcert</artifactId>
-    </dependency>
-	    <dependency>
-	      <groupId>commons-logging</groupId>
-	      <artifactId>commons-logging</artifactId>
-	    </dependency>
-    <dependency>
-      <groupId>commons-discovery</groupId>
-      <artifactId>commons-discovery</artifactId>
-    </dependency>
-	    <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>dav4j</groupId>
-      <artifactId>dav4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>httpsclient</groupId>
-      <artifactId>httpsclient</artifactId>
-    </dependency>
-    <dependency>
-	      <groupId>MOA</groupId>
-	      <artifactId>common</artifactId>
-  	  </dependency>
-    <dependency>
-	      <groupId>MOA</groupId>
-	      <artifactId>common-test</artifactId>
-  	  </dependency>
-    <dependency>
-      <groupId>MOA.spss.server</groupId>
-      <artifactId>serverlib</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_moa_full</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_ecc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_jce_full</artifactId>
-<!--      <version>3.14</version>-->
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_ixsil</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_X509TrustManager</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_ldap</artifactId>
-    </dependency>
-  </dependencies>
 </project>