update to version 3.2.2

2023-07-10 16:29:18 +08:00 · 2023-07-10 16:29:18 +08:00 · 6e348ccd23
commit 6e348ccd23
parent 2340d4f65a
4 changed files with 273 additions and 2 deletions
--- a/0001-add-exclude-source-file-to-javadoc-plugin.patch
+++ b/0001-add-exclude-source-file-to-javadoc-plugin.patch
@ -0,0 +1,265 @@
+From c870d879e97d3c8edd872ffc186a6cc836caec59 Mon Sep 17 00:00:00 2001
+From: wang--ge <wang__ge@126.com>
+Date: Mon, 10 Jul 2023 16:08:52 +0800
+Subject: [PATCH] add exclude source file to javadoc plugin
+
+---
+ pom.xml                                       |  40 ++++
+ .../java/javax/ejb/ScheduleExpression.java    | 190 ------------------
+ 2 files changed, 40 insertions(+), 190 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index b4a812b..1bc241f 100644
+--- a/pom.xml
+++ b/pom.xml
+@@ -242,6 +242,46 @@
+                 <artifactId>maven-javadoc-plugin</artifactId>
+                 <version>2.8</version>
+                 <configuration>
+		    <sourceFileExcludes>
+			<sourceFileExclude>**/javax/ejb/EJBException.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/AccessLocalException.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/AccessTimeout.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/ApplicationException.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/ConcurrentAccessException.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/CreateException.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/DependsOn.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/DuplicateKeyException.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/EJB.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/EJBContext.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/EJBTransactionRequiredException.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/EJBTransactionRolledbackException.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/FinderException.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/Init.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/Local.java</sourceFileExclude> 
+			<sourceFileExclude>**/javax/ejb/LocalHome.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/MessageDriven.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/NoSuchEJBException.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/NoSuchEntityException.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/NoSuchObjectLocalException.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/ObjectNotFoundException.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/Remote.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/RemoteHome.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/Remove.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/RemoveException.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/Schedule.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/ScheduleExpression.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/Schedules.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/SessionContext.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/Singleton.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/Stateful.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/StatefulTimeout.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/Timer.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/EJBAccessException.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/Stateless.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/Timeout.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/TransactionRequiredLocalException.java</sourceFileExclude>
+			<sourceFileExclude>**/javax/ejb/TransactionRolledbackLocalException.java</sourceFileExclude>
+		    </sourceFileExcludes>
+                     <additionalparam>-Xdoclint:none</additionalparam>
+                     <bottom>
+ <![CDATA[Copyright &#169; 1996-2013,
+diff --git a/src/main/java/javax/ejb/ScheduleExpression.java b/src/main/java/javax/ejb/ScheduleExpression.java
+index 44dd251..2df82d7 100755
+--- a/src/main/java/javax/ejb/ScheduleExpression.java
+++ b/src/main/java/javax/ejb/ScheduleExpression.java
+@@ -43,196 +43,6 @@ package javax.ejb;
+ import java.util.Date;
+ import java.io.Serializable;
+ 
+-/**
+- * <p> 
+- * A calendar-based timeout expression for an enterprise bean
+- * timer.</p>
+- * 
+- * <p>
+- * Each attribute used to define a calendar-based timeout schedule 
+- * has two overloaded  setter methods, one that takes a String and 
+- * one that takes an int.  
+- * The int version is merely a convenience method for setting the 
+- * 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>
+- *
+- *
+- *
+- * There are seven attributes that constitute a schedule specification which are
+- * listed below.  In addition, the <code>timezone</code> attribute may be used
+- * to specify a non-default time zone in whose context the schedule 
+- * specification is to be evaluated.
+- * <p>
+- * The attributes that specify the calendar-based schedule itself are as
+- * follows:
+- * <p>
+- * <ul>
+- * <li> second : one or more seconds within a minute 
+- * <p> Allowable values: [0,59]
+- * <p>
+- * <li> minute : one or more minutes within an hour
+- * <p> Allowable values : [0,59]
+- * <p>
+- * <li> hour : one or more hours within a day
+- * <p> Allowable values : [0,23]
+- * <p>
+- * <li> dayOfMonth : one or more days within a month
+- * <p> Allowable values: 
+- * <ul>
+- * <li> [1,31] 
+- * <li> [-7, -1] 
+- * <li> "Last" 
+- * <li> {"1st", "2nd", "3rd", "4th", "5th", "Last"} {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}
+- * </ul>
+- * <p> "Last" means the last day of the month
+- * <p> -x (where x is in the range [-7, -1]) means x day(s) before the last day of the month
+- * <p> "1st","2nd", etc. applied to a day of the week identifies a single occurrence of that day within the month.
+- * <p>
+- * <li> month : one or more months within a year
+- * <p> Allowable values :
+- * <p> 
+- * <ul>
+- * <li> [1,12]
+- * <li> {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", Dec"}
+- * </ul>
+- * <p>
+- * <li> dayOfWeek : one or more days within a week
+- * <p> Allowable values :
+- * <p>
+- * <ul>
+- * <li> [0,7] 
+- * <li> {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}
+- * </ul>
+- * <p> "0" and "7" both refer to Sunday
+- * <p>
+- * <li> year : a particular calendar year
+- * <p> Allowable values : a four-digit calendar year
+- * 
+- * <p>
+- * </ul>
+- * <p>
+- *
+- * Each attribute supports values expressed in one of the following forms
+- * <p>
+- * <ul>
+- * <li> Single Value.  This constrains the attribute to only one of 
+- * its possible values.
+- * <pre> 
+- * Example: second = "10"
+- * Example: month = "Sep"</pre>
+- * <p>
+- * <li> Wild Card.  "*" represents all allowable values for a given attribute.
+- * <pre>
+- * Example: second = "*"
+- * Example: dayOfWeek = "*"</pre>
+- * 
+- * <li> List.  This constrains the attribute to two or more allowable values
+- * or ranges, with a comma used as a separator character within the string.
+- * Each item in the list must be a single value or range.  List items cannot
+- * be lists, wild cards, or increments.  Duplicate values are ignored.
+- * <pre>
+- * Example: second = "10,20,30"
+- * Example: dayOfWeek = "Mon,Wed,Fri"
+- * Example: minute = "0-10,30,40"</pre>
+- *
+- * <li> Range.  This constrains the attribute to an inclusive range of values,
+- * with a dash separating both ends of the range.  Each side of the range 
+- * must be a single attribute value.  Members of a range cannot be lists,
+- * wild cards, ranges, or increments.  If <code>x</code> is larger than
+- * <code>y</code> in a range <code>"x-y"</code>, the range is equivalent
+- * to <code>"x-max, min-y"</code>, where <code>max</code> is the largest
+- * value of the corresponding attribute and <code>min</code> is the smallest.
+- * The range <code>"x-x"</code>, where both range values are the same,
+- * evaluates to the single value <code>x</code>.  The day of the week range
+- * <code>"0-7"</code> is equivalent to <code>"*"</code>.
+- * <p>
+- * <pre>
+- * Example: second = "1-10"
+- * Example: dayOfWeek = "Fri-Mon"
+- * Example: dayOfMonth = "27-3" (Equivalent to "27-Last , 1-3")</pre>
+- * 
+- * <li> Increments.  The forward slash constrains an attribute based on a
+- * starting point and an interval, and is used to specify every <code>N</code>
+- * seconds, minutes, or hours within the minute, hour, or day, respectively.
+- * For the expression <code>x/y</code>, the attribute is constrained to
+- * every <code>y</code>th value within the set of allowable values beginning
+- * at time <code>x</code>.  The <code>x</code> value is inclusive.  The
+- * wild card character (<code>*</code>) can be used in the <code>x</code>
+- * position, and is equivalent to <code>0</code>.  The use of increments
+- * is only supported within the <code>second</code>, <code>minute</code>,
+- * and <code>hour</code> attributes.  For the <code>second</code> and
+- * <code>minute</code> attributes, <code>x</code> and <code>y</code> must
+- * each be in the range <code>[0,59]</code>.  For the <code>hour</code>
+- * attribute, <code>x</code> and <code>y</code> must each be in the range 
+- * <code>[0,23]</code>.
+- * <p>
+- * <pre>
+- * Example: minute = "&#8727;/5" (Every five minutes within the hour)</pre>
+- * This is equivalent to: 
+- * <code>minute = "0,5,10,15,20,25,30,35,40,45,50,55"</code>  
+- * <p>
+- * <pre>
+- * Example: second = "30/10" (Every 10 seconds within the minute, starting at second 30) </pre>
+- * This is equivalent to: <code>second = "30,40,50"</code>
+- * <p> Note that the set of matching increment values stops once the maximum
+- * value for that attribute is exceeded.  It does not "roll over" past the
+- * boundary.
+- * <p>
+- * <pre>
+- * Example : ( minute = "&#8727;/14", hour="1,2")</pre>
+- * <p>  This is equivalent to: <code>(minute = "0,14,28,42,56", hour = "1,2")</code>  
+- *  (Every 14 minutes within the hour, for the hours of 1 and 2 a.m.)
+- * </ul>
+- *
+- * <p>
+- * The following additional rules apply to the schedule specification attributes:
+- * <ul>
+- * <li> If the <code>dayOfMonth</code> attribute has a non-wildcard value and
+- * the <code>dayOfWeek</code> attribute has a non-wildcard value, then any
+- * day matching either the <code>dayOfMonth</code> value or the 
+- * <code>dayOfWeek</code> value will be considered to apply.
+- * <li> Whitespace is ignored, except for string constants and numeric values.
+- * <li> All string constants (e.g., <code>"Sun"</code>, <code>"Jan"</code>,
+- * <code>"1st"</code>, etc.) are case insensitive.
+- * </ul>
+- * <p>
+- * Schedule-based timer times are evaluated in the context of the default 
+- * time zone associated with the container in which the application is 
+- * executing. A schedule-based timer may optionally override this default
+- * and associate itself with a specific time zone. If the schedule-based 
+- * timer is associated with a specific time zone, all its times are 
+- * evaluated in the context of that time zone, regardless of the default 
+- * time zone in which the container is executing.
+- * <p>
+- * None of the ScheduleExpression methods are required to be called.  
+- * The defaults are :
+- *
+- * <ul>
+- * <li>  second: "0"
+- * <li>  minute: "0"
+- * <li>  hour: "0"
+- * <li>  dayOfMonth: "*"
+- * <li>  month: "*"
+- * <li>  dayOfWeek: "*"
+- * <li>  year: "*"
+- * <li>  timezone : default JVM time zone
+- * <li>  start : upon timer creation
+- * <li>  end : no end date</p>
+- * </ul>
+- *
+- * <p>
+- * Applications must not rely on the getter methods that return
+- * the attributes of a calendar-based timeout schedule to return
+- * them in the same syntactic format in which they were passed in to a
+- * <code>ScheduleExpression</code> method or supplied to the
+- * <code>Schedule</code> annotation, and portable implementations must
+- * not assume any particular syntactic format.  Implementations are 
+- * required only to preserve semantic equivalence.
+- * 
+- * @since EJB 3.1
+- */
+ 
+ public class ScheduleExpression implements Serializable {
+ 
+-- 
+2.33.0
+
--- a/3.2.2.tar.gz
+++ b/3.2.2.tar.gz
--- a/3.2.tar.gz
+++ b/3.2.tar.gz
--- a/glassfish-ejb-api.spec
+++ b/glassfish-ejb-api.spec
@ -1,11 +1,12 @@
 Name:                glassfish-ejb-api
-Version:             3.2
+Version:             3.2.2
 Release:             1
 Summary:             Java EJB 3.2 API Design Specification
 License:             CDDL or GPLv2 with exceptions
 URL:                 https://java.net/projects/ejb-spec/
 Source0:             https://github.com/javaee/javax.ejb/archive/%{version}.tar.gz
 Source1:             https://javaee.github.io/glassfish/LICENSE
+Patch0:              0001-add-exclude-source-file-to-javadoc-plugin.patch
 BuildRequires:       maven-local mvn(javax.transaction:javax.transaction-api)
 BuildRequires:       mvn(javax.xml.rpc:javax.xml.rpc-api) mvn(net.java:jvnet-parent:pom:)
 BuildRequires:       mvn(org.apache.felix:maven-bundle-plugin)
@ -24,10 +25,12 @@ This package contains javadoc for %{name}.
 %prep
 %setup -q -n javax.ejb-%{version}
 cp %{SOURCE1} ./
+%patch0 -p1
 %pom_remove_plugin :findbugs-maven-plugin
 %pom_remove_plugin :glassfishbuild-maven-plugin
 %pom_remove_plugin :maven-site-plugin
 %pom_remove_plugin :maven-source-plugin
+%pom_remove_plugin :maven-gpg-plugin
 %pom_xpath_remove "pom:Embed-Dependency"
 %pom_xpath_remove "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:configuration/pom:useDefaultManifestFile"
 %pom_xpath_inject "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:configuration" '
@ -37,7 +40,7 @@ cp %{SOURCE1} ./
 %mvn_file : %{name}

 %build
-%mvn_build
+%mvn_build --xmvn-javadoc

 %install
 %mvn_install
@ -49,5 +52,8 @@ cp %{SOURCE1} ./
 %license LICENSE

 %changelog
+* Mon Jul 10 2023 Ge Wang <wang__ge@126.com> - 3.2.2-1
+- Update to version 3.2.2
+
 * Sat Aug 15 2020 Ge Wang <wangge20@huawei.com> - 3.2-1
 - Package init