Cleanup of pom files to use dependency management and dependency plugins to avoid repetition. Signed-off-by: James R. Perkins <jperkins@redhat.com>
diff --git a/.github/workflows/maven-package.yml b/.github/workflows/maven-package.yml index b3bfa85..a70f370 100644 --- a/.github/workflows/maven-package.yml +++ b/.github/workflows/maven-package.yml
@@ -13,7 +13,7 @@ runs-on: ubuntu-latest strategy: matrix: - java: [ '11', '17' ] + java: ['17', '21' ] steps: - uses: actions/checkout@v4
diff --git a/etc/config/checkstyle.xml b/etc/config/checkstyle.xml index 254bc1b..0eb5f57 100644 --- a/etc/config/checkstyle.xml +++ b/etc/config/checkstyle.xml
@@ -92,7 +92,6 @@ <!-- See http://checkstyle.sf.net/config_javadoc.html --> <module name="JavadocMethod"> - <property name="accessModifiers" value="protected"/> <property name="validateThrows" value="false"/> </module>
diff --git a/examples/pom.xml b/examples/pom.xml index 3951cdb..b06d578 100644 --- a/examples/pom.xml +++ b/examples/pom.xml
@@ -25,195 +25,11 @@ <version>3.2.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>jaxrs-spec@javaee.groups.io</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://git@github.com: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>jaxrs-dev@eclipse.org</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> @@ -249,33 +65,18 @@ </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>
diff --git a/examples/src/main/java/jaxrs/examples/async/LongRunningEjbResource.java b/examples/src/main/java/jaxrs/examples/async/LongRunningEjbResource.java deleted file mode 100644 index 02a9f35..0000000 --- a/examples/src/main/java/jaxrs/examples/async/LongRunningEjbResource.java +++ /dev/null
@@ -1,43 +0,0 @@ -/* - * Copyright (c) 2012, 2020 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 - * http://www.eclipse.org/org/documents/edl-v10.php. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -package jaxrs.examples.async; - -import jakarta.ejb.Asynchronous; -import jakarta.ejb.Stateless; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.container.AsyncResponse; -import jakarta.ws.rs.container.Suspended; - -/** - * Example of a long running EJB resource. - * - * @author Marek Potociar - */ -@Stateless -@Path("/") -public class LongRunningEjbResource { - @GET - @Asynchronous - public void longRunningOperation(@Suspended AsyncResponse ar) { - final String result = executeLongRunningOperation(); - ar.resume(result); - } - - private String executeLongRunningOperation() { - try { - Thread.sleep(10000); - } catch (InterruptedException e) { - e.printStackTrace(); - } - return "done"; - } -}
diff --git a/examples/src/main/java/jaxrs/examples/client/BasicExamples.java b/examples/src/main/java/jaxrs/examples/client/BasicExamples.java index 2ee485e..88364e3 100644 --- a/examples/src/main/java/jaxrs/examples/client/BasicExamples.java +++ b/examples/src/main/java/jaxrs/examples/client/BasicExamples.java
@@ -41,7 +41,6 @@ import jakarta.ws.rs.ext.ReaderInterceptorContext; import jakarta.ws.rs.ext.WriterInterceptor; import jakarta.ws.rs.ext.WriterInterceptorContext; -import jakarta.xml.bind.annotation.XmlRootElement; import jaxrs.examples.client.custom.ThrottledClient; import static jakarta.ws.rs.client.Entity.form; @@ -59,7 +58,6 @@ /** * Customer bean. */ - @XmlRootElement public static class Customer { private final String name;
diff --git a/examples/src/main/java/jaxrs/examples/client/spec/SpecExamples.java b/examples/src/main/java/jaxrs/examples/client/spec/SpecExamples.java index bf79a37..2b04e37 100644 --- a/examples/src/main/java/jaxrs/examples/client/spec/SpecExamples.java +++ b/examples/src/main/java/jaxrs/examples/client/spec/SpecExamples.java
@@ -21,7 +21,6 @@ import jakarta.ws.rs.core.Response; import static jakarta.ws.rs.client.Entity.entity; -import jakarta.xml.bind.annotation.XmlRootElement; import jaxrs.examples.client.custom.ThrottledClient; /** @@ -33,7 +32,6 @@ /** * Customer bean. */ - @XmlRootElement public static class Customer { private final String name;
diff --git a/examples/src/main/java/jaxrs/examples/link/clusterservice/Cluster.java b/examples/src/main/java/jaxrs/examples/link/clusterservice/Cluster.java index cba1196..1c067d0 100644 --- a/examples/src/main/java/jaxrs/examples/link/clusterservice/Cluster.java +++ b/examples/src/main/java/jaxrs/examples/link/clusterservice/Cluster.java
@@ -13,14 +13,11 @@ import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.annotation.XmlRootElement; - /** * Cluster class. * * @author Santiago.Pericas-Geertsen@oracle.com */ -@XmlRootElement public class Cluster { enum Status {
diff --git a/examples/src/main/java/jaxrs/examples/link/clusterservice/Machine.java b/examples/src/main/java/jaxrs/examples/link/clusterservice/Machine.java index 12b5a57..ee5f9a6 100644 --- a/examples/src/main/java/jaxrs/examples/link/clusterservice/Machine.java +++ b/examples/src/main/java/jaxrs/examples/link/clusterservice/Machine.java
@@ -10,14 +10,11 @@ package jaxrs.examples.link.clusterservice; -import jakarta.xml.bind.annotation.XmlRootElement; - /** * Machine class. * * @author Santiago.Pericas-Geertsen@oracle.com */ -@XmlRootElement public class Machine { enum Status {
diff --git a/jaxrs-api/pom.xml b/jaxrs-api/pom.xml index 897207a..b91280e 100644 --- a/jaxrs-api/pom.xml +++ b/jaxrs-api/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2011, 2022 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 Public License v. 2.0, which is available at @@ -31,279 +31,8 @@ <version>3.2.0-SNAPSHOT</version> </parent> - <url>https://github.com/jakartaee/rest</url> - - <organization> - <name>Eclipse Foundation</name> - <url>https://www.eclipse.org/org/foundation/</url> - </organization> - - <developers> - <developer> - <id>developers</id> - <name>JAX-RS API Developers</name> - <email>jaxrs-dev@eclipse.org</email> - <url>https://github.com/jakartaee/rest/graphs/contributors</url> - </developer> - </developers> - - <issueManagement> - <system>Github</system> - <url>https://github.com/jakartaee/rest/issues</url> - </issueManagement> - - <mailingLists> - <mailingList> - <name>JAX-RS Developer Discussions</name> - <archive>jaxrs-dev@eclipse.org</archive> - </mailingList> - </mailingLists> - - <licenses> - <license> - <name>EPL-2.0</name> - <url>http://www.eclipse.org/legal/epl-2.0</url> - <distribution>repo</distribution> - </license> - <license> - <name>GPL-2.0-with-classpath-exception</name> - <url>https://www.gnu.org/software/classpath/license.html</url> - <distribution>repo</distribution> - </license> - </licenses> - - <scm> - <connection>scm:git:https://github.com/jakartaee/rest</connection> - <url>https://github.com/jakartaee/rest</url> - <tag>HEAD</tag> - </scm> - - <profiles> - <profile> - <!-- Use it with release-perform goal to skip another test run. --> - <id>skip-tests</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <skip.release.tests>true</skip.release.tests> - </properties> - </profile> - </profiles> - <build> <finalName>${project.artifactId}</finalName> - <pluginManagement> - <plugins> - <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> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>${maven.bundle.plugin.version}</version> - <extensions>true</extensions> - <configuration> - <instructions> - <_failok>true</_failok> - <Build-Id>${buildNumber}</Build-Id> - <Bundle-Description>Jakarta RESTful Web Services API (JAX-RS)</Bundle-Description> - <Bundle-Version>${project.version}</Bundle-Version> - <Bundle-SymbolicName>jakarta.ws.rs-api</Bundle-SymbolicName> - <DynamicImport-Package>*</DynamicImport-Package> - <Extension-Name>${api.package}</Extension-Name> - <Implementation-Version>${project.version}</Implementation-Version> - <Specification-Version>${spec.version}</Specification-Version> - <Specification-Vendor>Eclipse Foundation</Specification-Vendor> - <specversion>${spec.version}</specversion> - <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy> - <_nodefaultversion>false</_nodefaultversion> - <Require-Capability>osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"</Require-Capability> - </instructions> - </configuration> - <executions> - <execution> - <id>osgi-bundle</id> - <phase>package</phase> - <goals> - <goal>bundle</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${maven.javadoc.plugin.version}</version> - <configuration> - <source>8</source> - <doctitle>${apidocs.title}</doctitle> - <docfilessubdirs>true</docfilessubdirs> - <bottom> - <![CDATA[<p align="left">Copyright © 2018, 2020 Eclipse Foundation.<br>Use is subject to <a href="{@docRoot}/resources/EFSL.html" target="_top">license terms</a>.]]> - </bottom> - <docfilessubdirs>true</docfilessubdirs> - <!--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--> - <sourceFileExcludes> - <fileExclude>module-info.java</fileExclude> - </sourceFileExcludes> - </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> - <!-- Adding files to jar--> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>3.2.0</version> - <executions> - <execution> - <id>add-legal-resource</id> - <phase>generate-resources</phase> - <goals> - <goal>add-resource</goal> - </goals> - <configuration> - <resources> - <resource> - <directory>${legal.doc.folder}</directory> - <includes> - <include>NOTICE.md</include> - <include>LICENSE.md</include> - </includes> - <targetPath>META-INF</targetPath> - </resource> - </resources> - </configuration> - </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> - <excludes>**/module-info.java</excludes> - <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> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <version>${maven.surefire.plugin.version}</version> - <configuration> - <argLine>--add-modules jakarta.xml.bind</argLine> - </configuration> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>${maven.compiler.plugin.version}</version> - </plugin> - </plugins> - </pluginManagement> <plugins> <plugin> <groupId>org.apache.felix</groupId> @@ -332,6 +61,15 @@ <artifactId>maven-checkstyle-plugin</artifactId> </plugin> <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemPropertyVariables> + <!-- Workaround for https://github.com/mockito/mockito/issues/3121 --> + <net.bytebuddy.experimental>true</net.bytebuddy.experimental> + </systemPropertyVariables> + </configuration> + </plugin> + <plugin> <groupId>org.glassfish.copyright</groupId> <artifactId>glassfish-copyright-maven-plugin</artifactId> </plugin> @@ -344,64 +82,95 @@ <dependencies> <dependency> - <groupId>jakarta.xml.bind</groupId> - <artifactId>jakarta.xml.bind-api</artifactId> - <version>${jaxb.api.version}</version> - <scope>provided</scope> - <optional>true</optional> - </dependency> - <dependency> <groupId>jakarta.activation</groupId> <artifactId>jakarta.activation-api</artifactId> - <version>${activation.api.version}</version> <scope>provided</scope> </dependency> <dependency> - <groupId>org.glassfish.jaxb</groupId> - <artifactId>jaxb-runtime</artifactId> - <version>${jaxb.impl.version}</version> - <scope>test</scope> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> + </dependency> + <dependency> + <groupId>jakarta.enterprise</groupId> + <artifactId>jakarta.enterprise.cdi-api</artifactId> + </dependency> + <dependency> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-api</artifactId> - <version>5.8.0-M1</version> + <scope>test</scope> + </dependency> + <!-- JAXB Implementation --> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>codemodel</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-jxc</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>txw2</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-xjc</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>xsom</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>com.sun.istack</groupId> + <artifactId>istack-commons-runtime</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.istack</groupId> + <artifactId>istack-commons-tools</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.xml.bind.external</groupId> + <artifactId>relaxng-datatype</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.xml.bind.external</groupId> + <artifactId>rngom</artifactId> + <scope>test</scope> + </dependency> + <!-- End JAXB Implementation --> + <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest</artifactId> - <version>2.2</version> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>3.11.1</version> <scope>test</scope> </dependency> </dependencies> - <properties> - <apidocs.title>Jakarta RESTful Web Services ${spec.version} API Specification ${spec.version.revision}</apidocs.title> - <java.version>11</java.version> - - <maven.bundle.plugin.version>5.1.2</maven.bundle.plugin.version> - <maven.compiler.plugin.version>3.10.1</maven.compiler.plugin.version> - <maven.compiler.release>${java.version}</maven.compiler.release> - <maven.javadoc.plugin.version>3.3.0</maven.javadoc.plugin.version> - <maven.surefire.plugin.version>3.0.0-M7</maven.surefire.plugin.version> - - <api.package>jakarta.ws.rs</api.package> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <skip.release.tests>false</skip.release.tests> - <spec.version>3.2</spec.version> - <spec.version.revision /> <!-- e.g. (Rev a) --> - - <jaxb.api.version>4.0.0</jaxb.api.version> - <jaxb.impl.version>4.0.0</jaxb.impl.version> - <activation.api.version>2.1.0</activation.api.version> - <legal.doc.folder>${project.basedir}/..</legal.doc.folder> - </properties> - </project>
diff --git a/jaxrs-spec/README.md b/jaxrs-spec/README.md index 6dccecc..6699c1e 100644 --- a/jaxrs-spec/README.md +++ b/jaxrs-spec/README.md
@@ -8,7 +8,7 @@ Prerequisites: -* JDK 11+ +* JDK 17+ * Maven 3.6.3+ Run the full build:
diff --git a/jaxrs-spec/pom.xml b/jaxrs-spec/pom.xml index 27c5046..b0ade07 100644 --- a/jaxrs-spec/pom.xml +++ b/jaxrs-spec/pom.xml
@@ -33,7 +33,6 @@ <properties> <site.output.dir>${project.build.directory}/staging</site.output.dir> <maven.site.skip>true</maven.site.skip> - <asciidoctor.maven.plugin.version>2.1.0</asciidoctor.maven.plugin.version> <asciidoctorj.version>2.5.1</asciidoctorj.version> <asciidoctorj.pdf.version>1.6.0</asciidoctorj.pdf.version> <jruby.version>9.2.19.0</jruby.version> @@ -44,25 +43,12 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> - <scm> - <connection>scm:git:https://github.com/jakartaee/rest</connection> - <url>https://github.com/jakartaee/rest</url> - <tag>HEAD</tag> - </scm> - - <distributionManagement> - <site> - <url>scm:git:https://github.com/jakartaee/rest</url> - </site> - </distributionManagement> - <build> <defaultGoal>package</defaultGoal> <plugins> <plugin> <groupId>org.asciidoctor</groupId> <artifactId>asciidoctor-maven-plugin</artifactId> - <version>${asciidoctor.maven.plugin.version}</version> <dependencies> <dependency> <groupId>org.jruby</groupId>
diff --git a/jaxrs-tck-docs/userguide/pom.xml b/jaxrs-tck-docs/userguide/pom.xml index 55301d7..7b6add6 100644 --- a/jaxrs-tck-docs/userguide/pom.xml +++ b/jaxrs-tck-docs/userguide/pom.xml
@@ -56,7 +56,6 @@ <defaultGoal>package</defaultGoal> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> <configuration> <filesets> @@ -70,7 +69,6 @@ </configuration> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <executions> <execution> @@ -81,8 +79,8 @@ <configuration> <rules> <requireJavaVersion> - <version>[11.0,)</version> - <message>You need JDK11 or newer</message> + <version>[17.0,)</version> + <message>You need JDK17 or newer</message> </requireJavaVersion> </rules> </configuration> @@ -172,7 +170,6 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-scm-publish-plugin</artifactId> <executions> <execution> @@ -194,7 +191,6 @@ <pluginManagement> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> <version>3.1.0</version> </plugin> @@ -204,17 +200,14 @@ <version>1.3</version> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>3.0.0-M3</version> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <version>3.3.0</version> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-scm-publish-plugin</artifactId> <version>3.1.0</version> </plugin>
diff --git a/jaxrs-tck/pom.xml b/jaxrs-tck/pom.xml index 75fbff2..1fd7cdd 100644 --- a/jaxrs-tck/pom.xml +++ b/jaxrs-tck/pom.xml
@@ -34,57 +34,109 @@ <version>3.2.0-SNAPSHOT</version> </parent> - <properties> - <maven.compiler.source>11</maven.compiler.source> - <maven.compiler.target>11</maven.compiler.target> - <junit.jupiter.version>[5.7.2, 5.8-A00)</junit.jupiter.version> - <tck.artifactId>jakarta-restful-ws-tck</tck.artifactId> - </properties> + <dependencies> + <dependency> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> + <version>${project.version}</version> + </dependency> - <organization> - <name>Eclipse Foundation</name> - <url>https://www.eclipse.org/org/foundation/</url> - </organization> + <dependency> + <groupId>jakarta.json.bind</groupId> + <artifactId>jakarta.json.bind-api</artifactId> + <version>2.0.0</version> + </dependency> - <developers> - <developer> - <id>developers</id> - <name>JAX-RS API Developers</name> - <email>jaxrs-dev@eclipse.org</email> - <url>https://github.com/jakartaee/rest/graphs/contributors</url> - </developer> - </developers> + <dependency> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-api</artifactId> + <version>2.0.1</version> + </dependency> - <issueManagement> - <system>Github</system> - <url>https://github.com/jakartaee/rest/issues</url> - </issueManagement> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> - <mailingLists> - <mailingList> - <name>JAX-RS Developer Discussions</name> - <archive>jaxrs-dev@eclipse.org</archive> - </mailingList> - </mailingLists> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + </dependency> - <licenses> - <license> - <name>EPL-2.0</name> - <url>http://www.eclipse.org/legal/epl-2.0</url> - <distribution>repo</distribution> - </license> - <license> - <name>GPL-2.0-with-classpath-exception</name> - <url>https://www.gnu.org/software/classpath/license.html</url> - <distribution>repo</distribution> - </license> - </licenses> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest</artifactId> + </dependency> - <scm> - <connection>scm:git:https://github.com/jakartaee/rest</connection> - <url>https://github.com/jakartaee/rest</url> - <tag>HEAD</tag> - </scm> + <dependency> + <groupId>org.jboss.arquillian.junit5</groupId> + <artifactId>arquillian-junit5-container</artifactId> + <version>1.8.0.Final</version> + </dependency> + + <dependency> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + </dependency> + + <dependency> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + </dependency> + + <dependency> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + </dependency> + + <dependency> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <version>6.0.0</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.netbeans.tools</groupId> + <artifactId>sigtest-maven-plugin</artifactId> + <version>1.4</version> + </dependency> + + <!-- Test Dependencies --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> <profiles> <profile> @@ -115,126 +167,5 @@ </plugins> </build> </profile> - - <profile> - <id>tck-build</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <version>3.0.0-M5</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>3.2.0</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - </build> - </profile> - - </profiles> - <dependencies> - <dependency> - <groupId>jakarta.ws.rs</groupId> - <artifactId>jakarta.ws.rs-api</artifactId> - <version>${project.parent.version}</version> - </dependency> - - <dependency> - <groupId>jakarta.json.bind</groupId> - <artifactId>jakarta.json.bind-api</artifactId> - <version>2.0.0</version> - </dependency> - - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-api</artifactId> - <version>2.0.1</version> - </dependency> - - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter</artifactId> - <version>${junit.jupiter.version}</version> - </dependency> - - <dependency> - <groupId>org.junit.platform</groupId> - <artifactId>junit-platform-launcher</artifactId> - <version>1.7.2</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - </dependency> - - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-library</artifactId> - <version>[2.2, 2.3-A00)</version> - </dependency> - - <dependency> - <groupId>org.jboss.arquillian.junit5</groupId> - <artifactId>arquillian-junit5-container</artifactId> - <version>1.7.0.Alpha10</version> - </dependency> - - <dependency> - <groupId>jakarta.annotation</groupId> - <artifactId>jakarta.annotation-api</artifactId> - <version>2.1.0-B1</version> - </dependency> - - <dependency> - <groupId>jakarta.xml.bind</groupId> - <artifactId>jakarta.xml.bind-api</artifactId> - <version>4.0.0-RC2</version> - </dependency> - - <dependency> - <groupId>jakarta.activation</groupId> - <artifactId>jakarta.activation-api</artifactId> - <version>2.1.0-RC1</version> - </dependency> - - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>5.0.0</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.netbeans.tools</groupId> - <artifactId>sigtest-maven-plugin</artifactId> - <version>1.4</version> - </dependency> - - </dependencies> </project> \ No newline at end of file
diff --git a/jersey-tck/pom.xml b/jersey-tck/pom.xml index 40ab972..b838f8b 100644 --- a/jersey-tck/pom.xml +++ b/jersey-tck/pom.xml
@@ -179,7 +179,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <version>3.2.0</version> <executions>
diff --git a/pom.xml b/pom.xml index 421dfd9..6ed12ee 100644 --- a/pom.xml +++ b/pom.xml
@@ -24,7 +24,7 @@ <parent> <groupId>org.eclipse.ee4j</groupId> <artifactId>project</artifactId> - <version>1.0.7</version> + <version>1.0.9</version> <relativePath/> </parent> @@ -34,7 +34,472 @@ <name>JAX-RS API Repository - Snapshots</name> <url>https://repo.eclipse.org/content/repositories/jax-rs-api-snapshots/</url> </snapshotRepository> - </distributionManagement> + </distributionManagement><url>https://github.com/eclipse-ee4j/jaxrs-api</url> + + <organization> + <name>Eclipse Foundation</name> + <url>https://www.eclipse.org/org/foundation/</url> + </organization> + + <developers> + <developer> + <id>developers</id> + <name>JAX-RS API Developers</name> + <email>jaxrs-dev@eclipse.org</email> + <url>https://github.com/eclipse-ee4j/jaxrs-api/graphs/contributors</url> + </developer> + </developers> + + <issueManagement> + <system>Github</system> + <url>https://github.com/eclipse-ee4j/jaxrs-api/issues</url> + </issueManagement> + + <mailingLists> + <mailingList> + <name>JAX-RS Developer Discussions</name> + <archive>jaxrs-dev@eclipse.org</archive> + </mailingList> + </mailingLists> + + <licenses> + <license> + <name>EPL-2.0</name> + <url>https://www.eclipse.org/legal/epl-2.0</url> + <distribution>repo</distribution> + </license> + <license> + <name>GPL-2.0-with-classpath-exception</name> + <url>https://www.gnu.org/software/classpath/license.html</url> + <distribution>repo</distribution> + </license> + </licenses> + + <scm> + <connection>scm:git:https://github.com/eclipse-ee4j/jaxrs-api</connection> + <url>https://github.com/eclipse-ee4j/jaxrs-api</url> + <tag>HEAD</tag> + </scm> + <properties> + <jdk.min.version>17</jdk.min.version> + <maven.compiler.release>17</maven.compiler.release> + + <apidocs.title>Jakarta RESTful Web Services ${spec.version} API Specification ${spec.version.revision}</apidocs.title> + <legal.doc.folder>${project.basedir}</legal.doc.folder> + + <maven.bundle.plugin.version>3.5.0</maven.bundle.plugin.version> + <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version> + <maven.javadoc.plugin.version>3.1.0</maven.javadoc.plugin.version> + + <api.package>jakarta.ws.rs</api.package> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <skip.release.tests>false</skip.release.tests> + <spec.version>3.2</spec.version> + <spec.version.revision /> <!-- e.g. (Rev a) --> + + <annotation.api.version>2.1.1</annotation.api.version> + <activation.api.version>2.0.0</activation.api.version> + <inject.api.version>2.0.0</inject.api.version> + <validation.api.version>3.0.0</validation.api.version> + <concurrent.api.version>2.0.0</concurrent.api.version> + <xml.binding.api.version>4.0.0</xml.binding.api.version> + <cdi.api.version>3.0.0</cdi.api.version> + <junit.version>5.8.2</junit.version> + <org.glassfish.jaxb.version>4.0.3</org.glassfish.jaxb.version> + <com.sun.istack.version>4.1.2</com.sun.istack.version> + <hamcrest.version>2.2</hamcrest.version> + <mockito.version>3.6.0</mockito.version> + </properties> + + <modules> + <module>jaxrs-api</module> + <module>examples</module> + <module>jaxrs-spec</module> + <module>jaxrs-tck</module> + </modules> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.junit</groupId> + <artifactId>junit-bom</artifactId> + <version>${junit.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + <version>${annotation.api.version}</version> + </dependency> + <dependency> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + <version>${activation.api.version}</version> + </dependency> + <dependency> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> + <version>${inject.api.version}</version> + </dependency> + <dependency> + <groupId>jakarta.enterprise</groupId> + <artifactId>jakarta.enterprise.cdi-api</artifactId> + <version>${cdi.api.version}</version> + </dependency> + <dependency> + <groupId>jakarta.validation</groupId> + <artifactId>jakarta.validation-api</artifactId> + <version>${validation.api.version}</version> + </dependency> + <dependency> + <groupId>jakarta.enterprise.concurrent</groupId> + <artifactId>jakarta.enterprise.concurrent-api</artifactId> + <version>${concurrent.api.version}</version> + </dependency> + <dependency> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <version>${xml.binding.api.version}</version> + </dependency> + <!-- JAXB Implementation --> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>codemodel</artifactId> + <version>${org.glassfish.jaxb.version}</version> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-core</artifactId> + <version>${org.glassfish.jaxb.version}</version> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-jxc</artifactId> + <version>${org.glassfish.jaxb.version}</version> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>${org.glassfish.jaxb.version}</version> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>txw2</artifactId> + <version>${org.glassfish.jaxb.version}</version> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-xjc</artifactId> + <version>${org.glassfish.jaxb.version}</version> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>xsom</artifactId> + <version>${org.glassfish.jaxb.version}</version> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>com.sun.istack</groupId> + <artifactId>istack-commons-runtime</artifactId> + <version>${com.sun.istack.version}</version> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.sun.istack</groupId> + <artifactId>istack-commons-tools</artifactId> + <version>${com.sun.istack.version}</version> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.sun.xml.bind.external</groupId> + <artifactId>relaxng-datatype</artifactId> + <version>${org.glassfish.jaxb.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind.external</groupId> + <artifactId>rngom</artifactId> + <version>${org.glassfish.jaxb.version}</version> + <exclusions> + <exclusion> + <groupId>relaxngDatatype</groupId> + <artifactId>relaxngDatatype</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.xml.bind.external</groupId> + <artifactId>relaxng-datatype</artifactId> + </exclusion> + </exclusions> + </dependency> + <!-- End JAXB Implementation --> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest</artifactId> + <version>${hamcrest.version}</version> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>${mockito.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + + <build> + <finalName>${project.artifactId}</finalName> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.11.0</version> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>3.3.0</version> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>3.2.5</version> + </plugin> + <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> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>${maven.bundle.plugin.version}</version> + <extensions>true</extensions> + <configuration> + <instructions> + <_failok>true</_failok> + <Build-Id>${buildNumber}</Build-Id> + <Bundle-Description>Jakarta RESTful Web Services API (JAX-RS)</Bundle-Description> + <Bundle-Version>${project.version}</Bundle-Version> + <Bundle-SymbolicName>jakarta.ws.rs-api</Bundle-SymbolicName> + <DynamicImport-Package>*</DynamicImport-Package> + <Extension-Name>${api.package}</Extension-Name> + <Implementation-Version>${project.version}</Implementation-Version> + <Specification-Version>${spec.version}</Specification-Version> + <Specification-Vendor>Eclipse Foundation</Specification-Vendor> + <specversion>${spec.version}</specversion> + <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy> + <_nodefaultversion>false</_nodefaultversion> + <Require-Capability>osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"</Require-Capability> + </instructions> + </configuration> + <executions> + <execution> + <id>osgi-bundle</id> + <phase>package</phase> + <goals> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${maven.javadoc.plugin.version}</version> + <configuration> + <doctitle>${apidocs.title}</doctitle> + <docfilessubdirs>true</docfilessubdirs> + <bottom> + <![CDATA[<p align="left">Copyright © 2018, 2024 Eclipse Foundation.<br>Use is subject to <a href="{@docRoot}/resources/EFSL.html" target="_top">license terms</a>.]]> + </bottom> + <docfilessubdirs>true</docfilessubdirs> + <sourceFileExcludes> + <fileExclude>module-info.java</fileExclude> + </sourceFileExcludes> + </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> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>3.2.0</version> + <executions> + <execution> + <id>add-legal-resource</id> + <phase>generate-resources</phase> + <goals> + <goal>add-resource</goal> + </goals> + <configuration> + <resources> + <resource> + <directory>${legal.doc.folder}</directory> + <includes> + <include>NOTICE.md</include> + <include>LICENSE.md</include> + </includes> + <targetPath>META-INF</targetPath> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.5</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> + <excludes>**/module-info.java</excludes> + </configuration> + <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-enforcer-plugin</artifactId> + <executions> + <execution> + <id>enforce-java-version</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <message>To build this project JDK ${jdk.min.version} (or greater) is required.</message> + <version>${jdk.min.version}</version> + </requireJavaVersion> + </rules> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> <profiles> <profile> @@ -48,20 +513,6 @@ </distributionManagement> </profile> <profile> - <id>dependentModules</id> - <activation> - <activeByDefault>true</activeByDefault> - <property> - <name>jaxrs.all.build</name> - </property> - </activation> - <modules> - <module>jaxrs-api</module> - <module>jaxrs-tck</module> - <module>examples</module> - </modules> - </profile> - <profile> <id>dependentSpecification</id> <activation> <property>