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
---
 bkucommon/pom.xml | 46 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 10 deletions(-)

(limited to 'bkucommon/pom.xml')

diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index ae7ca4bb..1dbc8078 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.14-SNAPSHOT</version>
+	<version>${project.parent.version}</version>
 
 	<build>
 		<plugins>
@@ -44,26 +44,39 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>${version}</version>
+			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>${version}</version>
+			<version>${project.parent.version}</version>
 		</dependency>
     <!-- bkucommon implements default FontProvider (ResourceFontLoader) -->
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>${version}</version>
+      <version>${project.parent.version}</version>
     </dependency>
+
+    <!--
+     |   ResourceFontLoader needs font resources on runtime classpath.
+     |   Runtime dependency on BKUFonts ensures that transitive dependency 
+     |   remains (not true for provided), see BKUViewer, BKULocal and
+     |   BKUOnline -->
+    <dependency>
+      <groupId>at.gv.egiz</groupId>
+      <artifactId>BKUFonts</artifactId>
+      <version>${mocca.fonts.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    
 		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
+			<groupId>iaik</groupId>
+			<artifactId>iaik_jce_full_signed</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>iaik</groupId>
-			<artifactId>iaik_jce_full_signed</artifactId>
+			<artifactId>iaik_ecc_signed</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>commons-fileupload</groupId>
@@ -95,7 +108,8 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<scope>test</scope>
+			<scope>compile</scope>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
       <groupId>com.sun.xml.ws</groupId>
@@ -108,5 +122,17 @@
 			<groupId>com.sun.xml.bind</groupId>
 			<artifactId>jaxb-impl</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>commons-configuration</groupId>
+			<artifactId>commons-configuration</artifactId>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
-- 
cgit v1.2.3