Merge remote-tracking branch 'origin/master'

Author: JanHolger

.github/workflows/maven-deploy-release.yml

@@ -0,0 +1,20 @@
+name: Maven Release Deploy
+on:
+  release:
+    types: [published]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build
+        run: mvn -B -DnewVersion=${{ github.event.release.tag_name }} package --file pom.xml
+      - name: Deploy to JavaWebStack Repository
+        run: mvn deploy -DnewVersion=${{ github.event.release.tag_name }} -s build/settings.xml
+        env:
+          DEPLOYMENT_USERNAME: ${{ secrets.DEPLOYMENT_USERNAME }}
+          DEPLOYMENT_PASSWORD: ${{ secrets.DEPLOYMENT_PASSWORD }}

.github/workflows/maven-deploy.yml

@@ -26,15 +26,15 @@ jobs:
         with:
           java-version: 1.8
       - name: Build
-        run: mvn -B package -Dmaven.test.skip=true
+        run: mvn -DnewVersion=1.0-SNAPSHOT -B package -Dmaven.test.skip=true
       - name: Test
         run: mvn -B test
         env:
           MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
           MYSQL_USERNAME: test
           MYSQL_PASSWORD: test
       - name: Deploy to JavaWebStack Repository
-        run: mvn deploy -B -s build/settings.xml -Dmaven.test.skip=true
+        run: mvn deploy -B -DnewVersion=1.0-SNAPSHOT -s build/settings.xml -Dmaven.test.skip=true
         env:
           DEPLOYMENT_USERNAME: ${{ secrets.DEPLOYMENT_USERNAME }}
           DEPLOYMENT_PASSWORD: ${{ secrets.DEPLOYMENT_PASSWORD }}

README.md

@@ -92,7 +92,7 @@ You also need to add the driver you want to use. JavaWebStack ORM comes with a w
 <dependency>
     <groupId>mysql</groupId>
     <artifactId>mysql-connector-java</artifactId>
-    <version>8.0.22</version>
+    <version>8.0.25</version>
     <scope>compile</scope>
 </dependency>
 ```

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.javawebstack</groupId>
     <artifactId>ORM</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>${newVersion}</version>
 
     <repositories>
         <repository>
@@ -99,4 +99,4 @@
         </repository>
     </distributionManagement>
 
-</project>
+</project>