eu.etaxonomy.taxeditor.product.with.jre : removed since the jre bundling is done...
authorCherian Mathew <c.mathew@bgbm.org>
Fri, 27 Mar 2015 10:13:53 +0000 (10:13 +0000)
committerCherian Mathew <c.mathew@bgbm.org>
Fri, 27 Mar 2015 10:13:53 +0000 (10:13 +0000)
ApplicationUtil : added UTC to beta version string
eu.etaxonomy.taxeditor.cdmlib/pom.xml : fixes problem with clean validate - ticket #4733

.gitattributes
eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationUtil.java
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre [deleted file]

index 0a98a61..08f9104 100644 (file)
@@ -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
index a587a61..e3eacfd 100644 (file)
@@ -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";
         }
 
     }
index 97745fa..baba4ed 100644 (file)
@@ -24,7 +24,7 @@
              <goal>copy-dependencies</goal>\r
            </goals>\r
            <configuration>\r
-             <excludeArtifactIds>junit,log4j,unitils</excludeArtifactIds>\r
+             <includeArtifactIds>cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io</includeArtifactIds>\r
              <outputDirectory>lib</outputDirectory>\r
              <overWriteReleases>true</overWriteReleases>\r
              <overWriteSnapshots>true</overWriteSnapshots>\r
@@ -39,7 +39,7 @@
            </goals>\r
            <configuration>\r
              <classifier>sources</classifier>\r
-             <excludeArtifactIds>junit,log4j,unitils</excludeArtifactIds>\r
+             <includeArtifactIds>cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io</includeArtifactIds>\r
              <outputDirectory>lib</outputDirectory>\r
              <overWriteReleases>true</overWriteReleases>\r
              <overWriteSnapshots>true</overWriteSnapshots>\r
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 (file)
index 3237ef9..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<?pde version="3.5"?>\r
-\r
-<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">\r
-\r
-   <aboutInfo>\r
-      <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>\r
-      <text>\r
-         %productBlurb\r
-      </text>\r
-   </aboutInfo>\r
-\r
-   <configIni use="default">\r
-   </configIni>\r
-\r
-   <launcherArgs>\r
-      <programArgs>-data @user.home/.cdmLibrary -Dserver_port=58080  -vm jre/bin </programArgs>\r
-      <vmArgs>-Xmx512M -XX:MaxPermSize=256M -Dorg.eclipse.update.reconcile=false -Declipse.p2.unsignedPolicy=allow</vmArgs>\r
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>\r
-   </launcherArgs>\r
-\r
-   <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"/>\r
-\r
-   <splash\r
-      location="eu.etaxonomy.taxeditor.application"\r
-      startupProgressRect="5,447,366,15"\r
-      startupMessageRect="7,432,360,20"\r
-      startupForegroundColor="000000" />\r
-   <launcher name="TaxonomicEditor">\r
-      <solaris/>\r
-      <win useIco="false">\r
-         <bmp/>\r
-      </win>\r
-   </launcher>\r
-\r
-   <vm>\r
-   </vm>\r
-\r
-   <plugins>\r
-   </plugins>\r
-\r
-   <features>\r
-      <feature id="eu.etaxonomy.taxeditor.feature"/>\r
-   </features>\r
-\r
-   <configurations>\r
-      <plugin id="eu.etaxonomy.taxeditor.application" autoStart="true" startLevel="5" />\r
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />\r
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />\r
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />\r
-      <plugin id="org.eclipse.equinox.p2.transport.ecf" autoStart="true" startLevel="4" />\r
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />\r
-   </configurations>\r
-\r
-</product>\r