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
---
 BKUWebStart/pom.xml | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

(limited to 'BKUWebStart/pom.xml')

diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index d40af243..c4a97f93 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -1,15 +1,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">
   <parent>
-    <artifactId>bku</artifactId>
+    <artifactId>mocca</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.14-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUWebStart</artifactId>
   <packaging>jar</packaging>
   <name>BKU Web Start</name>
-  <version>1.2.14-SNAPSHOT</version>
+  <version>${project.parent.version}</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
@@ -230,30 +230,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCertificates</artifactId>
-      <version>1.2</version>
+      <version>${mocca.certificates.version}</version>
     </dependency>
     <dependency>
       <groupId>iaik</groupId>
       <artifactId>iaik_jce_full_signed</artifactId>
       <scope>compile</scope>
     </dependency>
-    <!--
-    <dependency>
-      <artifactId>utils</artifactId>
-      <groupId>at.gv.egiz</groupId>
-      <version>1.2.7-SNAPSHOT</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>iaik_ecc_signed</artifactId>
-          <groupId>iaik</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    -->
     
     <!-- Jetty 6.1.15+ required, see
      |   http://jira.codehaus.org/browse/JETTY-843
@@ -275,12 +258,10 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.5.8</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.5.8</version>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>
@@ -288,7 +269,8 @@
       <scope>compile</scope>
     </dependency>
 
-    <!-- javax.jnlp.* -->
+    <!-- javax.jnlp.* not included in SUN JDK's rt.jar,
+     |   don't declare here if using OpenJDK -->
     <dependency>
       <groupId>jre</groupId>
       <artifactId>javaws</artifactId>
-- 
cgit v1.2.3