Merge pull request #89 from GIScience/fix/artifact-upload-4.8.2

GIScience · Aug 31, 2023 · 091bc0a · 091bc0a
2 parents 203e8e1 + 0285875
commit 091bc0a
Show file tree

Hide file tree

Showing 14 changed files with 171 additions and 129 deletions.
diff --git a/.github/workflows/push-packages.yml b/.github/workflows/push-packages.yml
@@ -1,13 +1,21 @@
 name: Publish to GitHub Packages
-#on: push
+on:
+  push:
+    branches:
+      - 'ors_4.0'
+      - 'releases/v4.*'
+  release:
+    types: [ published ]
 jobs:
   publish:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
         with:
-          java-version: 1.8
+          distribution: 'temurin'
+          java-version: '17'
       - name: Cache Maven artifacts
         uses: actions/cache@v2
         with:
@@ -29,9 +37,19 @@ jobs:
           key: ${{ runner.os }}-node-${{ hashFiles('**/pom.xml', '**/package.json') }}
           restore-keys: |
             ${{ runner.os}}-node_modules-
-      - name: Build and publish package
+      - name: Build and publish package on snapshot
+        if: github.event_name == 'push' && github.event_name != 'release'
         run: |
-          mvn -B versions:set -DnewVersion=$GITHUB_SHA -DgenerateBackupPoms=false
           mvn -B -DskipTests -Pskip-shaded-web-jar -Pskip-tools-jar source:jar deploy
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          RT_USERNAME: ${{ secrets.RT_USERNAME }}
+          RT_PASSWORD: ${{ secrets.RT_PASSWORD }}
+      # Write a task to publish the package to GitHub Packages when a release is published
+      - name: Build and publish package on release
+        if: github.event_name == 'release'
+        run: |
+          mvn versions:set -DnewVersion=${{ github.event.release.tag_name }} -DgenerateBackupPoms=false
+          mvn -B -DskipTests -Pskip-shaded-web-jar -Pskip-tools-jar source:jar deploy
+        env:
+          RT_USERNAME: ${{ secrets.RT_USERNAME }}
+          RT_PASSWORD: ${{ secrets.RT_PASSWORD }}
diff --git a/.github/workflows/run_maven_tests.yml b/.github/workflows/run_maven_tests.yml
@@ -7,9 +7,11 @@ on:
   push:
     branches:
       - 'ors_4.0'
+      - 'releases/v4.*'
   pull_request:
     branches:
       - 'ors_4.0'
+      - 'releases/v4.*'
 
 jobs:
   run_tests:

diff --git a/client-hc/pom.xml b/client-hc/pom.xml
@@ -22,21 +22,21 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>directions-api-client-hc</artifactId>
-    <version>4.0</version>
+    <version>4.8.2-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>GraphHopper Directions API hand-crafted Java Client.</name>
 
     <parent>
-        <groupId>com.graphhopper</groupId>
+        <groupId>com.github.GIScience.graphhopper</groupId>
         <artifactId>graphhopper-parent</artifactId>
-        <version>4.0</version>
+        <version>4.8.2-SNAPSHOT</version>
     </parent>  
 
     <dependencies>
         <dependency>
-            <groupId>com.graphhopper</groupId>
+            <groupId>com.github.GIScience.graphhopper</groupId>
             <artifactId>graphhopper-web-api</artifactId>
-            <version>${project.parent.version}</version>
+            <version>4.8.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -5,16 +5,16 @@
 
     <artifactId>graphhopper-core</artifactId>
     <name>GraphHopper Core</name>
-    <version>4.0-SNAPSHOT</version>
+    <version>4.8.2-SNAPSHOT</version>
     <packaging>jar</packaging>
     <description>
         GraphHopper is a fast and memory efficient Java road routing engine
         working seamlessly with OpenStreetMap data.
     </description>
     <parent>
-        <groupId>com.graphhopper</groupId>
+        <groupId>com.github.GIScience.graphhopper</groupId>
         <artifactId>graphhopper-parent</artifactId>
-        <version>4.0-SNAPSHOT</version>
+        <version>4.8.2-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -36,9 +36,9 @@
     </licenses>
     <dependencies>
         <dependency>
-            <groupId>com.graphhopper</groupId>
+            <groupId>com.github.GIScience.graphhopper</groupId>
             <artifactId>graphhopper-web-api</artifactId>
