Commit eeb4f482 authored by 佳 邓's avatar 佳 邓
Browse files

change javax to jakarta

parent 0cb325a0
Pipeline #22436 failed with stages
in 3 seconds
......@@ -7,20 +7,22 @@
<groupId>org.gitlab4j</groupId>
<artifactId>gitlab4j-api</artifactId>
<packaging>jar</packaging>
<version>5.0.1</version>
<version>5.0.1.jakarta-SNAPSHOT</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>
<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
<id>gyqx</id>
<name>gyqx Releases Repository</name>
<url>http://spddev.cmic.com.cn/nexus/repository/maven-releases/</url>
</repository>
<snapshotRepository>
<id>gyqx-s</id>
<name>gyqx Snapshots Repository</name>
<url>http://spddev.cmic.com.cn/nexus/repository/maven-snapshots/</url>
</snapshotRepository>
</distributionManagement>
<licenses>
......@@ -45,9 +47,9 @@
</developers>
<properties>
<java.level>17</java.level>
<java.source.version>17</java.source.version>
<java.target.version>17</java.target.version>
<java.level>11</java.level>
<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>
......@@ -106,7 +108,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<version>3.8.1</version>
<configuration>
<source>${java.source.version}</source>
<target>${java.target.version}</target>
......@@ -152,9 +154,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<version>3.6.3</version>
<configuration>
<source>8</source>
<source>11</source>
</configuration>
<executions>
<execution>
......@@ -260,7 +262,7 @@
<configuration>
<rules>
<enforceBytecodeVersion>
<maxJdkVersion>1.8</maxJdkVersion>
<maxJdkVersion>11</maxJdkVersion>
<ignoreClasses>
<ignoreClass>module-info</ignoreClass>
</ignoreClasses>
......@@ -299,7 +301,8 @@
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
<artifactId>java1${java.level}</artifactId>
<artifactId>java18</artifactId>
<version>1.0</version>
</signature>
</configuration>
</plugin>
......@@ -332,22 +335,27 @@
<removeVolumes>true</removeVolumes>
</configuration>
<executions>
<execution>
<id>start</id>
<phase>pre-integration-test</phase>
<goals>
<goal>start</goal>
</goals>
</execution>
<execution>
<id>stop</id>
<phase>post-integration-test</phase>
<goals>
<goal>stop</goal>
</goals>
</execution>
<!-- <execution>-->
<!-- <id>start</id>-->
<!-- <phase>pre-integration-test</phase>-->
<!-- <goals>-->
<!-- <goal>start</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- <execution>-->
<!-- <id>stop</id>-->
<!-- <phase>post-integration-test</phase>-->
<!-- <goals>-->
<!-- <goal>stop</goal>-->
<!-- </goals>-->
<!-- </execution>-->
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
</plugin>
</plugins>
<pluginManagement>
......@@ -387,11 +395,11 @@
<dependencies>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>3.1.0</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>jakarta.ws.rs</groupId>-->
<!-- <artifactId>jakarta.ws.rs-api</artifactId>-->
<!-- <version>3.1.0</version>-->
<!-- </dependency>-->
<!-- javax.activation is present for Java 9+ compatibility -->
<dependency>
<groupId>jakarta.activation</groupId>
......@@ -469,6 +477,7 @@
<version>1.0</version>
<type>signature</type>
</dependency>
</dependencies>
</dependencyManagement>
......
......@@ -465,7 +465,7 @@ public class GitLabApi implements AutoCloseable {
}
/**
* Close the underlying {@link javax.ws.rs.client.Client} and its associated resources.
* Close the underlying {@link jakarta.ws.rs.client.Client} and its associated resources.
*/
@Override
public void close() {
......
......@@ -1221,6 +1221,7 @@ public class UserApi extends AbstractApi {
* <pre><code>GitLab Endpoint: GET /user/gpg_keys</code></pre>
*
* @throws GitLabApiException if any exception occurs
* @return list
*/
public List<GpgKey> listGpgKeys() throws GitLabApiException {
Response response = get(Response.Status.OK, null, "user", "gpg_keys");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment