From 2d6df6fe1a5dd16a20d035d1c3c27de60ca0a9aa Mon Sep 17 00:00:00 2001
From: Cherian Mathew <c.mathew@bgbm.org>
Date: Fri, 27 Mar 2015 10:13:53 +0000
Subject: [PATCH] eu.etaxonomy.taxeditor.product.with.jre : removed since the
 jre bundling is done on jenkins ApplicationUtil : added UTC to beta version
 string eu.etaxonomy.taxeditor.cdmlib/pom.xml : fixes problem with clean
 validate - ticket #4733

---
 .gitattributes                                |  1 -
 .../etaxonomy/taxeditor/ApplicationUtil.java  |  2 +-
 eu.etaxonomy.taxeditor.cdmlib/pom.xml         |  4 +-
 .../eu.etaxonomy.taxeditor.product.with.jre   | 55 -------------------
 4 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre

diff --git a/.gitattributes b/.gitattributes
index 0a98a61bf..08f910469 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1847,7 +1847,6 @@ eu.etaxonomy.taxeditor/.project -text
 eu.etaxonomy.taxeditor/README.txt -text
 eu.etaxonomy.taxeditor/deploy_nightly.sh -text
 eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product -text
-eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre -text
 eu.etaxonomy.taxeditor/plugin_customization.ini -text
 eu.etaxonomy.taxeditor/pom.xml -text
 eu.etaxonomy.taxeditor/rcp.target -text
diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationUtil.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationUtil.java
index a587a61f4..e3eacfd68 100644
--- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationUtil.java
+++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationUtil.java
@@ -45,7 +45,7 @@ public class ApplicationUtil extends AbstractUtility {
             // this is a stable version
             return version;
         } else {
-            return BETA_PREFIX + " " + version;
+            return BETA_PREFIX + " " + version + " UTC";
         }
 
     }
diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 97745fa49..baba4ed68 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -24,7 +24,7 @@
 	      <goal>copy-dependencies</goal>
 	    </goals>
 	    <configuration>
-	      <excludeArtifactIds>junit,log4j,unitils</excludeArtifactIds>
+	      <includeArtifactIds>cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io</includeArtifactIds>
 	      <outputDirectory>lib</outputDirectory>
 	      <overWriteReleases>true</overWriteReleases>
 	      <overWriteSnapshots>true</overWriteSnapshots>
@@ -39,7 +39,7 @@
 	    </goals>
 	    <configuration>
 	      <classifier>sources</classifier>
-	      <excludeArtifactIds>junit,log4j,unitils</excludeArtifactIds>
+	      <includeArtifactIds>cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io</includeArtifactIds>
 	      <outputDirectory>lib</outputDirectory>
 	      <overWriteReleases>true</overWriteReleases>
 	      <overWriteSnapshots>true</overWriteSnapshots>
diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
deleted file mode 100644
index 3237ef966..000000000
--- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="3.5.0.qualifier" useFeatures="true" includeLaunchers="true">
-
-   <aboutInfo>
-      <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
-      <text>
-         %productBlurb
-      </text>
-   </aboutInfo>
-
-   <configIni use="default">
-   </configIni>
-
-   <launcherArgs>
-      <programArgs>-data @user.home/.cdmLibrary -Dserver_port=58080  -vm jre/bin </programArgs>
-      <vmArgs>-Xmx512M -XX:MaxPermSize=256M -Dorg.eclipse.update.reconcile=false -Declipse.p2.unsignedPolicy=allow</vmArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
-   </launcherArgs>
-
-   <windowImages i16="/eu.etaxonomy.taxeditor.application/icons/256color_16x16.gif" i32="/eu.etaxonomy.taxeditor.application/icons/256color_32x32.gif" i48="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
-
-   <splash
-      location="eu.etaxonomy.taxeditor.application"
-      startupProgressRect="5,447,366,15"
-      startupMessageRect="7,432,360,20"
-      startupForegroundColor="000000" />
-   <launcher name="TaxonomicEditor">
-      <solaris/>
-      <win useIco="false">
-         <bmp/>
-      </win>
-   </launcher>
-
-   <vm>
-   </vm>
-
-   <plugins>
-   </plugins>
-
-   <features>
-      <feature id="eu.etaxonomy.taxeditor.feature"/>
-   </features>
-
-   <configurations>
-      <plugin id="eu.etaxonomy.taxeditor.application" autoStart="true" startLevel="5" />
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.p2.transport.ecf" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
-   </configurations>
-
-</product>
-- 
2.30.2