diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index 1c838d3d..f1a768e4 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -25,14 +25,30 @@ jobs:
- uses: actions/checkout@v3
- name: Docker Compose Action
uses: isbang/compose-action@v1.5.1
- - name: Set up JDK 17
- uses: actions/setup-java@v3
+ - name: Set up JDK 21 for building and testing
+ uses: actions/setup-java@v4
with:
- java-version: '17'
+ java-version: '21'
distribution: 'temurin'
cache: maven
- - name: Build with Maven
+ - name: Build and test with Maven java 21
run: mvn -B package --file pom.xml
+ - name: Set up JDK 17 for testing
+ uses: actions/setup-java@v4
+ with:
+ java-version: '17'
+ distribution: 'temurin'
+ cache: maven
+ - name: Test with Maven java 17
+ run: mvn test
+ - name: Setup JDK 11 for testing
+ uses: actions/setup-java@v4
+ with:
+ java-version: '11'
+ distribution: 'temurin'
+ cache: maven
+ - name: Test with Maven java 11
+ run: mvn test
# Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
- name: Update dependency graph
@@ -45,20 +61,21 @@ jobs:
needs: build-and-test
steps:
- uses: actions/checkout@v4
- - name: Docker Compose Action
- uses: isbang/compose-action@v1.5.1
- name: Set up JDK 17 and Set up Maven Central Repository
uses: actions/setup-java@v4
with:
- java-version: '17'
+ java-version: '21'
distribution: 'temurin'
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_TOKEN
gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }}
gpg-passphrase: MAVEN_GPG_PASSPHRASE
+ - name: Set version
+ run: mvn versions:set -DnewVersion=${{ github.event.release.tag_name }}
- name: publish to maven central
- run: mvn -P release --batch-mode -Dgpg.passphrase=${{ secrets.GPG_SIGNING_KEY_PASSWORD }} deploy
+ #skipping tests, since they have already run in the previous job
+ run: mvn -P release --batch-mode deploy -DskipTests
env:
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
MAVEN_TOKEN: ${{ secrets.OSSRH_TOKEN }}
diff --git a/core/pom.xml b/core/pom.xml
index 6e1e6f55..ff390a04 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -13,7 +13,7 @@
org.sql2o
sql2o-parent
- 1.7.0
+ 1.7.0-SNAPSHOT
sql2o
jar
diff --git a/extensions/db2/pom.xml b/extensions/db2/pom.xml
index 09d635ad..23878703 100644
--- a/extensions/db2/pom.xml
+++ b/extensions/db2/pom.xml
@@ -18,7 +18,7 @@
org.sql2o.extensions
extensions-parent
- 1.7.0
+ 1.7.0-SNAPSHOT
diff --git a/extensions/oracle-joda-time/pom.xml b/extensions/oracle-joda-time/pom.xml
index ffaa8c0d..9d0f2f27 100644
--- a/extensions/oracle-joda-time/pom.xml
+++ b/extensions/oracle-joda-time/pom.xml
@@ -18,7 +18,7 @@
org.sql2o.extensions
extensions-parent
- 1.7.0
+ 1.7.0-SNAPSHOT
@@ -40,7 +40,7 @@
org.sql2o.extensions
sql2o-oracle
- 1.7.0
+ 1.7.0-SNAPSHOT
test
diff --git a/extensions/oracle/pom.xml b/extensions/oracle/pom.xml
index bac4c54e..211b4f6c 100644
--- a/extensions/oracle/pom.xml
+++ b/extensions/oracle/pom.xml
@@ -18,7 +18,7 @@
org.sql2o.extensions
extensions-parent
- 1.7.0
+ 1.7.0-SNAPSHOT
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 77b97cee..ca44b7b8 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -18,7 +18,7 @@
org.sql2o
sql2o-parent
- 1.7.0
+ 1.7.0-SNAPSHOT
diff --git a/extensions/postgres/pom.xml b/extensions/postgres/pom.xml
index 27edf9b7..4fe76fb8 100644
--- a/extensions/postgres/pom.xml
+++ b/extensions/postgres/pom.xml
@@ -18,7 +18,7 @@
org.sql2o.extensions
extensions-parent
- 1.7.0
+ 1.7.0-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index 19266bb5..3997f4cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
org.sql2o
sql2o-parent
Sql2o parent
- 1.7.0
+ 1.7.0-SNAPSHOT
Easy database query library