Bump guava version and Github build workflow changes

OxalisCommunity · Jun 17, 2023 · 685b772 · 685b772
1 parent 56ab2e5
commit 685b772
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 36 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -3,9 +3,8 @@ name: Vefa-Peppol Master Build
 on: [push]
 
 jobs:
-  master-branch-build:
+  build:
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master' # run this job only for the master branch
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK 11
@@ -15,14 +14,3 @@ jobs:
       - name: Build with Maven
         run: mvn -B --no-transfer-progress package
 
-  milestone-6-branch-build:
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/feature/milestone-6' # run this job only for the feature/milestone-6 branch
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Build with Maven
-        run: mvn -B --no-transfer-progress package
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -3,9 +3,8 @@ name: Vefa-Peppol Snapshot publish
 on: [push]
 
 jobs:
-  master-branch-publish:
+  build:
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master' # run this job only for the master branch
     steps:
       - uses: actions/checkout@v2
       - name: Set up Maven Central Repository
@@ -19,23 +18,4 @@ jobs:
         run: mvn --batch-mode deploy
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
-
-  milestone-6-branch-publish-build:
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/feature/milestone-6' # run this job only for the feature/milestone-6 branch
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Maven Central Repository
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-          server-id: ossrh
-          server-username: MAVEN_USERNAME
-          server-password: MAVEN_PASSWORD
-      - name: Publish package
-        run: mvn --batch-mode deploy
-        env:
-          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
-
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
diff --git a/pom.xml b/pom.xml
@@ -105,7 +105,7 @@
         <peppol-lib.version>2.0.0</peppol-lib.version>
         <httpclient.version>4.5.13</httpclient.version>
         <dnsjava.version>3.5.2</dnsjava.version>
-        <guava.version>31.1-jre</guava.version>
+        <guava.version>32.0.1-jre</guava.version>
         <typesafe-config.version>1.4.2</typesafe-config.version>
         <javax-mail.version>1.4.7</javax-mail.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>