Merge pull request #25 from ashley-taylor/master

catchup

.github/workflows/release.yml

@@ -1,35 +1,46 @@
 name: Release
-on: 
-  workflow_dispatch
+permissions:
+  contents: write
+on: workflow_dispatch
 jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/cache@v1
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-           ${{ runner.os }}-maven-
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
-    - name: Release
-      uses: qcastel/[email protected]
-      with:
-        release-branch-name: "master"
-        maven-args: "-P sonatype"
-        git-release-bot-name: "release-bot"
-        git-release-bot-email: "[email protected]"
-
-        gpg-enabled: "true"
-        gpg-key-id: ${{ secrets.GPG_KEY_ID }}
-        gpg-key: ${{ secrets.GPG_KEY }}
-
-        maven-repo-server-id: sonatype
-        maven-repo-server-username: ${{ secrets.MVN_REPO_PRIVATE_REPO_USER }}
-        maven-repo-server-password: ${{ secrets.MVN_REPO_PRIVATE_REPO_PASSWORD }}
-
-        access-token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v4
+
+      - uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: zulu
+      - uses: whelk-io/maven-settings-xml-action@v22
+        with:
+          servers: >
+            [
+              { "id": "sonatype", "username": "${{ secrets.MVN_REPO_PRIVATE_REPO_USER }}", "password": "${{ secrets.MVN_REPO_PRIVATE_REPO_PASSWORD }}" }
+            ]
+      - name: set name
+        run: |
+          git config --global user.name "release-bot";
+          git config --global user.email "[email protected]";
+
+      - name: add key
+        run: |
+          echo  "${{ secrets.GPG_KEY }}" | base64 -d > private.key
+          gpg --batch --import ./private.key
+          rm ./private.key
+          gpg --list-secret-keys --keyid-format LONG
+
+      - name: prepare
+        run: |
+          mvn release:prepare -Dusername=${{ secrets.GITHUB_TOKEN }} -P sonatype
+
+      - name: release
+        run: |
+          mvn release:perform -Dusername=${{ secrets.GITHUB_TOKEN }} -P sonatype

.github/workflows/test.yml

@@ -1,25 +1,26 @@
 name: Test
-on: 
+on:
   push:
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/cache@v1
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-           ${{ runner.os }}-maven-
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
-    - name: Build with Maven
-      run: mvn -B test --file pom.xml
-    - uses: ashley-taylor/junit-report-annotations-action@master
-      if: always()
-      with:
-        access-token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: zulu
+      - name: Build with Maven
+        run: mvn -B test --file pom.xml
+      - uses: ashley-taylor/junit-report-annotations-action@master
+        if: always()
+        with:
+          access-token: ${{ secrets.GITHUB_TOKEN }}

graphql-database-dynmodb-history-lambda/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.fleetpin</groupId>
 		<artifactId>graphql-database-manager</artifactId>
-		<version>0.2.30-SNAPSHOT</version>
+		<version>3.0.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>graphql-database-dynmodb-history-lambda</artifactId>
@@ -37,9 +37,9 @@
 	</repositories>
 
 	<scm>
-		<url>https://github.com/fleetpin/graphql-dynamodb-manager</url>
-		<connection>scm:git:https://github.com/fleetpin/graphql-dynamodb-manager.git</connection>
-		<developerConnection>scm:git:https://github.com/fleetpin/graphql-dynamodb-manager.git</developerConnection>
+		<url>https://github.com/ashley-taylor/graphql-dynamodb-manager</url>
+		<connection>scm:git:https://github.com/ashley-taylor/graphql-dynamodb-manager.git</connection>
+		<developerConnection>scm:git:https://github.com/ashley-taylor/graphql-dynamodb-manager.git</developerConnection>
 		<tag>HEAD</tag>
 	</scm>
 
@@ -72,24 +72,20 @@
 			<artifactId>graphql-database-manager-dynamo</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
-		<!-- https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-dynamodb 
-			needed for kinesis stream and lambda don't support new api yet could write 
-			something custom here -->
 		<dependency>
 			<groupId>com.amazonaws</groupId>
-			<artifactId>aws-java-sdk-dynamodb</artifactId>
-			<version>1.11.724</version>
+			<artifactId>aws-lambda-java-events-sdk-transformer</artifactId>
+			<version>3.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.amazonaws</groupId>
-			<artifactId>aws-lambda-java-core</artifactId>
-			<version>1.1.0</version>
+			<artifactId>aws-lambda-java-events</artifactId>
+			<version>3.14.0</version>
 		</dependency>
-
 		<dependency>
 			<groupId>com.amazonaws</groupId>
-			<artifactId>aws-lambda-java-events</artifactId>
-			<version>2.2.7</version>
+			<artifactId>aws-lambda-java-core</artifactId>
+			<version>1.2.3</version>
 		</dependency>
 	</dependencies>
 
@@ -98,7 +94,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.10</version>
+				<version>3.8.0</version>
 				<executions>
 					<execution>
 						<id>copy</id>
@@ -129,15 +125,15 @@
 							<execution>
 								<id>attach-sources</id>
 								<goals>
-									<goal>jar</goal>
+									<goal>jar-no-fork</goal>
 								</goals>
 							</execution>
 						</executions>
 					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>3.1.1</version>
+						<version>3.10.0</version>
 						<executions>
 							<execution>
 								<id>attach-javadocs</id>
@@ -150,7 +146,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>1.6</version>
+						<version>3.2.6</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
@@ -164,7 +160,7 @@
 					<plugin>
 						<groupId>org.sonatype.plugins</groupId>
 						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.6.7</version>
+						<version>1.7.0</version>
 						<extensions>true</extensions>
 						<configuration>
 							<serverId>sonatype</serverId>