chore: Init new version branch

pact-foundation · Oct 29, 2024 · 8b8c28c · 8b8c28c
1 parent 85c9236
commit 8b8c28c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 15 deletions.
diff --git a/.github/workflows/compatability-suite.yml b/.github/workflows/compatability-suite.yml
@@ -2,9 +2,9 @@ name: Pact-JVM Compatibility Suite
 
 on:
   push:
-    branches: [ master, v4.1.x, v4.4.x, v4.5.x ]
+    branches: [ master, v4.1.x, v4.5.x, v4.6.x, v4.7.x ]
   pull_request:
-    branches: [ master, v4.1.x, v4.4.x, v4.5.x ]
+    branches: [ master, v4.1.x, v4.5.x, v4.6.x, v4.7.x ]
 
 jobs:
   v1:

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -2,9 +2,9 @@ name: Pact-JVM Build
 
 on:
   push:
-    branches: [ master, v4.1.x, v4.4.x, v4.5.x, v4.6.x ]
+    branches: [ master, v4.1.x, v4.5.x, v4.6.x, v4.7.x ]
   pull_request:
-    branches: [ master, v4.1.x, v4.4.x, v4.5.x, v4.6.x ]
+    branches: [ master, v4.1.x, v4.5.x, v4.6.x, v4.7.x ]
 
 jobs:
   latest_jdk:
@@ -15,7 +15,7 @@ jobs:
         module: [ core, 'consumer -x :consumer:junit:clojureTest', provider, pact-specification-test ]
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 19
+    - name: Set up JDK 18
       uses: actions/setup-java@v3
       with:
         distribution: temurin

diff --git a/README.md b/README.md
@@ -46,9 +46,10 @@ and in the [Pact-JVM wiki](https://github.com/pact-foundation/pact-jvm/wiki). [S
 
 ## Supported JDK and specification versions:
 
-| Branch                                                                 | Specification | JDK        | Kotlin Version | Latest Version | Notes |
-|------------------------------------------------------------------------|---------------|------------|----------------|----------------|-------|
-| [4.6.x](https://github.com/pact-foundation/pact-jvm/blob/v4.6.x/README.md) master | V4 + plugins  | 17+        | 1.8.22         | 4.6.15         |       |
+| Branch                                                                            | Specification | JDK        | Kotlin Version | Latest Version | Notes |
+|-----------------------------------------------------------------------------------|---------------|------------|----------------|----------------|-------|
+| [4.7.x](https://github.com/pact-foundation/pact-jvm/blob/v4.7.x/README.md)        | V4 + plugins  | 17+        | 1.8.22         | 4.7.0-beta.0   |       |
+| [4.6.x](https://github.com/pact-foundation/pact-jvm/blob/v4.6.x/README.md) master | V4 + plugins  | 17-18      | 1.8.22         | 4.6.15         |       |
 | [4.5.x](https://github.com/pact-foundation/pact-jvm/blob/v4.5.x/README.md)        | V4 + plugins  | 11+/17+(1) | 1.7.20         | 4.5.13         |       |
 | [4.1.x](https://github.com/pact-foundation/pact-jvm/blob/v4.1.x/README.md)        | V3            | 8-12       | 1.3.72         | 4.1.43         |       |
 

diff --git a/buildSrc/src/main/groovy/au.com.dius.pact.kotlin-common-conventions.gradle b/buildSrc/src/main/groovy/au.com.dius.pact.kotlin-common-conventions.gradle
@@ -12,7 +12,7 @@ repositories {
     mavenCentral()
 }
 
-version = '4.6.16'
+version = '4.7.0-beta.0'
 
 java {
     targetCompatibility = '17'

diff --git a/releasePrep.groovy b/releasePrep.groovy
@@ -125,7 +125,7 @@ ask('Publish pacts to pact-foundation.pactflow.io?: [Y]') {
   executeOnShell 'PACT_PUBLISH=true ./gradlew :pact-publish:test :pact-publish:pactPublish'
 }
 
-def nextVer = Version.valueOf(releaseVer).incrementPatchVersion()
+def nextVer = Version.valueOf(releaseVer).incrementPreReleaseVersion()
 ask("Bump version to $nextVer?: [Y]") {
   executeOnShell "sed -i -e \"s/version = '${releaseVer}'/version = '${nextVer}'/\" buildSrc/src/main/groovy/au.com.dius.pact.kotlin-common-conventions.gradle"
   executeOnShell("git add buildSrc/src/main/groovy/au.com.dius.pact.kotlin-common-conventions.gradle")

diff --git a/settings.gradle b/settings.gradle
@@ -18,11 +18,7 @@ include 'provider:junit'
 include 'provider:junit5'
 include 'provider:spring'
 include 'provider:junit5spring'
-
-// Spring 6 module requires JDK 17+
-if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
-  include 'provider:spring6'
-}
+include 'provider:spring6'
 
 // In Windows, fails with java.lang.NullPointerException
 if (System.getenv('GITHUB_WORKFLOW') == null) {