From b1c8641a63a67e3c64d948f9e8dce5c01e11e2dd Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 5 May 2010 15:29:01 +0000
Subject: Merged feature branch mocca-1.2.13-id@r724 back to trunk.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@725 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 pom.xml | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 69 insertions(+), 19 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index ab1c3d25..cefa2e27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,11 +2,15 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
-  <artifactId>bku</artifactId>
+  <artifactId>mocca</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.14-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
+  <properties>
+    <mocca.certificates.version>1.2</mocca.certificates.version>
+    <mocca.fonts.version>1.2</mocca.fonts.version>
+  </properties>
   <modules>
     <module>utils</module>
     <module>bkucommon</module>
@@ -27,7 +31,6 @@
     <module>BKUHelp</module>
     <module>BKUGuiExt</module>
     <module>smccSTALExt</module>
-    <!--module>BKUWebStartPackage</module-->
     <module>BKUFonts</module>
   </modules>
   <developers>
@@ -36,11 +39,6 @@
       <name>Martin Centner</name>
       <email>mcentner@egiz.gv.at</email>
     </developer>
-    <developer>
-      <id>wbauer</id>
-      <name>Wolfgang Bauer</name>
-      <email>wbauer@egiz.gv.at</email>
-    </developer>
     <developer>
       <id>corthacker</id>
       <name>Clemens Orthacker</name>
@@ -48,9 +46,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.13-id-1-SNAPSHOT</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.13-id-1-SNAPSHOT</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.13-id-1-SNAPSHOT</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
@@ -74,6 +72,7 @@
             <verbose>true</verbose>
             <showWarnings>true</showWarnings>
             <encoding>UTF-8</encoding>
+            <debug>false</debug>
           </configuration>
         </plugin>
         <plugin>
@@ -123,6 +122,14 @@
           <groupId>org.apache.maven.plugins</groupId>
           <version>2.3</version>
         </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <groupId>org.apache.maven.plugins</groupId>
+          <version>2.5</version>
+          <configuration>
+	          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
@@ -145,6 +152,11 @@
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
@@ -164,12 +176,6 @@
         <version>1.2.12</version>
         <scope>runtime</scope>
       </dependency>
-      <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>1.1.1</version>
-        <scope>compile</scope>
-      </dependency>
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
@@ -205,7 +211,7 @@
       <dependency>
         <groupId>iaik</groupId>
         <artifactId>iaik_xsect</artifactId>
-        <version>1.14</version>
+        <version>1.17</version>
       </dependency>
       <dependency>
         <groupId>iaik</groupId>
@@ -213,6 +219,12 @@
         <version>1.0-MOCCA</version>
         <scope>compile</scope>
       </dependency>
+			<dependency>
+				<groupId>javax.servlet</groupId>
+				<artifactId>servlet-api</artifactId>
+				<version>2.5</version>
+				<scope>provided</scope>
+			</dependency>
       <dependency>
         <groupId>commons-fileupload</groupId>
         <artifactId>commons-fileupload</artifactId>
@@ -250,9 +262,47 @@
       <dependency>
         <groupId>at.gv.egiz</groupId>
         <artifactId>BKUWebStart</artifactId>
-        <version>1.2.14-SNAPSHOT</version>
+        <version>${project.version}</version>
         <type>zip</type>
       </dependency>
+      <dependency>
+      	<groupId>org.springframework</groupId>
+      	<artifactId>spring-web</artifactId>
+      	<version>2.5.5</version>
+      </dependency>
+      <dependency>
+      	<groupId>commons-configuration</groupId>
+      	<artifactId>commons-configuration</artifactId>
+      	<version>1.6</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>1.5.11</version>
+        <type>jar</type>
+        <scope>runtime</scope>
+      </dependency>
+      <dependency>
+      	<groupId>org.slf4j</groupId>
+      	<artifactId>slf4j-api</artifactId>
+      	<version>1.5.11</version>
+      	<type>jar</type>
+      	<scope>compile</scope>
+      </dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>slf4j-jdk14</artifactId>
+        <version>1.5.11</version>
+        <type>jar</type>
+				<scope>runtime</scope>
+			</dependency>
+      <dependency>
+      	<groupId>org.springframework</groupId>
+      	<artifactId>spring-aop</artifactId>
+      	<version>2.5.5</version>
+      	<type>jar</type>
+      	<scope>compile</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 </project>
\ No newline at end of file
-- 
cgit v1.2.3