Skip to content

Commit

Permalink
Remove unnecessary plugins and fix javadoc
Browse files Browse the repository at this point in the history 
* Fix javadoc errors

Signed-off-by: hussainnm <hussain.nm@cognizant.com>
  • Loading branch information
@hussainnm
hussainnm committed Mar 10, 2020
1 parent 79f3c50 commit 7151df1
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 84 deletions.
109 changes: 30 additions & 79 deletions api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.6</version>
<relativePath />
</parent>

<groupId>jakarta.ejb</groupId>
Expand All @@ -36,7 +37,7 @@
<findbugs.version>3.0.5</findbugs.version>
<findbugs.exclude>exclude.xml</findbugs.exclude>
<findbugs.threshold>Low</findbugs.threshold>
<legal.doc.source>.</legal.doc.source>
<legal.doc.source>../</legal.doc.source>
</properties>

<name>Jakarta Enterprise Beans</name>
Expand All @@ -52,14 +53,13 @@
<organizationUrl>http://www.oracle.com/</organizationUrl>
</developer>
</developers>

<contributors>
<contributor>
<name>Marina Vatkina</name>
<organization>Oracle Corporation</organization>
<organizationUrl>http://www.oracle.com/</organizationUrl>
</contributor>
</contributors>
</contributors>

<licenses>
<license>
Expand All @@ -81,11 +81,9 @@
<connection>scm:git:ssh://git@github.com/eclipse-ee4j/ejb-api.git</connection>
<developerConnection>scm:git:ssh://git@github.com/eclipse-ee4j/ejb-api.git</developerConnection>
<url>https://github.com/eclipse-ee4j/ejb-api</url>
<tag>HEAD</tag>
</scm>

<tag>HEAD</tag>
</scm>
<build>

<resources>
<resource>
<directory>src/main/java</directory>
Expand All @@ -95,7 +93,6 @@
</includes>
</resource>
</resources>

<pluginManagement>
<plugins>
<plugin>
Expand All @@ -107,11 +104,6 @@
<artifactId>spec-version-maven-plugin</artifactId>
<version>2.1</version>
</plugin>
<plugin>
<groupId>org.glassfish.build</groupId>
<artifactId>glassfishbuild-maven-plugin</artifactId>
<version>3.2.26</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand All @@ -122,11 +114,6 @@
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand All @@ -135,25 +122,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>${findbugs.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>1.11.1</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
Expand All @@ -164,32 +139,20 @@
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
</plugin>
<plugin>
<!-- Enables step-by-step staging deployment -->
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.7</version>
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.glassfish.build</groupId>
<artifactId>spec-version-maven-plugin</artifactId>
<version>2.1</version>
<configuration>
<spec>
<specVersion>4.0</specVersion>
Expand Down Expand Up @@ -247,22 +210,6 @@
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>process</goal>
</goals>
<configuration>
<resourceBundles>
<resourceBundle>org.glassfish:legal:1.1</resourceBundle>
</resourceBundles>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand All @@ -271,22 +218,22 @@
</configuration>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8</version>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
<source>1.8</source>
<doclint>none</doclint>
<bottom>
<![CDATA[
<p align="left">Copyright &#169; 2019 Eclipse Foundation.<br>Use is subject to
<![CDATA[
<p align="left">Copyright &#169; 2019-${current.year} Eclipse Foundation.<br>Use is subject to
<a href="{@docRoot}/doc-files/EFSL.html" target="_top">license terms</a>.]]>
</bottom>
<docfilessubdirs>true</docfilessubdirs>
Expand Down Expand Up @@ -330,10 +277,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<mavenExecutorId>forked-path</mavenExecutorId>
<useReleaseProfile>false</useReleaseProfile>
<tagNameFormat>@{project.version}</tagNameFormat>
<arguments>${release.arguments}</arguments>
<preparationGoals>install</preparationGoals>
<goals>deploy</goals>
</configuration>
Expand Down Expand Up @@ -370,15 +314,11 @@
</goals>
</execution>
</executions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://jakarta.oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>false</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>add-legal-resource</id>
Expand All @@ -399,6 +339,17 @@
</resources>
</configuration>
</execution>
<execution>
<id>timestamp-property</id>
<goals>
<goal>timestamp-property</goal>
</goals>
<phase>validate</phase>
<configuration>
<name>current.year</name>
<pattern>yyyy</pattern>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
Expand Down
4 changes: 2 additions & 2 deletions api/src/main/java/jakarta/ejb/ScheduleExpression.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* attribute in the common case that the value is a simple integer value. </p>
*
* <p>For example, <pre>scheduleExpression.second(10)</pre> is semantically equivalent to
* <pre>scheduleExpression.second("10")</pre></p>
* <pre>scheduleExpression.second("10")</pre>
*
*
*
Expand Down Expand Up @@ -195,7 +195,7 @@
* <li> year: "*"
* <li> timezone : default JVM time zone
* <li> start : upon timer creation
* <li> end : no end date</p>
* <li> end : no end date
* </ul>
*
* <p>
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/jakarta/ejb/StatefulTimeout.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* is eligible for removal by the container.
* <p>
*
* The semantics of the <code>value</value> element are as follows:
* The semantics of the <code>value</code> element are as follows:
* <ul>
* <li>A value <code>&#062;</code>0 indicates a timeout value in the units
* specified by the <code>unit</code> element.
Expand Down
4 changes: 2 additions & 2 deletions api/src/main/java/jakarta/ejb/Timer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public interface Timer {
* @throws jakarta.ejb.NoSuchObjectLocalException If invoked on a timer
that has expired or has been cancelled.
*
* @exception jakarta.ejb.NoMoreTimeoutsExceptions Indicates that the
* @exception jakarta.ejb.NoMoreTimeoutsException Indicates that the
* timer has no future timeouts
* @throws jakarta.ejb.EJBException If this method could not complete due
to a system-level failure.
Expand All @@ -76,7 +76,7 @@ public interface Timer {
* @throws jakarta.ejb.NoSuchObjectLocalException If invoked on a timer
that has expired or has been cancelled.
*
* @exception jakarta.ejb.NoMoreTimeoutsExceptions Indicates that the
* @exception jakarta.ejb.NoMoreTimeoutsException Indicates that the
* timer has no future timeouts
* @throws jakarta.ejb.EJBException If this method could not complete due
to a system-level failure.
Expand Down

0 comments on commit 7151df1

Please sign in to comment.