Upgrade http client essentials fixes #83

dmfs · Aug 3, 2023 · bdd17f1 · bdd17f1
1 parent 860b3fc
commit bdd17f1
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -139,7 +139,7 @@ OAuth2InteractiveGrant grant = new InteractiveGrantFactory(oauth2Client).value(e
 
 ## Choice of HTTP client
 
-This library doesn't depend on any specific HTTP client implementation. Instead it builds upon [http-client-essentials-suite](https://github.com/dmfs/http-client-essentials-suite) to allow any 3rd party HTTP client to be used.
+This library doesn't depend on any specific HTTP client implementation. Instead, it builds upon [http-client-essentials-suite](https://github.com/dmfs/http-client-essentials-suite) to allow any 3rd party HTTP client to be used.
 
 ## Download
 
@@ -150,14 +150,14 @@ Or add it to your build.gradle:
 
     dependencies {
         // oauth2-essentials
-        implementation 'org.dmfs:oauth2-essentials:0.18'
+        implementation 'org.dmfs:oauth2-essentials:0.22.0'
         // optional to use httpurlconnection-executor, any other HttpRequestExecutor
         // implementation will do
-        implementation 'org.dmfs:httpurlconnection-executor:0.20'
+        implementation 'org.dmfs:httpurlconnection-executor:1.21.3'
     }
 
 
 ## License
 
-Copyright dmfs GmbH 2022, licensed under Apache2.
+Copyright dmfs GmbH 2023, licensed under Apache2.
 
diff --git a/build.gradle b/build.gradle
@@ -1,42 +1,43 @@
 plugins {
     id 'java-library'
-    id 'org.dmfs.gitversion' version '0.7.0'
+    id 'org.dmfs.gver' version '0.18.0'
     id 'io.github.gradle-nexus.publish-plugin' version '1.1.0' apply false
 }
 
-gitVersion {
+gver {
     issueTracker GitHub {
         repo = "dmfs/oauth2-essentials"
         if (project.hasProperty("GITHUB_API_TOKEN")) {
             accessToken = GITHUB_API_TOKEN
         }
     }
     changes {
-        are major when {
-            commitMessage contains("(?i)#major\\b")
+        are none when {
+            affects only(matches(~/.*\.md/))
         }
         are major when {
-            commitMessage contains("(?i)#break\\b")
+            commitMessage contains(~/(?i)#(major|break(ing)?)\b/)
         }
         are minor when {
-            commitMessage containsIssue { issue -> issue.labels?.every { it.name != "bug" } }
+            commitMessage contains(~/(?i)#(?<issue>\d+)\b/) {
+                where("issue") { isIssue { labeled "enhancement" } }
+            }
         }
         are patch when {
-            commitMessage containsIssue { issue -> issue.labels?.any { it.name == "bug" } }
+            commitMessage contains(~/(?i)#(?<issue>\d+)\b/) {
+                where("issue") { isIssue { labeled "bug" } }
+            }
         }
         are minor when {
-            commitMessage contains("(?i)\\b(implement(s|ed)?|close[sd]?) #\\d+\\b")
-        }
-        are patch when {
-            commitMessage contains("(?i)\\b(fix(e[sd])?|resolve[sd]?) #\\d+\\b")
+            commitMessage contains("#feature\\b")
         }
         otherwise patch
     }
     preReleases {
-        on ~/master|main/ use { "beta" }
+        on ~/main/ use { "beta" }
         on ~/(.*\/)?(?<name>.*)/ use { "alpha-${group('name')}.1" }
     }
-    releaseBranchPattern ~/master$|main$/
+    releaseBranchPattern ~/main$/
 }
 
 sourceSets {
@@ -108,7 +109,7 @@ dependencies {
     implementation 'org.dmfs:http-executor-decorators:' + HTTP_CLIENT_ESSENTIALS_VERSION
     implementation 'org.dmfs:express-json:0.2.0'
     implementation 'org.dmfs:jems2:' + JEMS2_VERSION
-    implementation 'org.json:json:20220924'
+    implementation 'org.json:json:20230227'
 
     testImplementation 'org.saynotobugs:confidence-core:0.8.0'
     testImplementation 'org.saynotobugs:confidence-mockito4:0.8.0'

diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-HTTP_CLIENT_ESSENTIALS_VERSION=0.21.1
+HTTP_CLIENT_ESSENTIALS_VERSION=1.21.3
 JEMS2_VERSION=2.18.0
 POM_DEVELOPER_ID=dmfs
 POM_DEVELOPER_NAME=Marten Gajda