Skip to content

Commit

Permalink
#53 Update references to Jakarta and update poms
Browse files Browse the repository at this point in the history
  • Loading branch information
@arjantijms
arjantijms committed Feb 13, 2020
1 parent f72a88a commit 95f5b09
Show file tree
Hide file tree
Showing 6 changed files with 81 additions and 70 deletions.
83 changes: 34 additions & 49 deletions api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,11 @@
</issueManagement>

<properties>
<non.final>false</non.final>
<extension.name>jakarta.interceptor</extension.name>
<spec.version>2.0</spec.version>
<findbugs.version>3.0.1</findbugs.version>
<findbugs.exclude>exclude.xml</findbugs.exclude>
<findbugs.threshold>Low</findbugs.threshold>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>

<dependencies>
Expand Down Expand Up @@ -120,13 +119,35 @@
</resource>
</resources>
<plugins>
<!-- Sets minimal Maven version to 3.5.4 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.5.4</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>

<!-- Restricts the Java version to 1.8 -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<version>3.8.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
<compilerArgument>-Xlint:unchecked</compilerArgument>
</configuration>
</plugin>
Expand All @@ -135,15 +156,12 @@
<plugin>
<groupId>org.glassfish.build</groupId>
<artifactId>spec-version-maven-plugin</artifactId>
<version>2.0</version>
<version>2.1</version>
<configuration>
<specMode>jakarta</specMode>
<spec>
<nonFinal>${non.final}</nonFinal>
<jarType>api</jarType>
<specVersion>${spec.version}</specVersion>
<specVersion>2.0</specVersion>
<specImplVersion>${project.version}</specImplVersion>
<apiPackage>${extension.name}</apiPackage>
<apiPackage>jakarta.interceptor</apiPackage>
</spec>
</configuration>
<executions>
Expand All @@ -160,7 +178,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>4.0.0</version>
<version>4.2.1</version>
<configuration>
<supportedProjectTypes>
<supportedProjectType>jar</supportedProjectType>
Expand Down Expand Up @@ -261,39 +279,6 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>${findbugs.version}</version>
<configuration>
<threshold>${findbugs.threshold}</threshold>
<excludeFilterFile>${findbugs.exclude}</excludeFilterFile>
<findbugsXmlOutput>true</findbugsXmlOutput>
<findbugsXmlWithMessages>true</findbugsXmlWithMessages>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.7.1</version>
<configuration>
<reporting>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>${findbugs.version}</version>
<configuration>
<threshold>${findbugs.threshold}</threshold>
<excludeFilterFile>${findbugs.exclude}</excludeFilterFile>
</configuration>
</plugin>
</plugins>
</reporting>
</configuration>
</plugin>
</plugins>
</build>
</project>
6 changes: 3 additions & 3 deletions api/src/main/java/jakarta/interceptor/Interceptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
/**
* <p>
* Priorities that define the order in which interceptors are invoked. These values are intended to be used with the
* {@link javax.annotation.Priority Priority} annotation for interceptors that are defined by means of interceptor
* {@link jakarta.annotation.Priority Priority} annotation for interceptors that are defined by means of interceptor
* binding.
*
* <p>
Expand Down Expand Up @@ -92,10 +92,10 @@
* public class ValidationInterceptor { ... }
* </pre>
*
* The {@link javax.annotation.Priority Priority} annotation is ignored when computing the invocation order of
* The {@link jakarta.annotation.Priority Priority} annotation is ignored when computing the invocation order of
* interceptors bound to a target using the {@link Interceptors Interceptors} annotation.
*
* @see javax.annotation.Priority
* @see jakarta.annotation.Priority
*
* @since Jakarta Interceptors 1.2
*/
Expand Down
4 changes: 2 additions & 2 deletions api/src/main/java/jakarta/interceptor/InvocationContext.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ public interface InvocationContext {

/**
* Returns the timer object associated with a timeout method invocation on the target class, or a null value for
* interceptor method types other than {@link AroundTimeout}. For example, when associated with an Jakarta Enterprise
* Beans component timeout, this method returns {@code javax.ejb.Timer}.
* interceptor method types other than {@link AroundTimeout}. For example, when associated with a Jakarta Enterprise
* Beans component timeout, this method returns {@code jakarta.ejb.Timer}.
*
* @return the timer object or a null value
*
Expand Down
18 changes: 9 additions & 9 deletions api/src/main/java/jakarta/interceptor/package.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,19 @@ <h3>Interceptor methods</h3>
<li> {@link jakarta.interceptor.AroundTimeout} interceptor methods,
which interpose on the invocation of timeout methods, in response to timer events.</li>

<li> {@link javax.annotation.PostConstruct} interceptor methods, which are invoked
<li> {@link jakarta.annotation.PostConstruct} interceptor methods, which are invoked
after dependency injection has been completed on the target instance.</li>

<li> {@link javax.annotation.PreDestroy} interceptor methods, which are invoked
<li> {@link jakarta.annotation.PreDestroy} interceptor methods, which are invoked
before the target instance and all interceptor instances associated with it are
destroyed.</li>

<li> {@link jakarta.interceptor.AroundConstruct} interceptor methods, which interpose
on the invocation of the constructor of the target instance.</li>
</ul>

{@link javax.annotation.PostConstruct}, {@link
javax.annotation.PreDestroy}, and {@link
{@link jakarta.annotation.PostConstruct}, {@link
jakarta.annotation.PreDestroy}, and {@link
AroundConstruct} interceptor methods are
collectively referred to as lifecycle callback interceptor methods.

Expand All @@ -74,8 +74,8 @@ <h3>Interceptor methods</h3>
<p>An interceptor class or target class may have multiple interceptor methods. However,
an interceptor class or target class may have no more than one interceptor method of a
given interceptor method type: {@link jakarta.interceptor.AroundInvoke},
{@link jakarta.interceptor.AroundTimeout}, {@link javax.annotation.PostConstruct},
{@link javax.annotation.PreDestroy}, {@link jakarta.interceptor.AroundConstruct}.</p>
{@link jakarta.interceptor.AroundTimeout}, {@link jakarta.annotation.PostConstruct},
{@link jakarta.annotation.PreDestroy}, {@link jakarta.interceptor.AroundConstruct}.</p>

<h3>Interceptor classes</h3>

Expand Down Expand Up @@ -154,11 +154,11 @@ <h3>Interceptor lifecycle</h3>
no interceptor methods are invoked until after dependency injection has been
completed on both the interceptor instances and the target instance.</p>

<p>{@link javax.annotation.PostConstruct} interceptor methods, if any, are invoked after
<p>{@link jakarta.annotation.PostConstruct} interceptor methods, if any, are invoked after
dependency injection has taken place on both the interceptor instances and the target
instance.</p>

<p>{@link javax.annotation.PreDestroy} interceptor methods, if any, are
<p>{@link jakarta.annotation.PreDestroy} interceptor methods, if any, are
invoked before the target instance and all interceptor instances associated with it are
destroyed.</p>

Expand All @@ -181,7 +181,7 @@ <h3>Interceptor lifecycle</h3>
method after the {@link jakarta.interceptor.InvocationContext#proceed InvocationContext.proceed()} completes.</li>
<li>Dependency injection on the target instance is not completed until after invocations
of all interceptor methods in the {@link jakarta.interceptor.AroundConstruct} interceptor chain complete successfully.
<li>The {@link javax.annotation.PostConstruct} lifecycle callback chain for the
<li>The {@link jakarta.annotation.PostConstruct} lifecycle callback chain for the
target instance, if any, will be invoked after dependency injection has been completed
on the target instance.</li>
<li>An {@link jakarta.interceptor.AroundConstruct} lifecycle callback interceptor
Expand Down
26 changes: 26 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,30 @@
<findbugs.exclude>exclude.xml</findbugs.exclude>
<findbugs.threshold>Low</findbugs.threshold>
</properties>

<build>
<plugins>
<!-- Sets minimal Maven version to 3.5.4 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.5.4</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
14 changes: 7 additions & 7 deletions spec/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
<properties>
<site.output.dir>${project.build.directory}/staging</site.output.dir>
<maven.site.skip>true</maven.site.skip>
<asciidoctor.maven.plugin.version>1.5.7.1</asciidoctor.maven.plugin.version>
<asciidoctorj.version>1.6.2</asciidoctorj.version>
<asciidoctorj.pdf.version>1.5.0-alpha.16</asciidoctorj.pdf.version>
<jruby.version>9.2.6.0</jruby.version>
<asciidoctor.maven.plugin.version>2.0.0-RC.1</asciidoctor.maven.plugin.version>
<asciidoctorj.version>2.2.0</asciidoctorj.version>
<asciidoctorj.pdf.version>1.5.0</asciidoctorj.pdf.version>
<jruby.version>9.2.9.0</jruby.version>
<!-- status: DRAFT, BETA, etc., or blank for final -->
<status>DRAFT</status>
<maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format>
Expand Down Expand Up @@ -133,7 +133,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.2</version>
<version>3.0.0-M1</version>
<configuration>
<mavenExecutorId>forked-path</mavenExecutorId>
<useReleaseProfile>false</useReleaseProfile>
Expand All @@ -143,7 +143,7 @@
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>1.9.4</version>
<version>1.11.2</version>
</dependency>
</dependencies>
</plugin>
Expand All @@ -154,7 +154,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.1</version>
<version>3.2.0</version>
<inherited>false</inherited>
<executions>
<execution>
Expand Down

0 comments on commit 95f5b09

Please sign in to comment.