Merge pull request #98 from usdot-jpo-ode/master

Sync Develop with Master
usdot-jpo-ode · Jun 18, 2024 · bc74b8d · bc74b8d
2 parents 9dfa167 + c2c32e2
commit bc74b8d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
@@ -19,8 +19,13 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Replcae Docker tag
+        id: set_tag
+        run: echo "TAG=$(echo ${GITHUB_REF##*/} | sed 's/\//-/g')" >> $GITHUB_ENV
+
       - name: Build
         uses: docker/build-push-action@v3
         with:
           push: true
-          tags: usdotjpoode/jpo-conflictmonitor:${{ github.ref_name }}
+          tags: usdotjpoode/jpo-conflictmonitor:${{ env.TAG }}
diff --git a/jpo-conflictmonitor/pom.xml b/jpo-conflictmonitor/pom.xml
@@ -9,7 +9,7 @@
   </parent>
   <groupId>usdot.jpo.ode</groupId>
   <artifactId>jpo-conflictmonitor</artifactId>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>1.3.1-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>jpo-conflictmonitor</name>
   <url>http://maven.apache.org</url>
@@ -99,17 +99,17 @@
     <dependency>
       <groupId>usdot.jpo.ode</groupId>
       <artifactId>jpo-ode-core</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
+      <version>2.1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>usdot.jpo.ode</groupId>
       <artifactId>jpo-ode-plugins</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
+      <version>2.1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>usdot.jpo.ode</groupId>
       <artifactId>jpo-geojsonconverter</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.3.1-SNAPSHOT</version>
       <classifier>jpo-geojsonconverter</classifier>
     </dependency>
     <dependency>

diff --git a/jpo-deduplicator/pom.xml b/jpo-deduplicator/pom.xml
@@ -101,23 +101,23 @@
         <dependency>
             <groupId>usdot.jpo.ode</groupId>
             <artifactId>jpo-ode-core</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>usdot.jpo.ode</groupId>
             <artifactId>jpo-ode-plugins</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>usdot.jpo.ode</groupId>
             <artifactId>jpo-geojsonconverter</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.3.1-SNAPSHOT</version>
             <classifier>jpo-geojsonconverter</classifier>
         </dependency>
         <dependency>
 	    <groupId>usdot.jpo.ode</groupId>
 	    <artifactId>jpo-conflictmonitor</artifactId>
-	    <version>1.3.0-SNAPSHOT</version>
+	    <version>1.3.1-SNAPSHOT</version>
 	    <classifier>jpo-conflictmonitor</classifier>
     	</dependency>
         <dependency>

diff --git a/jpo-geojsonconverter b/jpo-geojsonconverter
diff --git a/test-message-sender/message-sender/pom.xml b/test-message-sender/message-sender/pom.xml
@@ -49,7 +49,7 @@
 		<dependency>
 			<groupId>usdot.jpo.ode</groupId>
 			<artifactId>jpo-geojsonconverter</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.3.1-SNAPSHOT</version>
 			<classifier>jpo-geojsonconverter</classifier>
 			<exclusions>
 				<exclusion>