-
Notifications
You must be signed in to change notification settings - Fork 125
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1225 from jamezp/update-master
fast track: Update main with missing commits
- Loading branch information
Showing
27 changed files
with
755 additions
and
848 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. | ||
| Copyright (c) 2011, 2024 Oracle and/or its affiliates. All rights reserved. | ||
| This program and the accompanying materials are made available under the | ||
| terms of the Eclipse Distribution License v. 1.0, which is available at | ||
|
|
@@ -22,198 +22,14 @@ | |
| <parent> | ||
| <groupId>jakarta.ws.rs</groupId> | ||
| <artifactId>all</artifactId> | ||
| <version>3.1.0</version> | ||
| <version>4.0.0-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <url>https://github.com/jax-rs/api</url> | ||
|
|
||
| <properties> | ||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
| <maven.compiler.release>11</maven.compiler.release> | ||
| <microprofile.config.version>3.0-RC1</microprofile.config.version> | ||
| <microprofile.config.version>3.0.3</microprofile.config.version> | ||
| </properties> | ||
|
|
||
| <organization> | ||
| <name>Eclipse Foundation</name> | ||
| <url>https://www.eclipse.org/org/foundation/</url> | ||
| </organization> | ||
|
|
||
| <issueManagement> | ||
| <system>Github</system> | ||
| <url>https://github.com/jax-rs/api/issues</url> | ||
| </issueManagement> | ||
|
|
||
| <mailingLists> | ||
| <mailingList> | ||
| <name>JAX-RS Discussion Group </name> | ||
| <archive>[email protected]</archive> | ||
| </mailingList> | ||
| </mailingLists> | ||
|
|
||
| <licenses> | ||
| <license> | ||
| <name>EDL 1.0</name> | ||
| <url>http://www.eclipse.org/org/documents/edl-v10.php</url> | ||
| <distribution>repo</distribution> | ||
| </license> | ||
| </licenses> | ||
|
|
||
| <scm> | ||
| <connection>scm:git:https://github.com/jax-rs/api.git</connection> | ||
| <developerConnection>scm:git:ssh://[email protected]:jax-rs/api.git</developerConnection> | ||
| <url>https://github.com/jax-rs/api</url> | ||
| </scm> | ||
|
|
||
| <developers> | ||
| <developer> | ||
| <id>developers</id> | ||
| <name>JAX-RS API Developers</name> | ||
| <email>[email protected]</email> | ||
| <url>https://github.com/jakartaee/rest/graphs/contributors</url> | ||
| </developer> | ||
| </developers> | ||
|
|
||
| <build> | ||
| <pluginManagement> | ||
| <plugins> | ||
| <plugin> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <version>3.8.1</version> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-jar-plugin</artifactId> | ||
| <version>3.2.0</version> | ||
| </plugin> | ||
| <plugin> | ||
| <!-- This plugin generates the buildNumber property used in maven-bundle-plugin --> | ||
| <groupId>org.codehaus.mojo</groupId> | ||
| <artifactId>buildnumber-maven-plugin</artifactId> | ||
| <version>1.4</version> | ||
| <configuration> | ||
| <format>{0,date,MM/dd/yyyy hh:mm aa}</format> | ||
| <items> | ||
| <item>timestamp</item> | ||
| </items> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <phase>validate</phase> | ||
| <goals> | ||
| <goal>create</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-javadoc-plugin</artifactId> | ||
| <version>3.3.0</version> | ||
| <configuration> | ||
| <doctitle>JAX-RS ${project.version} API Specification</doctitle> | ||
| <bottom> | ||
| <![CDATA[Copyright © 1996-2014, | ||
| <a href="http://www.oracle.com">Oracle</a> | ||
| and/or its affiliates. All Rights Reserved. | ||
| ]]> | ||
| </bottom> | ||
| <!--javaApiLinks> | ||
| <property> | ||
| <name>api_1.3</name> | ||
| <value>http://download.oracle.com/javase/1.3/docs/api/</value> | ||
| </property> | ||
| <property> | ||
| <name>api_1.4</name> | ||
| <value>http://download.oracle.com/javase/1.4.2/docs/api/</value> | ||
| </property> | ||
| <property> | ||
| <name>api_1.5</name> | ||
| <value>http://download.oracle.com/javase/1.5.0/docs/api/</value> | ||
| </property> | ||
| <property> | ||
| <name>api_1.6</name> | ||
| <value>http://download.oracle.com/javase/6/docs/api/</value> | ||
| </property> | ||
| </javaApiLinks--> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <id>attach-javadocs</id> | ||
| <goals> | ||
| <goal>jar</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-source-plugin</artifactId> | ||
| <version>3.2.1</version> | ||
| <executions> | ||
| <execution> | ||
| <id>attach-sources</id> | ||
| <goals> | ||
| <goal>jar-no-fork</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-jxr-plugin</artifactId> | ||
| <version>3.1.1</version> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>jxr</goal> | ||
| </goals> | ||
| <phase>validate</phase> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-checkstyle-plugin</artifactId> | ||
| <version>3.1.2</version> | ||
| <configuration> | ||
| <outputDirectory>${project.build.directory}/checkstyle</outputDirectory> | ||
| <outputFile>${project.build.directory}/checkstyle/checkstyle-result.xml</outputFile> | ||
| <configLocation>${basedir}/../etc/config/checkstyle.xml</configLocation> | ||
| <failsOnError>true</failsOnError> | ||
| </configuration> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>com.puppycrawl.tools</groupId> | ||
| <artifactId>checkstyle</artifactId> | ||
| <version>8.44</version> | ||
| </dependency> | ||
| </dependencies> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>checkstyle</goal> | ||
| </goals> | ||
| <phase>validate</phase> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.glassfish.copyright</groupId> | ||
| <artifactId>glassfish-copyright-maven-plugin</artifactId> | ||
| <version>1.39</version> | ||
| <configuration> | ||
| <excludeFile>${basedir}/../etc/config/copyright-exclude</excludeFile> | ||
| <!--svn|mercurial|git - defaults to svn--> | ||
| <scm>git</scm> | ||
| <!-- turn on/off debugging --> | ||
| <debug>false</debug> | ||
| <!-- skip files not under SCM--> | ||
| <scmOnly>true</scmOnly> | ||
| <!-- turn off warnings --> | ||
| <warn>true</warn> | ||
| <!-- for use with repair --> | ||
| <update>false</update> | ||
| <!-- check that year is correct --> | ||
| <ignoreYear>false</ignoreYear> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </pluginManagement> | ||
| <plugins> | ||
| <plugin> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
|
|
@@ -248,34 +64,19 @@ | |
| <version>${project.version}</version> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>jakarta.xml.bind</groupId> | ||
| <artifactId>jakarta.xml.bind-api</artifactId> | ||
| <version>3.0.1</version> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>jakarta.enterprise</groupId> | ||
| <artifactId>jakarta.enterprise.cdi-api</artifactId> | ||
| <version>3.0.0</version> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>jakarta.enterprise.concurrent</groupId> | ||
| <artifactId>jakarta.enterprise.concurrent-api</artifactId> | ||
| <version>2.0.0</version> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>jakarta.ejb</groupId> | ||
| <artifactId>jakarta.ejb-api</artifactId> | ||
| <version>4.0.0</version> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>jakarta.validation</groupId> | ||
| <artifactId>jakarta.validation-api</artifactId> | ||
| <version>3.0.0</version> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
|
|
||
43 changes: 0 additions & 43 deletions
43
examples/src/main/java/jaxrs/examples/async/LongRunningEjbResource.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.