Bump version to 0.4.2

brianwyka · brianwyka · commit 20fedb391f4a · 2020-11-25T16:05:08.000-05:00
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>sourcehawk-bom</artifactId>
diff --git a/configuration/pom.xml b/configuration/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>sourcehawk-configuration</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/distributions/debian/pom.xml b/distributions/debian/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk-dist</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -20,7 +20,8 @@
     <properties>
         <debian.build.directory>${project.build.directory}/debian</debian.build.directory>
         <debian.package>${bintray.package}</debian.package>
-        <debian.package.version>${project.version}~${git.commit.time}+${git.commit.id.abbrev}</debian.package.version>
+        <debian.package.version>${project.version}</debian.package.version>
+        <debian.package.version.suffix>~${git.commit.time}+${git.commit.id.abbrev}</debian.package.version.suffix>
         <debian.architecture>amd64</debian.architecture>
     </properties>
 
@@ -288,7 +289,7 @@
                 </property>
             </activation>
             <properties>
-                <debian.package.version>${project.version}</debian.package.version>
+                <debian.package.version.suffix/> <!-- No suffix required on releases -->
             </properties>
         </profile>
         <profile>
@@ -319,9 +320,6 @@
                     <name>ci.deploy</name>
                 </property>
             </activation>
-            <properties>
-                <debian.package.version>${project.version}</debian.package.version>
-            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -331,7 +329,7 @@
                             <environmentVariables>
                                 <BINTRAY_ORGANIZATION>${bintray.organization}</BINTRAY_ORGANIZATION>
                                 <BINTRAY_PACKAGE>${debian.package}</BINTRAY_PACKAGE>
-                                <PACKAGE_VERSION>${debian.package.version}</PACKAGE_VERSION>
+                                <PACKAGE_VERSION>${debian.package.version}${debian.package.version.suffix}</PACKAGE_VERSION>
                                 <BINTRAY_ARCHITECTURES>${debian.architecture},i386,x86_64</BINTRAY_ARCHITECTURES>
                             </environmentVariables>
                         </configuration>
diff --git a/distributions/debian/scripts/publish-package-version-to-bintray.sh b/distributions/debian/scripts/publish-package-version-to-bintray.sh
@@ -29,12 +29,13 @@ BINTRAY_API_URL="https://api.bintray.com"
 BINTRAY_COMPONENT="main"
 BINTRAY_PACKAGE_VERSION="${PACKAGE_VERSION//"-SNAPSHOT"/}" # Remove "-SNAPSHOT" from Package Version
 BINTRAY_PACKAGE_BASE_VERSION="$(echo "$BINTRAY_PACKAGE_VERSION" | cut -f1 -d'~')"
-BINTRAY_PRIMARY_ARCHITECTURE=$(echo "$BINTRAY_ARCHITECTURES" | cut -d',' -f1)
+BINTRAY_PRIMARY_DISTRIBUTION="$(echo "$BINTRAY_DISTRIBUTIONS" | cut -d ',' -f1)"
+BINTRAY_PRIMARY_ARCHITECTURE="$(echo "$BINTRAY_ARCHITECTURES" | cut -d',' -f1)"
 
 # Construct the upload path
 BINTRAY_UPLOAD_PATH="pool/$BINTRAY_COMPONENT/$(echo "$BINTRAY_PACKAGE" | cut -c1-1)/$BINTRAY_PACKAGE_BASE_VERSION/$BINTRAY_PACKAGE-$BINTRAY_REPOSITORY-$BINTRAY_PACKAGE_VERSION-$BINTRAY_PRIMARY_ARCHITECTURE.deb"
 if [[ "$BINTRAY_REPOSITORY" == "dev-snapshots" ]]; then
-  BINTRAY_UPLOAD_PATH="$BINTRAY_PACKAGE_BASE_VERSION/$BINTRAY_PACKAGE-$BINTRAY_PACKAGE_VERSION-$BINTRAY_RELEASE_REPOSITORY-$BINTRAY_PRIMARY_ARCHITECTURE.deb"
+  BINTRAY_UPLOAD_PATH="$BINTRAY_PACKAGE_BASE_VERSION/$BINTRAY_PACKAGE-$BINTRAY_PACKAGE_VERSION-$BINTRAY_RELEASE_REPOSITORY-$BINTRAY_PRIMARY_DISTRIBUTION-$BINTRAY_PRIMARY_ARCHITECTURE.deb"
 fi
 BINTRAY_UPLOAD_PATH="${BINTRAY_UPLOAD_PATH//"-SNAPSHOT"/}" # Remove "-SNAPSHOT" from Upload Path
 
