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
---
 BKUApplet/pom.xml | 53 +++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

(limited to 'BKUApplet/pom.xml')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index de0d95ff..1c27294e 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -1,14 +1,14 @@
 <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>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.14-SNAPSHOT</version>
+  <version>${project.parent.version}</version>
   <build>
     <plugins>
       <plugin>
@@ -20,28 +20,13 @@
               <goal>unpack-dependencies</goal>
             </goals>
             <configuration>
-              <includeGroupIds>at.gv.egiz</includeGroupIds>
+              <includeScope>runtime</includeScope>
               <!-- don't include transitive dependency BKUFonts [runtime] from BKUCommonGUI -->
-              <excludeTransitive>true</excludeTransitive>
+              <excludeTransitive>false</excludeTransitive>
               <outputDirectory>${project.build.outputDirectory}</outputDirectory>
               <excludes>META-INF\/</excludes>
             </configuration>
           </execution>
-          <execution>
-            <!-- appletviewer target/test-classes/appletTest.html
-             |   commons-logging and iaik_jce_me4se are transitive dependencies
-             |-->
-            <id>copy_testapplet</id>
-            <goals>
-                <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-                <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
-                <includeGroupIds>at.gv.egiz,commons-logging,iaik</includeGroupIds>
-                <includeArtifactIds>commons-logging,iaik_jce_me4se</includeArtifactIds>
-                <stripVersion>true</stripVersion>
-            </configuration>
-          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -118,27 +103,43 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.2.14-SNAPSHOT</version>
+      <version>${project.parent.version}</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.14-SNAPSHOT</version>
+      <version>${project.parent.version}</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.14-SNAPSHOT</version>
+      <version>${project.parent.version}</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.14-SNAPSHOT</version>
+      <version>${project.parent.version}</version>
+      <optional>true</optional>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.2.14-SNAPSHOT</version>
-    </dependency>
+      <version>${project.parent.version}</version>
+      <optional>true</optional>
+     </dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-jdk14</artifactId>
+			<scope>runtime</scope>
+			<optional>true</optional>
+		</dependency>
   </dependencies>
 </project>
\ No newline at end of file
-- 
cgit v1.2.3