Merge branch 'rc/1.3.0/develop' into stage/rc/1.3.0/develop

CybercentreCanada · Dec 28, 2023 · c0e5077 · c0e5077
2 parents 987e9dc + 5267802
commit c0e5077
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 56 deletions.
diff --git a/.github/workflows/maven_ossrh.yml b/.github/workflows/maven_ossrh.yml
@@ -0,0 +1,42 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Build and Publish
+
+on:
+  push:
+    branches: [ "develop", "main" ]
+  pull_request:
+    branches: [ "develop" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+        cache: maven
+        server-id: ossrh
+        server-username: MAVEN_USERNAME
+        server-password: MAVEN_PASSWORD        
+
+    - name: Build and Publish with Maven
+      run: mvn -B deploy --file pom.xml
+      env:
+        MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+        MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+
+    # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
+    # - name: Update dependency graph
+    #   uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
diff --git a/README.fr.md b/README.fr.md
@@ -1,6 +1,7 @@
 # [English](README.md)
 
 # MessagePack pour Spark
+[![Build and Publish](https://github.com/CybercentreCanada/spark-msgpack-datasource/actions/workflows/maven.yml/badge.svg)](https://github.com/CybercentreCanada/spark-msgpack-datasource/actions/workflows/maven.yml)
 
 Une implémentation Spark Datasource pour MessagePack.
 

diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # [Français](README.fr.md)
 
 # MessagePack for Spark
+[![Build and Publish](https://github.com/CybercentreCanada/spark-msgpack-datasource/actions/workflows/maven.yml/badge.svg)](https://github.com/CybercentreCanada/spark-msgpack-datasource/actions/workflows/maven.yml)
 
 A Spark Datasource implementation for MessagePack.
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -5,40 +5,27 @@ trigger:
     - develop
     - main
 
-# pr:
-#   branches:
-#     include:
-#       - develop
-
 variables:
   tag: '$(Build.BuildId)'
 
-pool: 'stratus-build-pool.u'
+pool: 
+  vmImage: 'ubuntu-latest'
 
 steps:
+  - task: DownloadSecureFile@1
+    name: settingsxml
+    displayName: Download maven settings xml
+    inputs:
+      secureFile: settings_min.xml
   - task: Maven@3
     displayName: "Build project with maven"
     inputs:
       mavenPomFile: "pom.xml"
       mavenOptions: "-Xmx3072m"
-      javaHomeOption: "path"
+      javaHomeOption: "JDKVersion"
       jdkVersionOption: "1.11"
       jdkArchitectureOption: "x64"
-      jdkDirectory: "/usr/lib/jvm/java-11-openjdk-amd64"
       publishJUnitResults: true
       testResultsFiles: "**/surefire-reports/TEST-*.xml"
       goals: "deploy"
-      options: "-Dgpg.skip=false"
-
-# steps:
-#   - task: Maven@3
-#     displayName: "Build project with maven"
-#     inputs:
-#       mavenPomFile: "pom.xml"
-#       mavenOptions: "-Xmx3072m"
-#       javaHomeOption: 'JDKVersion'
-#       jdkVersionOption: '1.11'
-#       jdkArchitectureOption: 'x64'
-#       publishJUnitResults: true
-#       testResultsFiles: '**/surefire-reports/TEST-*.xml'
-#       goals: 'deploy'
+      options: "-s $(settingsxml.secureFilePath) -Dgpg.skip=false"
diff --git a/maven.yml b/maven.yml
@@ -0,0 +1,45 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Build and Publish
+
+on:
+  push:
+    branches: [ "develop" ]
+  pull_request:
+    branches: [ "develop" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+        cache: maven
+        server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
+        settings-path: ${{ github.workspace }} # location for the settings.xml file
+
+    - name: Build and Publish with Maven
+      run: mvn -B deploy --file pom.xml -s $GITHUB_WORKSPACE/settings.xml
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+
+
+    # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
+    # - name: Update dependency graph
+    #   uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <groupId>io.github.cybercentrecanada</groupId>
   <artifactId>spark-msgpack-datasource-3.5_2.12</artifactId>
   <packaging>jar</packaging>
-  <version>1.2.0</version>
+  <version>1.3.0-SNAPSHOT</version>
   <name>spark-msgpack-datasource</name>
   <description>A spark datasource implementation for the msgpack file format.</description>
   <url>https://github.com/CybercentreCanada/spark-msgpack-datasource</url>
@@ -93,8 +93,8 @@
     <repository>
       <id>ossrh</id>
       <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    </repository>
-  </distributionManagement>
+    </repository>    
+  </distributionManagement>  
   <repositories>
     <repository>
       <id>scala-tools.org</id>
@@ -138,37 +138,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
-        <version>1.6.7</version>
-        <extensions>true</extensions>
-        <configuration>
-          <serverId>ossrh</serverId>
-          <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-          <autoReleaseAfterClose>true</autoReleaseAfterClose>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-gpg-plugin</artifactId>
-        <version>1.5</version>
-        <executions>
-          <execution>
-            <id>sign-artifacts</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>sign</goal>
-            </goals>
-            <configuration>
-              <gpgArguments>
-                <arg>--pinentry-mode</arg>
-                <arg>loopback</arg>
-              </gpgArguments>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.scala-tools</groupId>
         <artifactId>maven-scala-plugin</artifactId>