Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compatibility with Spring Boot 3.x #943

Closed
wants to merge 5 commits into from
Closed

Compatibility with Spring Boot 3.x #943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fbd39a4
:arrow_up: upgrade version of java and dependencies
Apr 3, 2023
000cc15
:fire: replace javax package by jakarta package in sources.
Apr 3, 2023
39a300b
:fire: detect and fix mockito configuration
Apr 3, 2023
94ea8d3
:fire: apply fix mockito configuration with package renamed.
Apr 3, 2023
dc8154b
:art: update information about target jdk
Apr 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
417 changes: 268 additions & 149 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>org.gitlab4j</groupId>
<artifactId>gitlab4j-api</artifactId>
<packaging>jar</packaging>
<version>5.1.0</version>
<version>6.0.0</version>
<name>GitLab4J-API - GitLab API Java Client</name>
<description>GitLab4J-API (gitlab4j-api) provides a full featured Java client library for working with GitLab repositories and servers via the GitLab REST API.</description>
<url>https://github.com/gitlab4j/gitlab4j-api</url>
Expand Down Expand Up @@ -43,21 +43,20 @@
</developers>

<properties>
<java.level>8</java.level>
<java.source.version>1.8</java.source.version>
<java.target.version>1.8</java.target.version>
<java.source.version>11</java.source.version>
<java.target.version>11</java.target.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<jersey.version>2.35</jersey.version>
<jackson.version>2.12.4</jackson.version>
<servlet.version>4.0.4</servlet.version>
<activation.version>1.2.2</activation.version>
<jersey.version>3.1.1</jersey.version>
<jackson.version>2.14.1</jackson.version>
<servlet.version>6.0.0</servlet.version>
<activation.version>2.1.1</activation.version>

<junit.version>5.8.2</junit.version>
<junit.version>5.9.2</junit.version>
<testcontainers.version>1.15.3</testcontainers.version>
<mockito.version>4.4.0</mockito.version>
<mockito.version>5.2.0</mockito.version>
<hamcrest.version>1.3</hamcrest.version>
<systemRules.version>1.19.0</systemRules.version>

Expand Down Expand Up @@ -258,7 +257,7 @@
<configuration>
<rules>
<enforceBytecodeVersion>
<maxJdkVersion>1.8</maxJdkVersion>
<maxJdkVersion>11</maxJdkVersion>
<ignoreClasses>
<ignoreClass>module-info</ignoreClass>
</ignoreClasses>
Expand All @@ -285,7 +284,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.20</version>
<version>1.23</version>
<executions>
<execution>
<goals>
Expand All @@ -297,7 +296,8 @@
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
<artifactId>java1${java.level}</artifactId>
<artifactId>java18</artifactId>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Per mojohaus/animal-sniffer#62, keeping animal-sniffer when building with Java 11 does not really make sense.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, we would be able to remove this configuration ?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is what I did in #946 (keeping you are co-author of the change)

<version>1.0</version>
</signature>
</configuration>
</plugin>
Expand Down Expand Up @@ -449,7 +449,7 @@
<dependency>
<groupId>uk.org.webcompere</groupId>
<artifactId>system-stubs-jupiter</artifactId>
<version>1.2.0</version>
<version>2.0.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Loading