diff --git a/.travis.yml b/.travis.yml index a83fcfd2d..fb87232fe 100644 --- 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 \ No newline at end of file + - $HOME/.m2/repository \ No newline at end of file diff --git a/api/pom.xml b/api/pom.xml index 1c7fce916..fb9a44f16 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ jakarta.enterprise jakarta.enterprise.cdi-parent - 3.0.0 + 3.0.0-SNAPSHOT jakarta.enterprise.cdi-api @@ -139,6 +139,7 @@ 1.8 1.8 2.5.4 + 3.2.0 2.22.0 UTF-8 @@ -365,6 +366,7 @@ org.apache.maven.plugins maven-javadoc-plugin + ${maven-javadoc-plugin} true Jakarta Context Dependency Injection API diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/Interceptor.java b/api/src/main/java/jakarta/enterprise/inject/spi/Interceptor.java index 84eb15c62..f11b3a141 100644 --- 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 @@ /** *

- * Represents an enabled {@linkplain jakarta.interceptor interceptor}. + * Represents an enabled {@linkplain jakarta.interceptor.Interceptor interceptor}. *

*

* 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 index b69168a2c..e2e10c3aa 100644 --- a/api/src/main/java/jakarta/enterprise/util/Nonbinding.java +++ b/api/src/main/java/jakarta/enterprise/util/Nonbinding.java @@ -26,7 +26,7 @@ /** *

* 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. *

* diff --git a/api/src/main/javadoc/overview.html b/api/src/main/javadoc/overview.html index 33efac162..5d2bd3e3f 100644 --- a/api/src/main/javadoc/overview.html +++ b/api/src/main/javadoc/overview.html @@ -26,8 +26,8 @@ within a JSF or JSP page
  • The ability to {@linkplain jakarta.decorator decorate} injected beans
  • -
  • The ability to associate -{@linkplain jakarta.interceptor interceptors} with beans via typesafe +
  • The ability to associate +{@code jakarta.interceptor.Interceptor} with beans via typesafe {@linkplain jakarta.enterprise.inject interceptor bindings}
  • An {@linkplain jakarta.enterprise.event event} notification model
  • A web {@linkplain jakarta.enterprise.context.ConversationScoped diff --git a/pom.xml b/pom.xml index cb9489f7c..bece7672a 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ jakarta.enterprise jakarta.enterprise.cdi-parent pom - 3.0.0 + 3.0.0-SNAPSHOT Parent module for CDI Specification @@ -31,4 +31,45 @@ clean package + + https://jakarta.oss.sonatype.org/ + ${sonatypeOssDistMgmtNexusUrl}content/repositories/staging/ + + + + + + staging + + false + + + + sonatype-nexus-staging + Sonatype Nexus Staging + ${sonatypeOssDistMgmtStagingUrl} + + true + + + false + + + + + + sonatype-nexus-staging + Sonatype Nexus Staging + ${sonatypeOssDistMgmtStagingUrl} + + true + + + false + + + + + + diff --git a/spec/pom.xml b/spec/pom.xml index 4fc2ba9cd..9ffd9b9ff 100644 --- a/spec/pom.xml +++ b/spec/pom.xml @@ -5,7 +5,7 @@ jakarta.enterprise jakarta.enterprise.cdi-parent - 3.0.0 + 3.0.0-SNAPSHOT jakarta.enterprise.cdi-spec-doc