diff --git a/distributions/debian/src/main/resources/DEBIAN/control b/distributions/debian/src/main/resources/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: ${debian.package}
-Version: ${debian.package.version}
+Version: ${debian.package.version}${debian.package.version.suffix}
 Section: utils
 Architecture: ${debian.architecture}
 Priority: optional
diff --git a/distributions/docker/pom.xml b/distributions/docker/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk-dist</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/distributions/linux/pom.xml b/distributions/linux/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk-dist</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/distributions/pom.xml b/distributions/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/distributions/rpm/pom.xml b/distributions/rpm/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <artifactId>sourcehawk-dist</artifactId>
         <groupId>com.optum.sourcehawk</groupId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>sourcehawk-dist-rpm</artifactId>
@@ -432,7 +432,6 @@
                         <configuration>
                             <environmentVariables combine.children="append">
                                 <BINTRAY_REPOSITORY_OVERRIDE>dev-snapshots</BINTRAY_REPOSITORY_OVERRIDE>
-                                <BINTRAY_UPLOAD_PATH>${rpm.package.architecture}/${rpm.package.version}/${rpm.package}-${rpm.package.version}-${rpm.package.release}.${rpm.package.architecture}.rpm</BINTRAY_UPLOAD_PATH>
                             </environmentVariables>
                         </configuration>
                     </plugin>
@@ -472,6 +471,7 @@
                                     <environmentVariables combine.children="append">
                                         <PACKAGE_FILE_PATH>${project.build.directory}/${rpm.package}-centos-7.rpm</PACKAGE_FILE_PATH>
                                         <BINTRAY_REPOSITORY>centos</BINTRAY_REPOSITORY>
+                                        <BINTRAY_DISTRIBUTION>el7</BINTRAY_DISTRIBUTION>
                                     </environmentVariables>
                                 </configuration>
                             </execution>
@@ -486,6 +486,7 @@
                                     <environmentVariables combine.children="append">
                                         <PACKAGE_FILE_PATH>${project.build.directory}/${rpm.package}-centos-8.rpm</PACKAGE_FILE_PATH>
                                         <BINTRAY_REPOSITORY>centos</BINTRAY_REPOSITORY>
+                                        <BINTRAY_DISTRIBUTION>el8</BINTRAY_DISTRIBUTION>
                                     </environmentVariables>
                                 </configuration>
                             </execution>
@@ -500,6 +501,7 @@
                                     <environmentVariables combine.children="append">
                                         <PACKAGE_FILE_PATH>${project.build.directory}/${rpm.package}-fedora-32.rpm</PACKAGE_FILE_PATH>
                                         <BINTRAY_REPOSITORY>fedora</BINTRAY_REPOSITORY>
+                                        <BINTRAY_DISTRIBUTION>fc32</BINTRAY_DISTRIBUTION>
                                     </environmentVariables>
                                 </configuration>
                             </execution>
@@ -514,6 +516,7 @@
                                     <environmentVariables combine.children="append">
                                         <PACKAGE_FILE_PATH>${project.build.directory}/${rpm.package}-fedora-33.rpm</PACKAGE_FILE_PATH>
                                         <BINTRAY_REPOSITORY>fedora</BINTRAY_REPOSITORY>
+                                        <BINTRAY_DISTRIBUTION>fc33</BINTRAY_DISTRIBUTION>
                                     </environmentVariables>
                                 </configuration>
                             </execution>
@@ -528,6 +531,7 @@
                                     <environmentVariables combine.children="append">
                                         <PACKAGE_FILE_PATH>${project.build.directory}/${rpm.package}-fedora-34.rpm</PACKAGE_FILE_PATH>
                                         <BINTRAY_REPOSITORY>fedora</BINTRAY_REPOSITORY>
+                                        <BINTRAY_DISTRIBUTION>fc34</BINTRAY_DISTRIBUTION>
                                     </environmentVariables>
                                 </configuration>
                             </execution>
