Update version to snapshot (#450)

* Update version to SNAPSHOT * Fix Travis build - use JDK 8 and 11, remove build notifications, always build javadoc * Travis - force javadoc build on PRs to verify that it works correctly. * Fix Javadoc build with JDK 11, define javadoc plugin version.
jakartaee · Sep 16, 2020 · cd062b4 · cd062b4
1 parent 5c59e42
commit cd062b4
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,20 +1,11 @@
 language: java
 sudo: false
-install: mvn -Pstaging install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
+install: mvn -Pstaging install -DskipTests=true -B -V
 script: mvn -Pstaging test -B
 jdk:
-  - oraclejdk8
+  - openjdk8
+  - openjdk11
 
 cache:
   directories:
-  - $HOME/.m2
-
-notifications:
-  email:
-    - cdi-dev@lists.jboss.org
-  irc:
-    channels:
-      - "chat.freenode.net#cdi-dev"
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: never     # options: [always|never|change] default: always
+  - $HOME/.m2/repository
diff --git a/api/pom.xml b/api/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>jakarta.enterprise</groupId>
 		<artifactId>jakarta.enterprise.cdi-parent</artifactId>
-		<version>3.0.0</version>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>jakarta.enterprise.cdi-api</artifactId>
@@ -139,6 +139,7 @@
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven-bundle-plugin.version>2.5.4</maven-bundle-plugin.version>
+		<maven-javadoc-plugin>3.2.0</maven-javadoc-plugin>
 		<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
@@ -365,6 +366,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>${maven-javadoc-plugin}</version>
 				<configuration>
 					<docfilessubdirs>true</docfilessubdirs>
 					<description>Jakarta Context Dependency Injection API</description>

diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/Interceptor.java b/api/src/main/java/jakarta/enterprise/inject/spi/Interceptor.java
@@ -24,7 +24,7 @@
 
 /**
  * <p>
- * Represents an enabled {@linkplain jakarta.interceptor interceptor}.
+ * Represents an enabled {@linkplain jakarta.interceptor.Interceptor interceptor}.
  * </p>
  * <p>
  * Since CDI 2.0, an implementation of this interface may implement {@link Prioritized} in order to enable the interceptor with

diff --git a/api/src/main/java/jakarta/enterprise/util/Nonbinding.java b/api/src/main/java/jakarta/enterprise/util/Nonbinding.java
@@ -26,7 +26,7 @@
 /**
  * <p>
  * Excludes a member of an annotation type (such as a {@linkplain jakarta.inject.Qualifier qualifier type} or
- * {@linkplain jakarta.interceptor interceptor binding type}) from consideration when the container compares two annotation
+ * {@linkplain jakarta.interceptor.InterceptorBinding interceptor binding type}) from consideration when the container compares two annotation
  * instances.
  * </p>
  *

diff --git a/api/src/main/javadoc/overview.html b/api/src/main/javadoc/overview.html
@@ -26,8 +26,8 @@
 within a JSF or JSP page</li>
 <li>The ability to {@linkplain jakarta.decorator decorate} injected 
 beans</li>
-<li>The ability to associate 
-{@linkplain jakarta.interceptor interceptors} with beans via typesafe
+<li>The ability to associate
+{@code jakarta.interceptor.Interceptor} with beans via typesafe
 {@linkplain jakarta.enterprise.inject interceptor bindings}</li>
 <li>An {@linkplain jakarta.enterprise.event event} notification model</li>
 <li>A web {@linkplain jakarta.enterprise.context.ConversationScoped

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 	<groupId>jakarta.enterprise</groupId>
 	<artifactId>jakarta.enterprise.cdi-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.0.0</version>
+	<version>3.0.0-SNAPSHOT</version>
 
 	<description>Parent module for CDI Specification</description>
 
@@ -31,4 +31,45 @@
 		<defaultGoal>clean package</defaultGoal>
 	</build>
 
+	<properties>
+		<sonatypeOssDistMgmtNexusUrl>https://jakarta.oss.sonatype.org/</sonatypeOssDistMgmtNexusUrl>
+		<sonatypeOssDistMgmtStagingUrl>${sonatypeOssDistMgmtNexusUrl}content/repositories/staging/</sonatypeOssDistMgmtStagingUrl>
+	</properties>
+
+	<profiles>
+		<!-- A profile that allows to consume staged but unreleased Jakarta artifacts -->
+		<profile>
+			<id>staging</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<repositories>
+				<repository>
+					<id>sonatype-nexus-staging</id>
+					<name>Sonatype Nexus Staging</name>
+					<url>${sonatypeOssDistMgmtStagingUrl}</url>
+					<releases>
+						<enabled>true</enabled>
+					</releases>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+			</repositories>
+			<pluginRepositories>
+				<pluginRepository>
+					<id>sonatype-nexus-staging</id>
+					<name>Sonatype Nexus Staging</name>
+					<url>${sonatypeOssDistMgmtStagingUrl}</url>
+					<releases>
+						<enabled>true</enabled>
+					</releases>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</pluginRepository>
+			</pluginRepositories>
+		</profile>
+	</profiles>
+
 </project>
diff --git a/spec/pom.xml b/spec/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>jakarta.enterprise</groupId>
 		<artifactId>jakarta.enterprise.cdi-parent</artifactId>
-		<version>3.0.0</version>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>jakarta.enterprise.cdi-spec-doc</artifactId>