-            <version>${project.parent.version}</version>
+            <version>4.8.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.carrotsearch</groupId>
@@ -139,6 +139,7 @@
             <scope>test</scope>
             <version>4.13.2</version>
         </dependency>
+
     </dependencies>
 
     <build>

diff --git a/example/pom.xml b/example/pom.xml
@@ -5,36 +5,36 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>graphhopper-example</artifactId>
-    <version>4.0</version>
+    <version>4.8.2-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>GraphHopper Example</name>
 
     <parent>
-        <groupId>com.graphhopper</groupId>
+        <groupId>com.github.GIScience.graphhopper</groupId>
         <artifactId>graphhopper-parent</artifactId>
-        <version>4.0</version>
+        <version>4.8.2-SNAPSHOT</version>
     </parent>  
 
     <dependencies>
         <dependency>
-            <groupId>com.graphhopper</groupId>
+            <groupId>com.github.GIScience.graphhopper</groupId>
             <artifactId>graphhopper-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>4.8.2-SNAPSHOT</version>
         </dependency>
 
         <!-- you can use this for logging or any slf4j log implementation -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.slf4j</groupId>-->
+<!--            <artifactId>slf4j-api</artifactId>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.slf4j</groupId>-->
+<!--            <artifactId>slf4j-log4j12</artifactId>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>log4j</groupId>-->
+<!--            <artifactId>log4j</artifactId>-->
+<!--        </dependency>-->
     </dependencies>
 
 </project>
diff --git a/hmm-lib/pom.xml b/hmm-lib/pom.xml
@@ -19,17 +19,17 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>hmm-lib-external</artifactId>
     <!-- SNAPSHOT is necessary otherwise it says: Deployment failed: repository element was not specified in the POM inside distributionManagement element-->
-    <version>4.0</version>
+    <version>4.8.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>hmm-lib</name>
     <description>Hidden Markov Model (HMM) library for time-inhomogeneous Markov processes</description>
     <url>https://github.com/bmwcarit/hmm-lib</url>
 
     <parent>
-        <groupId>com.graphhopper</groupId>
+        <groupId>com.github.GIScience.graphhopper</groupId>
         <artifactId>graphhopper-parent</artifactId>
-        <version>4.0</version>
+        <version>4.8.2-SNAPSHOT</version>
     </parent>
 
     <developers>

diff --git a/map-matching/pom.xml b/map-matching/pom.xml
@@ -7,25 +7,25 @@
     <name>GraphHopper Map Matching</name>
 
     <parent>
-        <groupId>com.graphhopper</groupId>
+        <groupId>com.github.GIScience.graphhopper</groupId>
         <artifactId>graphhopper-parent</artifactId>
-        <version>4.0-SNAPSHOT</version>
+        <version>4.8.2-SNAPSHOT</version>
     </parent>
 
     <dependencies>
         <dependency>
-            <groupId>com.graphhopper</groupId>
+            <groupId>com.github.GIScience.graphhopper</groupId>
             <artifactId>graphhopper-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>4.8.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.graphhopper</groupId>
+            <groupId>com.github.GIScience.graphhopper</groupId>
             <artifactId>hmm-lib-external</artifactId>
-            <version>4.0</version>
+            <version>4.8.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>

diff --git a/navigation/pom.xml b/navigation/pom.xml
@@ -5,26 +5,26 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>graphhopper-nav</artifactId>
-    <version>4.0</version>
+    <version>4.8.2-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>GraphHopper Navigation</name>
 
     <parent>
-        <groupId>com.graphhopper</groupId>
+        <groupId>com.github.GIScience.graphhopper</groupId>
         <artifactId>graphhopper-parent</artifactId>
-        <version>4.0</version>
+        <version>4.8.2-SNAPSHOT</version>
     </parent>  
 
     <dependencies>
         <dependency>
-            <groupId>com.graphhopper</groupId>
+            <groupId>com.github.GIScience.graphhopper</groupId>
             <artifactId>graphhopper-web-api</artifactId>
-            <version>${project.parent.version}</version>
+            <version>4.8.2-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>com.graphhopper</groupId>
+            <groupId>com.github.GIScience.graphhopper</groupId>
             <artifactId>graphhopper-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>4.8.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.dropwizard</groupId>