ci: reset to 3.0.3-SNAPSHOT (#1414)

* ci: reset to 3.0.3-SNAPSHOT * ci: redfine the action/cache key - I think each build is getting a new key because the pom hash is probably different * ci: ensure maven cache is saved * ci: dont restore the cache for the build job, just save it - otherwise the save fails with a 'already creating' error
paulcwarren · May 16, 2023 · 5604109 · 5604109
1 parent 0510f47
commit 5604109
Show file tree

Hide file tree

Showing 33 changed files with 113 additions and 107 deletions.
diff --git a/.github/workflows/prs.yml b/.github/workflows/prs.yml
@@ -8,6 +8,8 @@ jobs:
 
   build:
     runs-on: ubuntu-latest
+    outputs:
+      spring_content_version: ${{ steps.build.outputs.spring_content_version }}
     steps:
     - uses: actions/checkout@v2
       with:
@@ -21,17 +23,21 @@ jobs:
         server-password: MAVEN_PASSWORD
         gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
         gpg-passphrase: MAVEN_GPG_PASSPHRASE
-    - name: Cache Maven packages
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2
-        key: ${{ runner.os }}-maven-${{ env.GITHIB_SHA }}        
     - name: Build and Test
+      id: build
       run: |
         export AWS_REGION=us-west-1
         pushd spring-content
           mvn -B -P tests -Dmaven.javadoc.skip=true install --file pom.xml
+          project_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          echo "spring_content_version=${project_version}" >> $GITHUB_OUTPUT
         popd
+    - name: Save Maven Cache
+      id: cache-maven-save
+      uses: actions/cache/save@v3
+      with:
+        path: ~/.m2
+        key: ${{ runner.os }}-maven-${{ github.run_id }}
 
   validate-with-examples:
     runs-on: ubuntu-latest
@@ -47,10 +53,10 @@ jobs:
         gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
         gpg-passphrase: MAVEN_GPG_PASSPHRASE    
     - name: Restore Maven packages
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/.m2
-        key: ${{ runner.os }}-maven-${{ env.GITHIB_SHA }}        
+        key: ${{ runner.os }}-maven-${{ github.run_id }}
     - uses: actions/checkout@v2
       with:
         repository: paulcwarren/spring-content-examples
@@ -79,10 +85,10 @@ jobs:
         gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
         gpg-passphrase: MAVEN_GPG_PASSPHRASE    
     - name: Restore Maven packages
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/.m2
-        key: ${{ runner.os }}-maven-${{ env.GITHIB_SHA }}        
+        key: ${{ runner.os }}-maven-${{ github.run_id }}
     - uses: actions/checkout@v2
       with:
         repository: paulcwarren/spring-content-gettingstarted
@@ -92,5 +98,5 @@ jobs:
       run: |
         export AWS_REGION=us-west-1
         pushd spring-content-gettingstarted
-          SPRING_CONTENT_VERSION=3.0.2-SNAPSHOT mvn -B clean install
+          SPRING_CONTENT_VERSION=${{ needs.build.outputs.spring_content_version }} mvn -B clean install
         popd        
diff --git a/content-fs-spring-boot-starter/pom.xml b/content-fs-spring-boot-starter/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.paulcwarren</groupId>
 		<artifactId>spring-content</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>3.0.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>content-fs-spring-boot-starter</artifactId>
@@ -13,12 +13,12 @@
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
 			<artifactId>spring-content-fs</artifactId>
-			<version>3.1.0-SNAPSHOT</version>
+			<version>3.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
 			<artifactId>spring-content-autoconfigure</artifactId>
-			<version>3.1.0-SNAPSHOT</version>
+			<version>3.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

diff --git a/content-jpa-spring-boot-starter/pom.xml b/content-jpa-spring-boot-starter/pom.xml
@@ -4,20 +4,20 @@
 	<parent>
 		<groupId>com.github.paulcwarren</groupId>
 		<artifactId>spring-content</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>3.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>content-jpa-spring-boot-starter</artifactId>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
 			<artifactId>spring-content-autoconfigure</artifactId>
-			<version>3.1.0-SNAPSHOT</version>
+			<version>3.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
 			<artifactId>spring-content-jpa</artifactId>
-			<version>3.1.0-SNAPSHOT</version>
+			<version>3.0.3-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/content-mongo-spring-boot-starter/pom.xml b/content-mongo-spring-boot-starter/pom.xml
@@ -4,20 +4,20 @@
 	<parent>
 		<groupId>com.github.paulcwarren</groupId>
 		<artifactId>spring-content</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>3.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>content-mongo-spring-boot-starter</artifactId>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
 			<artifactId>spring-content-autoconfigure</artifactId>
-			<version>3.1.0-SNAPSHOT</version>
+			<version>3.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
 			<artifactId>spring-content-mongo</artifactId>
-			<version>3.1.0-SNAPSHOT</version>
+			<version>3.0.3-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/content-rest-spring-boot-starter/pom.xml b/content-rest-spring-boot-starter/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.paulcwarren</groupId>
 		<artifactId>spring-content</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>3.0.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>content-rest-spring-boot-starter</artifactId>
@@ -13,12 +13,12 @@
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
 			<artifactId>spring-content-rest</artifactId>
-			<version>3.1.0-SNAPSHOT</version>
+			<version>3.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
 			<artifactId>spring-content-autoconfigure</artifactId>
-			<version>3.1.0-SNAPSHOT</version>
+			<version>3.0.3-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/content-s3-spring-boot-starter/pom.xml b/content-s3-spring-boot-starter/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.paulcwarren</groupId>
 		<artifactId>spring-content</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>3.0.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>content-s3-spring-boot-starter</artifactId>
@@ -13,12 +13,12 @@
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
 			<artifactId>spring-content-s3</artifactId>
-			<version>3.1.0-SNAPSHOT</version>
+			<version>3.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
 			<artifactId>spring-content-autoconfigure</artifactId>
-			<version>3.1.0-SNAPSHOT</version>
+			<version>3.0.3-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 

diff --git a/content-solr-spring-boot-starter/pom.xml b/content-solr-spring-boot-starter/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.paulcwarren</groupId>
 		<artifactId>spring-content</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>3.0.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>content-solr-spring-boot-starter</artifactId>
@@ -13,7 +13,7 @@
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
 			<artifactId>spring-content-solr</artifactId>
-			<version>3.1.0-SNAPSHOT</version>
+			<version>3.0.3-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.paulcwarren</groupId>
     <artifactId>spring-content</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.0.3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Spring Content</name>

diff --git a/spring-content-autoconfigure/pom.xml b/spring-content-autoconfigure/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.github.paulcwarren</groupId>
 		<artifactId>spring-content</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>3.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<dependencies>
@@ -21,25 +21,25 @@
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
 			<artifactId>spring-content-commons</artifactId>
-			<version>3.1.0-SNAPSHOT</version>
+			<version>3.0.3-SNAPSHOT</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
 			<artifactId>spring-content-fs</artifactId>
-			<version>3.1.0-SNAPSHOT</version>
+			<version>3.0.3-SNAPSHOT</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
 			<artifactId>spring-content-jpa</artifactId>
-			<version>3.1.0-SNAPSHOT</version>
+			<version>3.0.3-SNAPSHOT</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
 			<artifactId>spring-content-mongo</artifactId>
-			<version>3.1.0-SNAPSHOT</version>
+			<version>3.0.3-SNAPSHOT</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -55,7 +55,7 @@
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
 			<artifactId>spring-content-renditions</artifactId>
-			<version>3.1.0-SNAPSHOT</version>
+			<version>3.0.3-SNAPSHOT</version>
 			<optional>true</optional>
 		</dependency>
 <!--		<dependency>-->
@@ -67,13 +67,13 @@
 		<dependency>
 	      	<groupId>com.github.paulcwarren</groupId>
 	  		<artifactId>spring-content-rest</artifactId>
-	  		<version>3.1.0-SNAPSHOT</version>
+	  		<version>3.0.3-SNAPSHOT</version>
 			<optional>true</optional>
   		</dependency>
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
 			<artifactId>spring-content-s3</artifactId>
-			<version>3.1.0-SNAPSHOT</version>
+			<version>3.0.3-SNAPSHOT</version>
 			<optional>true</optional>
 			<exclusions>
 				<exclusion>
@@ -85,7 +85,7 @@
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
 			<artifactId>spring-content-solr</artifactId>
-			<version>3.1.0-SNAPSHOT</version>
+			<version>3.0.3-SNAPSHOT</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -107,7 +107,7 @@
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
 			<artifactId>spring-content-elasticsearch</artifactId>
-			<version>3.1.0-SNAPSHOT</version>
+			<version>3.0.3-SNAPSHOT</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -119,7 +119,7 @@
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
 			<artifactId>spring-versions-jpa</artifactId>
-			<version>3.1.0-SNAPSHOT</version>
+			<version>3.0.3-SNAPSHOT</version>
 			<optional>true</optional>
 		</dependency>
 

diff --git a/spring-content-azure-storage/pom.xml b/spring-content-azure-storage/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.github.paulcwarren</groupId>
 		<artifactId>spring-content</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>3.0.3-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
@@ -17,7 +17,7 @@
 		<dependency>
 		<groupId>com.github.paulcwarren</groupId>
 			<artifactId>spring-content-commons</artifactId>
-			<version>3.1.0-SNAPSHOT</version>
+			<version>3.0.3-SNAPSHOT</version>
 		</dependency>
  		<dependency>
  			<groupId>com.azure.spring</groupId>

diff --git a/spring-content-bom/pom.xml b/spring-content-bom/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.paulcwarren</groupId>
         <artifactId>spring-content</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>spring-content-bom</artifactId>

diff --git a/spring-content-commons/pom.xml b/spring-content-commons/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.github.paulcwarren</groupId>
 		<artifactId>spring-content</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>3.0.3-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>
@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
 			<artifactId>spring-versions-commons</artifactId>
-			<version>3.1.0-SNAPSHOT</version>
+			<version>3.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>

diff --git a/spring-content-elasticsearch-boot-starter/pom.xml b/spring-content-elasticsearch-boot-starter/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-content</artifactId>
 		<groupId>com.github.paulcwarren</groupId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>3.0.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
@@ -15,12 +15,12 @@
         <dependency>
             <groupId>com.github.paulcwarren</groupId>
             <artifactId>spring-content-elasticsearch</artifactId>
-            <version>3.1.0-SNAPSHOT</version>
+            <version>3.0.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.github.paulcwarren</groupId>
             <artifactId>spring-content-autoconfigure</artifactId>
-            <version>3.1.0-SNAPSHOT</version>
+            <version>3.0.3-SNAPSHOT</version>
         </dependency>
     </dependencies>