Fixes #198 - Remove azure-blob workflow

manorrock · Nov 5, 2023 · 54230ef · 54230ef
1 parent 7300a41
commit 54230ef
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 28 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,35 +2,17 @@ name: build
 on: 
   push:
     branches:
-      - 'current'
+      - '*'
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout sources
       uses: actions/checkout@v1
-    - name: Set up Java 20
+    - name: Set up Java 21
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: '20'
+        java-version: '21'
     - name: Build with Maven
       run: mvn -B --ntp package
-  azure-blob: 
-    runs-on: 'ubuntu-latest'
-    steps: 
-    - uses: 'azure/login@v1'
-      with: 
-        allow-no-subscriptions: 'true'
-        creds: '${{ secrets.AZURE_CREDENTIALS }}'
-    - uses: 'actions/checkout@v2'
-    - name: Set up Java 20
-      uses: actions/setup-java@v3
-      with:
-        distribution: 'temurin'
-        java-version: '20'
-    - name: Build with Maven
-      run: |
-        mvn clean install
-        cd azure-blob
-        mvn -P azure -amd clean install
diff --git a/pom.xml b/pom.xml
@@ -20,6 +20,7 @@
         </license>
     </licenses>
     <properties>
+        <!-- dependencies -->
         <azure-cosmos.version>4.39.0</azure-cosmos.version>
         <azure-identity.version>1.7.2</azure-identity.version>
         <azure-security-keyvault-certificates.version>4.2.7</azure-security-keyvault-certificates.version>
@@ -28,22 +29,22 @@
         <azure-storage-blob.version>12.20.1</azure-storage-blob.version>
         <azure-storage-file-share.version>12.16.1</azure-storage-file-share.version>
         <coherence.version>21.12.2</coherence.version>
-        <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
-        <java.version>17</java.version>
-        <junit.version>5.9.2</junit.version>
+        <junit.version>5.10.0</junit.version>
         <h2.version>2.1.214</h2.version>
         <hazelcast.version>5.0.2</hazelcast.version>
         <lettuce-core.version>6.2.3.RELEASE</lettuce-core.version>
+        <org.eclipse.jgit.version>6.5.0.202303070854-r</org.eclipse.jgit.version>
+        <!-- other -->
+        <java.version>21</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- plugins -->
+        <jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
         <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
         <maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
         <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
         <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
         <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
-        <org.eclipse.jgit.version>6.5.0.202303070854-r</org.eclipse.jgit.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <build>
         <pluginManagement>