Merge remote-tracking branch 'origin/master' into sqlgrammar-unicode

liquibase · Feb 10, 2022 · 883b638 · 883b638
2 parents 6388deb + f422810
commit 883b638
Show file tree

Hide file tree

Showing 22 changed files with 763 additions and 618 deletions.
diff --git a/.github/util/ManifestReversion.java b/.github/util/ManifestReversion.java
@@ -12,7 +12,9 @@
 public class ManifestReversion {
     public static void main(String[] args) throws Exception {
         String filename = args[0];
-        String version = args[1];
+        String version = args[1]
+                .replaceFirst("^v", "");
+
         Manifest manifest;
         try (InputStream input = new FileInputStream(filename)) {
             manifest = new Manifest(input);
@@ -21,7 +23,8 @@ public static void main(String[] args) throws Exception {
 
         attributes.putValue("Liquibase-Version", version);
 
-        if (attributes.containsKey("Bundle-Version")) {
+        final String bundleVersion = attributes.getValue("Bundle-Version");
+        if (bundleVersion != null) {
             attributes.putValue("Bundle-Version", version);
         }
 

diff --git a/.github/util/re-version.sh b/.github/util/re-version.sh
@@ -55,6 +55,22 @@ do
 
   cp $workdir/$jar $outdir
   rename.ul 0-SNAPSHOT $version $outdir/$jar
+
+  ## Make sure there are no left-over 0-SNAPSHOT versions
+  mkdir -p $workdir/test
+  unzip -q $outdir/*.jar -d $workdir/test
+
+  if grep -rl "0-SNAPSHOT" $workdir/test; then
+    echo "Found '0-SNAPSHOT' in re-versioned jars"
+    exit 1
+  fi
+
+  if grep -rl "0.0.0.SNAPSHOT" $workdir/test; then
+    echo "Found '0.0.0.SNAPSHOT' in re-versioned jars"
+    exit 1
+  fi
+
+  rm -rf $workdir/test
 done
 
 #### Update  javadoc jars