Library Updates (#179)

* Update minor versions * Update major versions * Debug * Revert "Debug" This reverts commit 154a9ac. * Change the libs * Fix changelog --------- Co-authored-by: Michael Lieshoff <[email protected]>
mlieshoff · Dec 18, 2023 · 5ebbade · 5ebbade
1 parent d57f9e6
commit 5ebbade
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,25 @@
 
 ## [Unreleased]
 
+## [3.0.5] - 2023-12-18
+
+### Added
+
+- Maven enforcer plugin -> Minimum Maven version is now 3.8.8
+
+### Changed
+
+- Lombok from 1.18.24 to 1.18.30
+- JaCoCo from 0.8.10 to 0.8.11
+- Apache Commons IO from 2.11.0 to 2.15.1
+- JUnit from 5.8.2 to 5.10.1
+- SLF4j from 1.8.0-beta2 to 2.0.9
+- Mockito from 4.5.1 to 5.8.0
+- WireMock from 2.27.2 to 3.0.1
+- GSON from 2.9.0 to 2.10.1
+- Maven Source from 3.0.1 to 3.3.0
+- Maven Surefire from 2.22.2 to 3.2.3
+
 ## [3.0.4] - 2023-12-12
 
 ### Removed
@@ -113,7 +132,8 @@
 
 - Create a Release job (#152)
 
-[unreleased]: https://github.com/mlieshoff/jcrapi2/compare/v3.0.4...HEAD
+[unreleased]: https://github.com/mlieshoff/jcrapi2/compare/v3.0.5...HEAD
+[3.0.5]: https://github.com/mlieshoff/jcrapi2/compare/v3.0.4...3.0.5
 [3.0.4]: https://github.com/mlieshoff/jcrapi2/compare/v3.0.3...3.0.4
 [3.0.3]: https://github.com/mlieshoff/jcrapi2/compare/v3.0.2...3.0.3
 [3.0.2]: https://github.com/mlieshoff/jcrapi2/compare/v3.0.1...3.0.2

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 [![](https://img.shields.io/badge/java-packagecloud.io-844fec.svg)](https://packagecloud.io/)
 [![Nightlies](https://github.com/mlieshoff/jcrapi2/actions/workflows/nightlies.yml/badge.svg)](https://github.com/mlieshoff/jcrapi2/actions/workflows/nightlies.yml)
 
-# jcrapi2 3.0.4
+# jcrapi2 3.0.5
 A Java Wrapper For Official Supercell Clash Royal Api
 
 ## Why we don't use the Swagger scheme?
@@ -424,15 +424,15 @@ All requests are returning *java.concurrent.Future*. The execution will be async
 
 to Gradle:
 ```groovy
-    implementation group: 'jcrapi2', name: 'jcrapi2', version: '3.0.4'
+    implementation group: 'jcrapi2', name: 'jcrapi2', version: '3.0.5'
 ```
 
 to Maven:
 ```xml
     <dependency>
         <groupId>jcrapi2</groupId>
         <artifactId>jcrapi2</artifactId>
-        <version>3.0.4</version>
+        <version>3.0.5</version>
     </dependency>
 ```
 

diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-v3.0.4
+v3.0.5
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jcrapi2</artifactId>
     <packaging>jar</packaging>
-    <version>3.0.4</version>
+    <version>3.0.5</version>
     <groupId>jcrapi2</groupId>
     <url>https://maven.apache.org</url>
     <inceptionYear>2018</inceptionYear>
@@ -31,23 +31,47 @@
         </license>
     </licenses>
     <properties>
-        <version.gson>2.9.0</version.gson>
-        <version.io>2.11.0</version.io>
-        <version.jacoco>0.8.10</version.jacoco>
+        <version.gson>2.10.1</version.gson>
+        <version.io>2.15.1</version.io>
+        <version.jacoco>0.8.11</version.jacoco>
         <version.java>17</version.java>
         <version.json>1.1.4</version.json>
-        <version.junit>5.8.2</version.junit>
-        <version.lombok>1.18.24</version.lombok>
-        <version.maven.source>3.0.1</version.maven.source>
-        <version.maven.surfire>2.22.2</version.maven.surfire>
+        <version.junit>5.10.1</version.junit>
+        <version.lombok>1.18.30</version.lombok>
+        <version.maven.compiler>3.11.0</version.maven.compiler>
+        <version.maven.dependency>3.6.1</version.maven.dependency>
+        <version.maven.enforcer>3.4.1</version.maven.enforcer>
+        <version.maven.exec>3.1.1</version.maven.exec>
+        <version.maven.source>3.3.0</version.maven.source>
+        <version.maven.surfire>3.2.3</version.maven.surfire>
         <version.maven.surfire.junit>1.0.3</version.maven.surfire.junit>
         <version.maven.packagecloud>0.0.4</version.maven.packagecloud>
-        <version.mockito>4.5.1</version.mockito>
-        <version.slf4j>1.8.0-beta2</version.slf4j>
-        <version.wiremock>2.27.2</version.wiremock>
+        <version.mockito>5.8.0</version.mockito>
+        <version.slf4j>2.0.9</version.slf4j>
+        <version.wiremock>3.0.1</version.wiremock>
     </properties>
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>${version.maven.enforcer}</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>3.8.8</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -64,10 +88,12 @@
             </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
+                <version>${version.maven.dependency}</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>${version.maven.compiler}</version>
                 <configuration>
                     <source>${version.java}</source>
                     <target>${version.java}</target>
@@ -100,6 +126,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
+                <version>${version.maven.exec}</version>
                 <executions>
                     <execution>
                         <id>ReleaseVersion</id>

diff --git a/src/test/java/jcrapi2/IntegrationTestBase.java b/src/test/java/jcrapi2/IntegrationTestBase.java
@@ -22,6 +22,7 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.github.tomakehurst.wiremock.common.ContentTypes.AUTHORIZATION;
 
 import static org.apache.commons.io.FileUtils.readLines;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -31,8 +32,8 @@
 
 import static wiremock.org.apache.commons.lang3.StringUtils.EMPTY;
 import static wiremock.org.apache.commons.lang3.StringUtils.isNotBlank;
-import static wiremock.org.apache.http.HttpHeaders.AUTHORIZATION;
-import static wiremock.org.apache.http.HttpStatus.SC_OK;
+import static wiremock.org.apache.hc.core5.http.HttpStatus.SC_BAD_REQUEST;
+import static wiremock.org.apache.hc.core5.http.HttpStatus.SC_OK;
 
 import static java.util.Collections.emptyMap;
 
@@ -50,8 +51,6 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 
-import wiremock.org.apache.http.HttpStatus;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -154,10 +153,7 @@ private void prepareWithError(String url, String queryPart, Request request) {
         stubFor(
                 get(urlEqualTo(createUrl(url, queryPart, request)))
                         .withHeader(AUTHORIZATION, equalTo("Bearer myApiKey"))
-                        .willReturn(
-                                aResponse()
-                                        .withBody("body")
-                                        .withStatus(HttpStatus.SC_BAD_REQUEST)));
+                        .willReturn(aResponse().withBody("body").withStatus(SC_BAD_REQUEST)));
     }
 
     protected JCrApi getJCrApi() {