Skip to content

Commit

Permalink
Update version to snapshot (#450)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
manovotn authored Sep 16, 2020
1 parent 5c59e42 commit cd062b4
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 20 deletions.
17 changes: 4 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/jakarta/enterprise/util/Nonbinding.java
Original file line number Diff line number Diff line change
Expand Up @@ -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>
*
Expand Down
4 changes: 2 additions & 2 deletions api/src/main/javadoc/overview.html
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
43 changes: 42 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
2 changes: 1 addition & 1 deletion spec/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit cd062b4

Please sign in to comment.