Updates in preparation for 3.1.0 release (#1049) * Updates in preparation for release. Signed-off-by: Santiago Pericasgeertsen <santiago.pericasgeertsen@oracle.com> * Changed Jenkins build steps and updated main pom. Signed-off-by: Santiago Pericasgeertsen <santiago.pericasgeertsen@oracle.com>
diff --git a/Jenkinsfile b/Jenkinsfile index be42d9b..83face7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile
@@ -14,21 +14,11 @@ stage('Nightly Build') { when { anyOf { - branch 'EE4J_8' branch 'master' } } steps { - dir ('jaxrs-api') { - sh "$MVN deploy" - } - dir ('examples') { - sh "$MVN deploy" - } - dir ('jaxrs-spec') { - sh "$MVN deploy" - } - dir ('jaxrs-tck') { + dir ('.') { sh "$MVN deploy" } }
diff --git a/examples/pom.xml b/examples/pom.xml index 67e51b0..eb4ed87 100644 --- a/examples/pom.xml +++ b/examples/pom.xml
@@ -22,7 +22,7 @@ <parent> <groupId>jakarta.ws.rs</groupId> <artifactId>all</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1.0</version> </parent> <url>https://github.com/jax-rs/api</url> @@ -245,7 +245,7 @@ <dependency> <groupId>jakarta.ws.rs</groupId> <artifactId>jakarta.ws.rs-api</artifactId> - <version>3.1-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency>
diff --git a/jaxrs-api/pom.xml b/jaxrs-api/pom.xml index 16723bb..530269d 100644 --- a/jaxrs-api/pom.xml +++ b/jaxrs-api/pom.xml
@@ -28,7 +28,7 @@ <parent> <groupId>jakarta.ws.rs</groupId> <artifactId>all</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1.0</version> </parent> <url>https://github.com/eclipse-ee4j/jaxrs-api</url>
diff --git a/jaxrs-spec/README.md b/jaxrs-spec/README.md index 2c38dda..6dccecc 100644 --- a/jaxrs-spec/README.md +++ b/jaxrs-spec/README.md
@@ -8,15 +8,15 @@ Prerequisites: -* JDK8+ -* Maven 3.0.3+ +* JDK 11+ +* Maven 3.6.3+ Run the full build: `mvn install` Locate the html files: -- target/generated-docs/RESTfulWebServices.html +- target/generated-docs/spec.html Locate the PDF files: -- target/generated-docs/RESTfulWebServices.pdf +- target/generated-docs/spec.pdf
diff --git a/jaxrs-spec/pom.xml b/jaxrs-spec/pom.xml index 35ba002..050d7eb 100644 --- a/jaxrs-spec/pom.xml +++ b/jaxrs-spec/pom.xml
@@ -27,7 +27,7 @@ <parent> <groupId>jakarta.ws.rs</groupId> <artifactId>all</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1.0</version> </parent> <properties> @@ -38,7 +38,7 @@ <asciidoctorj.pdf.version>1.6.0</asciidoctorj.pdf.version> <jruby.version>9.2.19.0</jruby.version> <!-- status: DRAFT, BETA, etc., or blank for final --> - <status>DRAFT</status> + <status></status> <maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format> <revisiondate>${maven.build.timestamp}</revisiondate> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -81,6 +81,7 @@ </dependency> </dependencies> <configuration> + <sourceDirectory>src/main/asciidoc</sourceDirectory> <logHandler> <failIf> <severity>ERROR</severity>
diff --git a/jaxrs-spec/src/main/asciidoc/chapters/introduction/_status.adoc b/jaxrs-spec/src/main/asciidoc/chapters/introduction/_status.adoc index e5d67bd..f905fc2 100644 --- a/jaxrs-spec/src/main/asciidoc/chapters/introduction/_status.adoc +++ b/jaxrs-spec/src/main/asciidoc/chapters/introduction/_status.adoc
@@ -11,7 +11,7 @@ [[status]] === Status -This is a draft of version 3.1. The issue tracking system for +This is the final release of version 3.1. The issue tracking system for this release can be found at: https://github.com/eclipse-ee4j/jaxrs-api/issues
diff --git a/jaxrs-spec/src/main/asciidoc/chapters/license/_license-efsl.adoc b/jaxrs-spec/src/main/asciidoc/chapters/license/_license-efsl.adoc index 63bcdd7..38b94ac 100644 --- a/jaxrs-spec/src/main/asciidoc/chapters/license/_license-efsl.adoc +++ b/jaxrs-spec/src/main/asciidoc/chapters/license/_license-efsl.adoc
@@ -25,7 +25,7 @@ .... == Copyright -Copyright (c) 2018, 2020 Eclipse Foundation. +Copyright (c) 2018, 2021 Eclipse Foundation. https://www.eclipse.org/legal/efsl.php[] === Eclipse Foundation Specification License
diff --git a/jaxrs-tck/pom.xml b/jaxrs-tck/pom.xml index ecc0faf..17b94cf 100644 --- a/jaxrs-tck/pom.xml +++ b/jaxrs-tck/pom.xml
@@ -26,7 +26,7 @@ <parent> <groupId>jakarta.ws.rs</groupId> <artifactId>all</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1.0</version> </parent> <name>Jakarta RESTful WS TCK</name> @@ -105,7 +105,7 @@ <dependency> <groupId>jakarta.ws.rs</groupId> <artifactId>jakarta.ws.rs-api</artifactId> - <version>3.1-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency>
diff --git a/jersey-tck/pom.xml b/jersey-tck/pom.xml index 8f10525..67f39de 100644 --- a/jersey-tck/pom.xml +++ b/jersey-tck/pom.xml
@@ -5,7 +5,7 @@ <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-tck</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1.0</version> <packaging>pom</packaging> <name>Jakarta RESTful WS Compliance</name> @@ -63,7 +63,7 @@ <dependency> <groupId>jakarta.ws.rs</groupId> <artifactId>jakarta.ws.rs-tck</artifactId> - <version>3.1-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency>
diff --git a/pom.xml b/pom.xml index f147599..066ceff 100644 --- a/pom.xml +++ b/pom.xml
@@ -17,7 +17,7 @@ <groupId>jakarta.ws.rs</groupId> <artifactId>all</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1.0</version> <packaging>pom</packaging> <name>Jakarta RESTful WS Project</name> @@ -33,6 +33,5 @@ <module>jaxrs-spec</module> <module>jaxrs-tck</module> <module>examples</module> - <module>jersey-tck</module> </modules> </project>