ci: fix opendal-java snapshot releases

.github/workflows/bindings_java.yml

@@ -70,126 +70,133 @@ jobs:
         working-directory: bindings/java
         run: mvn clean verify
 
-  # stage-snapshot:
-  #   runs-on: ${{ matrix.os }}
-  #   if: github.event_name == 'push' || !github.event.pull_request.head.repo.fork
-  #   strategy:
-  #     matrix:
-  #       include:
-  #         - os: ubuntu-latest
-  #           classifier: linux-x86_64
-  #         - os: windows-latest
-  #           classifier: windows-x86_64
-  #         - os: macos-latest
-  #           classifier: osx-x86_64
-  #         - os: macos-latest
-  #           classifier: osx-aarch_64
-  #   steps:
-  #     - uses: actions/checkout@v3
-
-  #     - name: Load secret
-  #       id: op-load-secret
-  #       uses: 1password/load-secrets-action@v1
-  #       with:
-  #         export-env: true
-  #       env:
-  #         OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
-  #         MAVEN_GPG_PRIVATE_KEY: op://services/maven/gpg_private_key
-  #         MAVEN_GPG_PASSPHRASE: op://services/maven/gpg_passphrase
-
-  #     - name: Set up JDK 8
-  #       uses: actions/setup-java@v3
-  #       with:
-  #         distribution: 'temurin'
-  #         java-version: '8'
-  #         cache: 'maven'
-  #         gpg-private-key: ${{ env.MAVEN_GPG_PRIVATE_KEY }}
-  #         gpg-passphrase: ${{ env.MAVEN_GPG_PASSPHRASE }}
-  #     - uses: actions/setup-python@v4
-  #       with:
-  #         python-version: '3.10'
-
-  #     - name: Local staging
-  #       working-directory: bindings/java
-  #       run: mvn -Papache-release package verify org.sonatype.plugins:nexus-staging-maven-plugin:deploy -DjniClassifier=${{ matrix.classifier }} -DskipTests=true -DaltStagingDirectory=local-staging -DskipRemoteStaging=true
-  #       env:
-  #         MAVEN_GPG_PASSPHRASE: ${{ env.MAVEN_GPG_PASSPHRASE }}
-  #     - name: Upload local staging directory
-  #       uses: actions/upload-artifact@v3
-  #       with:
-  #         name: ${{ matrix.classifier }}-local-staging
-  #         path: bindings/java/local-staging
-  #         if-no-files-found: error
-
-  # deploy-snapshots:
-  #   runs-on: ubuntu-latest
-  #   if: github.event_name == 'push' || !github.event.pull_request.head.repo.fork
-  #   needs: [stage-snapshot]
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - name: Load secret
-  #       id: op-load-secret
-  #       uses: 1password/load-secrets-action@v1
-  #       with:
-  #         export-env: true
-  #       env:
-  #         OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
-  #         MAVEN_GPG_PRIVATE_KEY: op://services/maven/gpg_private_key
-  #         MAVEN_GPG_PASSPHRASE: op://services/maven/gpg_passphrase
-
-  #     - name: Set up JDK 8
-  #       uses: actions/setup-java@v3
-  #       with:
-  #         distribution: 'temurin'
-  #         java-version: '8'
-  #         cache: 'maven'
-  #         server-id: apache.snapshots.https
-  #         server-username: MAVEN_USERNAME
-  #         server-password: MAVEN_CENTRAL_TOKEN
-  #         gpg-private-key: ${{ env.MAVEN_GPG_PRIVATE_KEY }}
-  #         gpg-passphrase: ${{ env.MAVEN_GPG_PASSPHRASE }}
-
-  #     - name: Prepare enviroment variables
-  #       run: echo "LOCAL_STAGING_DIR=$HOME/local-staging" >> $GITHUB_ENV
-
-  #     - name: Download windows staging directory
-  #       uses: actions/download-artifact@v3
-  #       with:
-  #         name: windows-x86_64-local-staging
-  #         path: ~/windows-x86_64-local-staging
-  #     - name: Download linux staging directory
-  #       uses: actions/download-artifact@v3
-  #       with:
-  #         name: linux-x86_64-local-staging
-  #         path: ~/linux-x86_64-local-staging
-  #     - name: Download darwin staging directory
-  #       uses: actions/download-artifact@v3
-  #       with:
-  #         name: osx-x86_64-local-staging
-  #         path: ~/osx-x86_64-local-staging
-  #     - name: Download darwin (aarch64) staging directory
-  #       uses: actions/download-artifact@v3
-  #       with:
-  #         name: osx-aarch_64-local-staging
-  #         path: ~/osx-aarch_64-local-staging
-
-  #     - name: Merge staging repositories
-  #       run: |
-  #         mkdir -p ~/local-staging/deferred
-  #         cat ~/windows-x86_64-local-staging/deferred/.index >>  ~/local-staging/deferred/.index
-  #         cp -r ~/windows-x86_64-local-staging/deferred/* ~/local-staging/deferred/
-  #         cat ~/linux-x86_64-local-staging/deferred/.index >>  ~/local-staging/deferred/.index
-  #         cp -r ~/linux-x86_64-local-staging/deferred/* ~/local-staging/deferred/
-  #         cat ~/osx-x86_64-local-staging/deferred/.index >>  ~/local-staging/deferred/.index
-  #         cp -r ~/osx-x86_64-local-staging/deferred/* ~/local-staging/deferred/
-  #         cat ~/osx-aarch_64-local-staging/deferred/.index >>  ~/local-staging/deferred/.index
-  #         cp -r ~/osx-aarch_64-local-staging/deferred/* ~/local-staging/deferred/
-
-  #     - name: Deploy local staged artifacts
-  #       if: ${{ github.event_name != 'pull_request' }}
-  #       working-directory: bindings/java
-  #       run: mvn org.sonatype.plugins:nexus-staging-maven-plugin:deploy-staged -DaltStagingDirectory=$LOCAL_STAGING_DIR
-  #       env:
-  #         MAVEN_USERNAME: ${{ secrets.NEXUS_USER }}
-  #         MAVEN_CENTRAL_TOKEN: ${{ secrets.NEXUS_PW }}
-  #         MAVEN_GPG_PASSPHRASE: ${{ env.MAVEN_GPG_PASSPHRASE }}
+  stage-snapshot:
+    runs-on: ${{ matrix.os }}
+    if: ${{ github.event_name == 'push' || !github.event.pull_request.head.repo.fork }}}
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            classifier: linux-x86_64
+          # FIXME: Windows is not supported due to 1password action limitation.
+          # - os: windows-latest
+            # classifier: windows-x86_64
+          - os: macos-latest
+            classifier: osx-x86_64
+          - os: macos-latest
+            classifier: osx-aarch_64
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+
+      - name: Load secret
+        id: op-load-secret
+        uses: 1password/load-secrets-action@v1
+        with:
+          export-env: true
+        env:
+          OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
+          MAVEN_GPG_PRIVATE_KEY: op://services/maven/gpg_private_key
+          MAVEN_GPG_PASSPHRASE: op://services/maven/gpg_passphrase
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '8'
+          cache: 'maven'
+          gpg-private-key: ${{ env.MAVEN_GPG_PRIVATE_KEY }}
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE
+
+      - name: Local staging
+        working-directory: bindings/java
+        run: mvn -Papache-release package verify org.sonatype.plugins:nexus-staging-maven-plugin:deploy -Dsuffix.snapshot="-SNAPSHOT" -Djni.classifier=${{ matrix.classifier }} -DskipTests=true -DaltStagingDirectory=local-staging -DskipRemoteStaging=true
+        env:
+          MAVEN_GPG_PASSPHRASE: ${{ env.MAVEN_GPG_PASSPHRASE }}
+
+      - name: Upload local staging directory
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.classifier }}-local-staging
+          path: bindings/java/local-staging
+          if-no-files-found: error
+
+  deploy-snapshots:
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'push' || !github.event.pull_request.head.repo.fork }}}
+    needs: [stage-snapshot]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Load secret
+        id: op-load-secret
+        uses: 1password/load-secrets-action@v1
+        with:
+          export-env: true
+        env:
+          OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
+          MAVEN_GPG_PRIVATE_KEY: op://services/maven/gpg_private_key
+          MAVEN_GPG_PASSPHRASE: op://services/maven/gpg_passphrase
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '8'
+          cache: 'maven'
+          server-id: apache.snapshots.https
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_CENTRAL_TOKEN
+          gpg-private-key: ${{ env.MAVEN_GPG_PRIVATE_KEY }}
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE
+
+      - name: Prepare enviroment variables
+        run: echo "LOCAL_STAGING_DIR=$HOME/local-staging" >> $GITHUB_ENV
+
+      # - name: Download windows staging directory
+      #   uses: actions/download-artifact@v3
+      #   with:
+      #     name: windows-x86_64-local-staging
+      #     path: ~/windows-x86_64-local-staging
+
+      - name: Download linux staging directory
+        uses: actions/download-artifact@v3
+        with:
+          name: linux-x86_64-local-staging
+          path: ~/linux-x86_64-local-staging
+      - name: Download darwin staging directory
+        uses: actions/download-artifact@v3
+        with:
+          name: osx-x86_64-local-staging
+          path: ~/osx-x86_64-local-staging
+      - name: Download darwin (aarch64) staging directory
+        uses: actions/download-artifact@v3
+        with:
+          name: osx-aarch_64-local-staging
+          path: ~/osx-aarch_64-local-staging
+
+      - name: Merge staging repositories
+        run: |
+          mkdir -p ~/local-staging/deferred
+
+          # cat ~/windows-x86_64-local-staging/deferred/.index >>  ~/local-staging/deferred/.index
+          # cp -r ~/windows-x86_64-local-staging/deferred/* ~/local-staging/deferred/
+
+          cat ~/linux-x86_64-local-staging/deferred/.index >>  ~/local-staging/deferred/.index
+          cp -r ~/linux-x86_64-local-staging/deferred/* ~/local-staging/deferred/
+
+          cat ~/osx-x86_64-local-staging/deferred/.index >>  ~/local-staging/deferred/.index
+          cp -r ~/osx-x86_64-local-staging/deferred/* ~/local-staging/deferred/
+
+          cat ~/osx-aarch_64-local-staging/deferred/.index >>  ~/local-staging/deferred/.index
+          cp -r ~/osx-aarch_64-local-staging/deferred/* ~/local-staging/deferred/
+
+      - name: Deploy local staged artifacts
+        if: ${{ github.event_name != 'pull_request' }}
+        working-directory: bindings/java
+        run: mvn org.sonatype.plugins:nexus-staging-maven-plugin:deploy-staged -Dsuffix.snapshot="-SNAPSHOT" -DaltStagingDirectory=$LOCAL_STAGING_DIR
+        env:
+          MAVEN_USERNAME: ${{ secrets.NEXUS_USER }}
+          MAVEN_CENTRAL_TOKEN: ${{ secrets.NEXUS_PW }}
+          MAVEN_GPG_PASSPHRASE: ${{ env.MAVEN_GPG_PASSPHRASE }}

bindings/java/pom.xml

@@ -32,7 +32,7 @@
 
     <groupId>org.apache.opendal</groupId>
     <artifactId>opendal-java</artifactId>
-    <version>0.37.0</version>
+    <version>0.37.0${suffix.snapshot}</version>
 
     <url>https://opendal.apache.org</url>
     <mailingLists>
@@ -52,8 +52,8 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
 
-        <!-- Use camelCase instead of separating by dots to workaround PowerShell parsing. -->
-        <jniClassifier>${os.detected.classifier}</jniClassifier>
+        <jni.classifier>${os.detected.classifier}</jni.classifier>
+        <suffix.snapshot /> <!-- used by snapshots releases -->
 
         <assertj-version>3.23.1</assertj-version>
         <lombok.version>1.18.26</lombok.version>
@@ -166,7 +166,7 @@
                             <arguments>
                                 <argument>${project.basedir}/tools/build.py</argument>
                                 <argument>--classifier</argument>
-                                <argument>${jniClassifier}</argument>
+                                <argument>${jni.classifier}</argument>
                             </arguments>
                         </configuration>
                     </execution>
@@ -198,7 +198,7 @@
                             <goal>jar</goal>
                         </goals>
                         <configuration>
-                            <classifier>${jniClassifier}</classifier>
+                            <classifier>${jni.classifier}</classifier>
                         </configuration>
                     </execution>
                 </executions>

bindings/java/src/main/java/org/apache/opendal/Environment.java

@@ -39,7 +39,7 @@ public enum Environment {
         try (InputStream is = classLoader.getResourceAsStream("bindings.properties")) {
             final Properties properties = new Properties();
             properties.load(is);
-            INSTANCE.classifier = properties.getProperty("jniClassifier", UNKNOWN);
+            INSTANCE.classifier = properties.getProperty("jni.classifier", UNKNOWN);
             INSTANCE.projectVersion = properties.getProperty("project.version", UNKNOWN);
         } catch (IOException e) {
             throw new UncheckedIOException("cannot load environment properties file", e);

bindings/java/src/main/resources/bindings.properties

@@ -15,5 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 
-jniClassifier=${jniClassifier}
+jni.classifier=${jni.classifier}
 project.version=${project.version}