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

1 files changed, 53 insertions, 54 deletions

diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 262dcba8..20c6ff56 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -1,16 +1,16 @@
 <?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>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.14-SNAPSHOT</version>
+  <version>${parent.version}</version>
 
   <pluginRepositories>
     <pluginRepository>
@@ -24,65 +24,84 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>bkucommon</artifactId>
-      <version>1.2.14-SNAPSHOT</version>
+      <version>${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.14-SNAPSHOT</version>
+      <version>${project.parent.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>at.gv.egiz</groupId>
+      <artifactId>STALService</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>at.gv.egiz</groupId>
+      <artifactId>STALXService</artifactId>
+      <version>${project.parent.version}</version>
     </dependency>
     <dependency>
       <artifactId>BKUCertificates</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2</version>
+      <version>${mocca.certificates.version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.14-SNAPSHOT</version>
+      <version>${project.parent.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>iaik</groupId>
+      <artifactId>iaik_xsect</artifactId>
     </dependency>
+		<dependency>
+			<groupId>iaik</groupId>
+			<artifactId>iaik_jce_full_signed</artifactId>
+		</dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
+      <groupId>iaik</groupId>
+      <artifactId>iaik_ecc_signed</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
-      <scope>provided</scope>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>2.5.5</version>
+      <artifactId>spring-context</artifactId>
+      <type>jar</type>
     </dependency>
     <dependency>
-      <groupId>at.gv.egiz</groupId>
-      <artifactId>STALService</artifactId>
-      <version>1.2.14-SNAPSHOT</version>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <type>jar</type>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>at.gv.egiz</groupId>
-      <artifactId>STALService</artifactId>
-      <version>1.2.14-SNAPSHOT</version>
+      <groupId>commons-configuration</groupId>
+      <artifactId>commons-configuration</artifactId>
     </dependency>
-        <!--
-         |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
-         |   so that BKUOnline does not have to depend on STALXService
-         |-->
     <dependency>
-      <groupId>at.gv.egiz</groupId>
-      <artifactId>STALXService</artifactId>
-      <version>1.2.14-SNAPSHOT</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>provided</scope>
     </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -117,36 +136,16 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUApplet</artifactId>
-      <version>1.2.14-SNAPSHOT</version>
+      <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUAppletExt</artifactId>
-      <version>1.2.14-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <!--
-     |   Transitive dependency from BKUViewer,
-     |   set excludeTransitive=false in unpack-fonts
-    <dependency>
-      <groupId>at.gv.egiz</groupId>
-      <artifactId>BKUFonts</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency-->
-    <dependency>
-      <groupId>iaik</groupId>
-      <artifactId>iaik_jce_me4se</artifactId>
+      <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
-
   </dependencies>
-  <scm>
-    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
-  </scm>
   <build>
     <plugins>
       <plugin>
@@ -160,8 +159,8 @@
             </goals>
             <configuration>
               <outputDirectory>${project.build.directory}/${project.build.finalName}/applet</outputDirectory>
-              <includeGroupIds>at.gv.egiz,commons-logging,iaik</includeGroupIds>
-              <includeArtifactIds>BKUApplet,BKUAppletExt,commons-logging,iaik_jce_me4se</includeArtifactIds>
+              <includeGroupIds>at.gv.egiz</includeGroupIds>
+              <includeArtifactIds>BKUApplet,BKUAppletExt</includeArtifactIds>
               <excludeTransitive>true</excludeTransitive>
               <stripVersion>true</stripVersion>
             </configuration>
@@ -176,7 +175,7 @@
               <includeGroupIds>at.gv.egiz</includeGroupIds>
               <includeArtifactIds>BKUFonts</includeArtifactIds>
               <excludes>META-INF/,LICENSE</excludes>
-              <excludeTransitive>false</excludeTransitive>
+              <!--excludeTransitive>false</excludeTransitive-->
             </configuration>
           </execution>
           <execution>
@@ -218,6 +217,7 @@
               <Implementation-Build>${project.version}-r${buildNumber}</Implementation-Build>
             </manifestEntries>
           </archive>
+          <warSourceExcludes>applet/**</warSourceExcludes>
         </configuration>
       </plugin>
       <plugin>
@@ -312,7 +312,6 @@
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>BKUWebStart</artifactId>
-          <scope>provided</scope>
           <type>zip</type>
         </dependency>
       </dependencies>