From 49439f0912a2f0e23cf4bcf63967d177658a837c Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 27 Aug 2009 20:02:45 +0000
Subject: seperate BKUWebStart main jar and BKUWebStart bundle use
 webstart-maven-plugin:jnlp-download-servlet goal to get versions right

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@478 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUOnline/pom.xml | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'BKUOnline')

diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 9fc36d63..72738b0d 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -268,8 +268,6 @@
       </build>
     </profile>
     <profile>
-          <!-- make sure this profile is active when building entire BKU,
-           |   in order to account for BKUWebStart dependency in reactor build order -->
       <id>include-webstart</id>
       <build>
         <plugins>
@@ -277,10 +275,6 @@
             <artifactId>maven-dependency-plugin</artifactId>
             <executions>
               <execution>
-                      <!--
-                          Copy the webstart bundle in as a resource
-                          before packaging starts.
-                      -->
                 <phase>process-resources</phase>
                 <goals>
                   <goal>unpack</goal>
@@ -289,38 +283,38 @@
                   <artifactItems>
                     <artifactItem>
                       <groupId>at.gv.egiz</groupId>
-                      <artifactId>BKUWebStart</artifactId>
+                      <artifactId>BKUWebStartPackage</artifactId>
                       <type>zip</type>
                     </artifactItem>
                   </artifactItems>
-                  <outputDirectory>${project.build.directory}/${project.build.finalName}/webstart</outputDirectory>
+                  <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
                 </configuration>
               </execution>
             </executions>
           </plugin>
         </plugins>
       </build>
-
       <dependencies>
         <!-- not yet available in IBIBLIO, install locally
          |   NOT REQUIRED FOR BASIC DOWNLOAD PROTOCOL
+         |-->
         <dependency>
           <groupId>org.codehaus.mojo.webstart</groupId>
           <artifactId>webstart-jnlp-servlet</artifactId>
           <version>1.0-6.0.02_ea_b02.1-SNAPSHOT</version>
-        </dependency-->
+        </dependency>
         <!-- dependency to ensure BKUWebStart is build prior to BKUOnline;
          |   transitive dependencies shall not be included in WEB-INF/lib
          |   and are provided in the BKUWebStart zip
          |   (version defined in super-pom dependencyManagement, version won't be adjusted by release:prepare) -->
         <dependency>
           <groupId>at.gv.egiz</groupId>
-          <artifactId>BKUWebStart</artifactId>
+          <artifactId>BKUWebStartPackage</artifactId>
+          <version>${project.version}</version>
           <scope>provided</scope>
           <type>zip</type>
         </dependency>
       </dependencies>
-          
     </profile>
   </profiles>
   <properties>
-- 
cgit v1.2.3