From: Ben Soares <bsoares@dundee.ac.uk>
Date: Fri, 21 Jun 2019 13:56:01 +0000 (+0100)
Subject: JAL-3328 Getdown version number, changed to 1.8.3-1.0_JVL
X-Git-Tag: Release_2_11_0~3^2~1^2~8
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=cb04b0d167435efc06390b318360ebd4bfc03d50;p=jalview.git

JAL-3328 Getdown version number, changed to 1.8.3-1.0_JVL
---

diff --git a/getdown/lib/getdown-core.jar b/getdown/lib/getdown-core.jar
index 550c83f..dedf216 100644
Binary files a/getdown/lib/getdown-core.jar and b/getdown/lib/getdown-core.jar differ
diff --git a/getdown/lib/getdown-launcher.jar b/getdown/lib/getdown-launcher.jar
index 687317f..abab590 100644
Binary files a/getdown/lib/getdown-launcher.jar and b/getdown/lib/getdown-launcher.jar differ
diff --git a/getdown/src/getdown/ant/pom.xml b/getdown/src/getdown/ant/pom.xml
index 3529aa4..16af8b3 100644
--- a/getdown/src/getdown/ant/pom.xml
+++ b/getdown/src/getdown/ant/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.threerings.getdown</groupId>
     <artifactId>getdown</artifactId>
-    <version>1.0B-JVL-1.8.3-SNAPSHOT</version>
+    <version>1.8.3-1.0_JVL</version>
   </parent>
 
   <artifactId>getdown-ant</artifactId>
diff --git a/getdown/src/getdown/core/pom.xml b/getdown/src/getdown/core/pom.xml
index c1e7c23..d8264b4 100644
--- a/getdown/src/getdown/core/pom.xml
+++ b/getdown/src/getdown/core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.threerings.getdown</groupId>
     <artifactId>getdown</artifactId>
-    <version>1.0B-JVL-1.8.3-SNAPSHOT</version>
+    <version>1.8.3-1.0_JVL</version>
   </parent>
 
   <artifactId>getdown-core</artifactId>
diff --git a/getdown/src/getdown/launcher/pom.xml b/getdown/src/getdown/launcher/pom.xml
index 5b6dfcd..90e5c83 100644
--- a/getdown/src/getdown/launcher/pom.xml
+++ b/getdown/src/getdown/launcher/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.threerings.getdown</groupId>
     <artifactId>getdown</artifactId>
-    <version>1.0B-JVL-1.8.3-SNAPSHOT</version>
+    <version>1.8.3-1.0_JVL</version>
   </parent>
 
   <artifactId>getdown-launcher</artifactId>
diff --git a/getdown/src/getdown/mvn_cmd b/getdown/src/getdown/mvn_cmd
old mode 100644
new mode 100755
index 03875e6..2e80990
--- a/getdown/src/getdown/mvn_cmd
+++ b/getdown/src/getdown/mvn_cmd
@@ -1 +1,20 @@
-VERSION=1.0B-JVL-1.8.3-SNAPSHOT; mvn clean package -Dgetdown.host.whitelist="jalview.org,*.jalview.org" && cp launcher/target/getdown-launcher-$VERSION.jar ../../../getdown/lib/getdown-launcher.jar && cp core/target/getdown-core-$VERSION.jar ../../../getdown/lib/getdown-core.jar && cp core/target/getdown-core-$VERSION.jar ../../../j8lib/getdown-core.jar && cp core/target/getdown-core-$VERSION.jar ../../../j11lib/getdown-core.jar 
+#!/usr/bin/env bash
+
+export VERSION=1.8.3-1.0_JVL
+
+if [ x${VERSION%_JVL} = x$VERSION ]; then
+  VERSION=${VERSION}_JVL
+fi
+
+echo "Setting VERSION to '$VERSION'"
+
+perl -p -i -e 's|(<version>)[^<]*JVL[^<]*(</version>)|${1}$ENV{VERSION}${2}|;' pom.xml */pom.xml
+
+mvn clean package -Dgetdown.host.whitelist="jalview.org,*.jalview.org"
+RET=$?
+if [ x$RET = x0 ]; then
+  cp launcher/target/getdown-launcher-$VERSION.jar ../../../getdown/lib/getdown-launcher.jar
+  cp core/target/getdown-core-$VERSION.jar ../../../getdown/lib/getdown-core.jar
+  cp core/target/getdown-core-$VERSION.jar ../../../j8lib/getdown-core.jar
+  cp core/target/getdown-core-$VERSION.jar ../../../j11lib/getdown-core.jar 
+fi
diff --git a/getdown/src/getdown/pom.xml b/getdown/src/getdown/pom.xml
index a13b662..3334828 100644
--- a/getdown/src/getdown/pom.xml
+++ b/getdown/src/getdown/pom.xml
@@ -10,7 +10,7 @@
   <groupId>com.threerings.getdown</groupId>
   <artifactId>getdown</artifactId>
   <packaging>pom</packaging>
-  <version>1.0B-JVL-1.8.3-SNAPSHOT</version>
+  <version>1.8.3-1.0_JVL</version>
 
   <name>getdown</name>
   <description>An application installer and updater.</description>
diff --git a/j11lib/getdown-core.jar b/j11lib/getdown-core.jar
index 550c83f..dedf216 100644
Binary files a/j11lib/getdown-core.jar and b/j11lib/getdown-core.jar differ
diff --git a/j8lib/getdown-core.jar b/j8lib/getdown-core.jar
index 550c83f..dedf216 100644
Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