Skip to content

Commit 47a4735

Browse files
committed
Merge remote-tracking branch 'origin/6.x' into 6.x
2 parents f8e26d5 + 4289c1f commit 47a4735

File tree

3 files changed

+15
-35
lines changed

3 files changed

+15
-35
lines changed

.github/workflows/ci-build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ on:
99

1010
jobs:
1111

12-
build-jdk8:
13-
name: "Build JDK 8"
12+
build-jdk11:
13+
name: "Build JDK 11"
1414
runs-on: ubuntu-latest
1515
services:
1616
gitlab-instance:
@@ -23,11 +23,11 @@ jobs:
2323
- uses: actions/checkout@v2
2424
with:
2525
fetch-depth: 0
26-
- name: Set up JDK 8
26+
- name: Set up JDK 11
2727
uses: actions/setup-java@v2
2828
with:
2929
distribution: adopt-hotspot
30-
java-version: 8
30+
java-version: 11
3131
- name: Get Date
3232
id: get-date
3333
run: |

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# GitLab4J&trade; API (gitlab4j-api)<br />Java Client Library for the GitLab REST API
22

33
[![Maven Central](https://img.shields.io/maven-central/v/org.gitlab4j/gitlab4j-api.svg)](http://mvnrepository.com/artifact/org.gitlab4j/gitlab4j-api)
4-
[![Build Status](https://github.com/gitlab4j/gitlab4j-api/actions/workflows/ci-build.yml/badge.svg?branch=main)](https://github.com/gitlab4j/gitlab4j-api/actions/workflows/ci-build.yml)
4+
[![Build Status](https://github.com/gitlab4j/gitlab4j-api/actions/workflows/ci-build.yml/badge.svg?branch=6.x)](https://github.com/gitlab4j/gitlab4j-api/actions/workflows/ci-build.yml)
55
[![javadoc.io](https://javadoc.io/badge2/org.gitlab4j/gitlab4j-api/javadoc.io.svg)](https://javadoc.io/doc/org.gitlab4j/gitlab4j-api)
66

77
GitLab4J&trade; API (gitlab4j-api) provides a full featured and easy to consume Java library for working with GitLab repositories via the GitLab REST API. Additionally, full support for working with GitLab webhooks and system hooks is also provided.
@@ -10,7 +10,7 @@ GitLab4J&trade; API (gitlab4j-api) provides a full featured and easy to consume
1010
## Table of Contents
1111
* [GitLab Server Version Support](#gitLab-server-version-support)<br/>
1212
* [Using GitLab4J-API](#using-gitlab4j-api)<br/>
13-
* [Java 8 Requirement](#java-8-requirement)<br/>
13+
* [Java 11 Requirement](#java-11-requirement)<br/>
1414
* [Javadocs](#javadocs)<br/>
1515
* [Project Set Up](#project-set-up)<br/>
1616
* [Usage Examples](#usage-examples)<br/>
@@ -40,8 +40,8 @@ As of GitLab 11.0 support for the GitLab API v3 has been removed from the GitLab
4040
---
4141
## Using GitLab4J-API
4242

43-
### **Java 8 Requirement**
44-
As of GitLab4J-API 4.8.0, Java 8+ is now required to use GitLab4J-API.
43+
### **Java 11 Requirement**
44+
As of GitLab4J-API 6.0.0, Java 11+ is now required to use GitLab4J-API.
4545

4646
### **Javadocs**
4747
Javadocs are available here: [![javadoc.io](https://javadoc.io/badge2/org.gitlab4j/gitlab4j-api/javadoc.io.svg)](https://javadoc.io/doc/org.gitlab4j/gitlab4j-api)
@@ -53,7 +53,7 @@ To utilize GitLab4J&trade; API in your Java project, simply add the following de
5353
```java
5454
dependencies {
5555
...
56-
compile group: 'org.gitlab4j', name: 'gitlab4j-api', version: '5.1.0'
56+
compile group: 'org.gitlab4j', name: 'gitlab4j-api', version: '6.0.0'
5757
}
5858
```
5959

@@ -64,7 +64,7 @@ dependencies {
6464
<dependency>
6565
<groupId>org.gitlab4j</groupId>
6666
<artifactId>gitlab4j-api</artifactId>
67-
<version>5.1.0</version>
67+
<version>6.0.0</version>
6868
</dependency>
6969
```
7070

pom.xml

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>org.gitlab4j</groupId>
66
<artifactId>gitlab4j-api</artifactId>
77
<packaging>jar</packaging>
8-
<version>5.1.0</version>
8+
<version>6.0.0-SNAPSHOT</version>
99
<name>GitLab4J-API - GitLab API Java Client</name>
1010
<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>
1111
<url>https://github.com/gitlab4j/gitlab4j-api</url>
@@ -43,9 +43,9 @@
4343
</developers>
4444

4545
<properties>
46-
<java.level>8</java.level>
47-
<java.source.version>1.8</java.source.version>
48-
<java.target.version>1.8</java.target.version>
46+
<java.source.version>11</java.source.version>
47+
<java.target.version>11</java.target.version>
48+
<maven.compiler.release>11</maven.compiler.release>
4949

5050
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5151
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -258,7 +258,7 @@
258258
<configuration>
259259
<rules>
260260
<enforceBytecodeVersion>
261-
<maxJdkVersion>1.8</maxJdkVersion>
261+
<maxJdkVersion>11</maxJdkVersion>
262262
<ignoreClasses>
263263
<ignoreClass>module-info</ignoreClass>
264264
</ignoreClasses>
@@ -282,26 +282,6 @@
282282
</dependencies>
283283
</plugin>
284284

285-
<plugin>
286-
<groupId>org.codehaus.mojo</groupId>
287-
<artifactId>animal-sniffer-maven-plugin</artifactId>
288-
<version>1.20</version>
289-
<executions>
290-
<execution>
291-
<goals>
292-
<goal>check</goal>
293-
</goals>
294-
<id>check</id>
295-
</execution>
296-
</executions>
297-
<configuration>
298-
<signature>
299-
<groupId>org.codehaus.mojo.signature</groupId>
300-
<artifactId>java1${java.level}</artifactId>
301-
</signature>
302-
</configuration>
303-
</plugin>
304-
305285
<plugin>
306286
<groupId>io.fabric8</groupId>
307287
<artifactId>docker-maven-plugin</artifactId>

0 commit comments

Comments
 (0)