From: Ben Soares <bsoares@dundee.ac.uk>
Date: Thu, 2 Apr 2020 13:55:22 +0000 (+0100)
Subject: JAL-3572 Added getdown Implementation-Version to getdown jars META-INF/MANIFEST.MF
X-Git-Tag: Develop-2_11_2_0-d20201215~57
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=93aa4558431fabba858943e9b2e8f871381a691c;p=jalview.git

JAL-3572 Added getdown Implementation-Version to getdown jars META-INF/MANIFEST.MF
---

diff --git a/getdown/lib/FJVL_VERSION b/getdown/lib/FJVL_VERSION
new file mode 100644
index 0000000..e7a1de7
--- /dev/null
+++ b/getdown/lib/FJVL_VERSION
@@ -0,0 +1 @@
+1.8.3-1.2.4_FJVL
diff --git a/getdown/lib/JVL_VERSION b/getdown/lib/JVL_VERSION
new file mode 100644
index 0000000..756f4bd
--- /dev/null
+++ b/getdown/lib/JVL_VERSION
@@ -0,0 +1 @@
+1.8.3-1.2.4_JVL
diff --git a/getdown/lib/getdown-core.jar b/getdown/lib/getdown-core.jar
index 13ff1ea..9c0f96e 100644
Binary files a/getdown/lib/getdown-core.jar and b/getdown/lib/getdown-core.jar differ
diff --git a/getdown/lib/getdown-launcher-local.jar b/getdown/lib/getdown-launcher-local.jar
index 568cf07..cfa96f3 100644
Binary files a/getdown/lib/getdown-launcher-local.jar and b/getdown/lib/getdown-launcher-local.jar differ
diff --git a/getdown/lib/getdown-launcher.jar b/getdown/lib/getdown-launcher.jar
index c353e9b..2f8baa7 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 ff1c73a..8dcef42 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.8.3-1.2.3_FJVL</version>
+    <version>1.8.3-1.2.4_FJVL</version>
   </parent>
 
   <artifactId>getdown-ant</artifactId>
diff --git a/getdown/src/getdown/core/pom.xml b/getdown/src/getdown/core/pom.xml
index 7eb03a8..2d0e89a 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.8.3-1.2.3_FJVL</version>
+    <version>1.8.3-1.2.4_FJVL</version>
   </parent>
 
   <artifactId>getdown-core</artifactId>
@@ -132,6 +132,20 @@
           <useFile>false</useFile>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.1.0</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+
     </plugins>
   </build>
 
diff --git a/getdown/src/getdown/launcher/pom.xml b/getdown/src/getdown/launcher/pom.xml
index dc2e676..ad87541 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.8.3-1.2.3_FJVL</version>
+    <version>1.8.3-1.2.4_FJVL</version>
   </parent>
 
   <artifactId>getdown-launcher</artifactId>
@@ -118,6 +118,7 @@
           <archive>
             <manifest>
               <mainClass>com.threerings.getdown.launcher.GetdownApp</mainClass>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
             </manifest>
             <manifestEntries>
               <Permissions>all-permissions</Permissions>
diff --git a/getdown/src/getdown/mvn_cmd b/getdown/src/getdown/mvn_cmd
index 0d2315d..3f9b4a2 100755
--- a/getdown/src/getdown/mvn_cmd
+++ b/getdown/src/getdown/mvn_cmd
@@ -3,7 +3,7 @@
 if [ x$JVLVERSION != x ]; then
   export VERSION=$JVLVERSION
 else
-  export VERSION=1.8.3-1.2.3_JVL
+  export VERSION=1.8.3-1.2.4_JVL
 fi
 
 if [ x${VERSION%_JVL} = x$VERSION ]; then
@@ -19,6 +19,7 @@ if [ x$RET = x0 ]; then
   cp core/target/getdown-core-$VERSION.jar ../../../getdown/lib/getdown-core.jar && echo "Copied getdown-core-$VERSION.jar to getdown/lib"
   cp core/target/getdown-core-$VERSION.jar ../../../j8lib/getdown-core.jar && echo "Copied getdown-core-$VERSION.jar to j8lib"
   cp core/target/getdown-core-$VERSION.jar ../../../j11lib/getdown-core.jar && echo "Copied getdown-core-$VERSION.jar to j11lib"
+  echo "$VERSION" > ../../../getdown/lib/JVL_VERSION
 fi
 
 VERSION=${VERSION/JVL/FJVL}
@@ -28,4 +29,5 @@ mvn package -Dgetdown.host.whitelist="jalview.org,*.jalview.org" -Dallow_file_pr
 RET=$?
 if [ x$RET = x0 ]; then
   cp launcher/target/getdown-launcher-$VERSION.jar ../../../getdown/lib/getdown-launcher-local.jar && echo "Copied getdown-launcher-$VERSION.jar to getdown/lib/getdown-launcher-local.jar"
+  echo "$VERSION" > ../../../getdown/lib/FJVL_VERSION
 fi
diff --git a/getdown/src/getdown/pom.xml b/getdown/src/getdown/pom.xml
index 0299940..2ca4aa1 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.8.3-1.2.3_FJVL</version>
+  <version>1.8.3-1.2.4_FJVL</version>
 
   <name>getdown</name>
   <description>An application installer and updater.</description>
diff --git a/j11lib/getdown-core.jar b/j11lib/getdown-core.jar
index 13ff1ea..9c0f96e 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 13ff1ea..9c0f96e 100644
Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