diff --git a/distributions/rpm/scripts/publish-package-version-to-bintray.sh b/distributions/rpm/scripts/publish-package-version-to-bintray.sh
@@ -21,17 +21,18 @@ BINTRAY_REPOSITORY="${BINTRAY_REPOSITORY:-3}"
 BINTRAY_PACKAGE="${BINTRAY_PACKAGE:-4}"
 PACKAGE_VERSION="${PACKAGE_VERSION:-5}"
 PACKAGE_RELEASE="${PACKAGE_RELEASE:-6}"
-BINTRAY_ARCHITECTURE="${BINTRAY_ARCHITECTURE:-7}"
+BINTRAY_DISTRIBUTION="${BINTRAY_DISTRIBUTION:-7}"
+BINTRAY_ARCHITECTURE="${BINTRAY_ARCHITECTURE:-8}"
 
 # Bintray Common Variables
 BINTRAY_API_URL="https://api.bintray.com"
 BINTRAY_PACKAGE_BASE_VERSION="${PACKAGE_VERSION//"-SNAPSHOT"/}" # Remove "-SNAPSHOT" from Package Version
-BINTRAY_PACKAGE_VERSION="$BINTRAY_PACKAGE_BASE_VERSION-$PACKAGE_RELEASE" # Append Release Metadata
+BINTRAY_PACKAGE_VERSION="$BINTRAY_PACKAGE_BASE_VERSION-$PACKAGE_RELEASE.$BINTRAY_DISTRIBUTION" # Append Release Metadata and Dist
 
 # Construct the upload path
-BINTRAY_UPLOAD_PATH="$BINTRAY_PACKAGE_BASE_VERSION/$BINTRAY_PACKAGE-$BINTRAY_PACKAGE_VERSION-$BINTRAY_ARCHITECTURE.rpm"
+BINTRAY_UPLOAD_PATH="$BINTRAY_PACKAGE_BASE_VERSION/$BINTRAY_PACKAGE-$BINTRAY_PACKAGE_VERSION.$BINTRAY_DISTRIBUTION.$BINTRAY_ARCHITECTURE.rpm"
 if [[ "$BINTRAY_REPOSITORY" == "dev-snapshots" ]]; then
-  BINTRAY_UPLOAD_PATH="$BINTRAY_PACKAGE_BASE_VERSION/$BINTRAY_PACKAGE-$BINTRAY_PACKAGE_VERSION-$BINTRAY_RELEASE_REPOSITORY-$BINTRAY_ARCHITECTURE.rpm"
+  BINTRAY_UPLOAD_PATH="$BINTRAY_PACKAGE_BASE_VERSION/$BINTRAY_PACKAGE-$BINTRAY_PACKAGE_VERSION-$BINTRAY_RELEASE_REPOSITORY-$BINTRAY_DISTRIBUTION.$BINTRAY_ARCHITECTURE.rpm"
 fi
 BINTRAY_UPLOAD_PATH="${BINTRAY_UPLOAD_PATH//"-SNAPSHOT"/}" # Remove "-SNAPSHOT" from Upload Path
 
diff --git a/enforcer/core/pom.xml b/enforcer/core/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk-enforcer</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/enforcer/file/aot/pom.xml b/enforcer/file/aot/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk-enforcer-file</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/enforcer/file/common/pom.xml b/enforcer/file/common/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk-enforcer-file</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/enforcer/file/core/pom.xml b/enforcer/file/core/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk-enforcer-file</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/enforcer/file/docker/pom.xml b/enforcer/file/docker/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk-enforcer-file</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/enforcer/file/maven/pom.xml b/enforcer/file/maven/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk-enforcer-file</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/enforcer/file/pom.xml b/enforcer/file/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk-enforcer</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/enforcer/file/registry/pom.xml b/enforcer/file/registry/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk-enforcer-file</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/enforcer/pom.xml b/enforcer/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/exec/pom.xml b/exec/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>sourcehawk</artifactId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Sourcehawk</name>
diff --git a/protocol/core/pom.xml b/protocol/core/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk-protocol</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocol/file/pom.xml b/protocol/file/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk-protocol</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocol/pom.xml b/protocol/pom.xml
@@ -4,12 +4,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
 
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
