This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-scxml.git
The following commit(s) were added to refs/heads/master by this push:
new e7b7283 Fix build on Java 17.
e7b7283 is described below
commit e7b72839e6262ba605256a5a0a28ce4530a7f1cd
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Wed Mar 9 11:41:38 2022 -0500
Fix build on Java 17.
---
pom.xml | 49 ++++++++++++++++++++++
.../apache/commons/scxml2/SCXMLIOProcessor.java | 2 +-
.../java/org/apache/commons/scxml2/io/package.html | 15 ++++---
.../scxml2/semantics/SCXMLSemanticsImpl.java | 12 +++---
4 files changed, 63 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5e6aa3d..08d8e66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -358,6 +358,55 @@
<profiles>
<profile>
+ <activation>
+ <jdk>[11.,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.3.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.openjdk.nashorn</groupId>
+ <artifactId>nashorn-core</artifactId>
+ <version>15.3</version>
+ </dependency>
+ <!-- Graal's JS support is not 100% compatible with Java 8.
+ <dependency>
+ <groupId>org.graalvm.js</groupId>
+ <artifactId>js</artifactId>
+ <version>22.0.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.graalvm.js</groupId>
+ <artifactId>js-scriptengine</artifactId>
+ <version>22.0.0</version>
+ <scope>test</scope>
+ </dependency>
+ -->
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- Disable Doclint for missing jacadocs warnings. -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <additionalparam>-Xdoclint:all
-Xdoclint:-missing</additionalparam>
+ <additionalOptions>-Xdoclint:all
-Xdoclint:-missing</additionalOptions>
+ <additionalJOptions>
+ <additionalJOption>-Xdoclint:all</additionalJOption>
+ <additionalJOption>-Xdoclint:-missing</additionalJOption>
+ </additionalJOptions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>rc</id>
<distributionManagement>
<!-- Cannot define in parent ATM, see COMMONSSITE-26 -->
diff --git a/src/main/java/org/apache/commons/scxml2/SCXMLIOProcessor.java
b/src/main/java/org/apache/commons/scxml2/SCXMLIOProcessor.java
index 289b6d3..b385e09 100644
--- a/src/main/java/org/apache/commons/scxml2/SCXMLIOProcessor.java
+++ b/src/main/java/org/apache/commons/scxml2/SCXMLIOProcessor.java
@@ -54,7 +54,7 @@ public interface SCXMLIOProcessor {
/**
* Send an event into the SCXML processor queue
- * <p>
+ *
* @param event the event to send
*/
void addEvent(TriggerEvent event);
diff --git a/src/main/java/org/apache/commons/scxml2/io/package.html
b/src/main/java/org/apache/commons/scxml2/io/package.html
index fd5d08a..fa7e6a8 100644
--- a/src/main/java/org/apache/commons/scxml2/io/package.html
+++ b/src/main/java/org/apache/commons/scxml2/io/package.html
@@ -19,14 +19,13 @@
</head>
<body>
- <p>A collection of classes for reading in and writing out SCXML
- documents, to and from the Commons SCXML Java object model.
- <ul>
- <li><code>SCXMLReader</code> is based on
- StAX based pull parsing and has no external dependencies.</li>
- <li><code>SCXMLWriter</code> is based on StAX XML stream writer.</li>
- </ul>
- </p>
+ <p>A collection of classes for reading in and writing out SCXML
+ documents, to and from the Commons SCXML Java object model.</p>
+ <ul>
+ <li><code>SCXMLReader</code> is based on StAX based pull parsing
+ and has no external dependencies.</li>
+ <li><code>SCXMLWriter</code> is based on StAX XML stream
writer.</li>
+ </ul>
</body>
</html>
diff --git
a/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java
b/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java
index 73e48fb..6529794 100644
--- a/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java
+++ b/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java
@@ -238,7 +238,7 @@ public class SCXMLSemanticsImpl implements SCXMLSemantics {
* Perform a micro step in the execution of a state machine.
* <p>
* This micro step is corresponding to the Algorithm for SCXML processing
microstep() procedure.
- * <p>
+ * </p>
* @param exctx The execution context for this step
* @param step The current micro step
* @param statesToInvoke the set of activated states which invokes need to
be invoked at the end of the current
@@ -292,7 +292,7 @@ public class SCXMLSemanticsImpl implements SCXMLSemantics {
* This macro step is corresponding to the Algorithm for SCXML processing
mainEventLoop() procedure macro step
* sub-flow, which are the first <em>3</em> steps of the described
<em>4</em>, so everything up to the blocking
* wait for an external event.
- * <p>
+ * </p>
* @param exctx The execution context for this step
* @param statesToInvoke the set of activated states which invokes need to
be invoked at the end of the current
* macro step
@@ -336,7 +336,7 @@ public class SCXMLSemanticsImpl implements SCXMLSemantics {
* Compute and store the set of states to exit for the current list of
transitions in the provided step.
* <p>
* This method corresponds to the Algorithm for SCXML processing
computeExitSet() procedure.
- * <p>
+ * </p>
* @param step The step containing the list of transitions to be taken
* @param stateConfiguration The current configuration of the state
machine ({@link SCInstance#getStateConfiguration()}).
*/
@@ -353,7 +353,7 @@ public class SCXMLSemanticsImpl implements SCXMLSemantics {
* Compute and store the set of states to exit for one specific transition
in the provided step.
* <p>
* This method corresponds to the Algorithm for SCXML processing
computeExitSet() procedure.
- * <p>
+ * </p>
* @param transition The transition to compute the states to exit from
* @param exitSet The set for adding the states to exit to
* @param activeStates The current active states of the state machine
({@link StateConfiguration#getActiveStates()}).
@@ -425,7 +425,7 @@ public class SCXMLSemanticsImpl implements SCXMLSemantics {
* Compute and store the set of states to enter for the current list of
transitions in the provided step.
* <p>
* This method corresponds to the Algorithm for SCXML processing
computeEntrySet() procedure.
- * <p>
+ * </p>
* @param exctx The execution context for this step
* @param step The step containing the list of transitions to be taken
*/
@@ -556,7 +556,7 @@ public class SCXMLSemanticsImpl implements SCXMLSemantics {
/**
* This method corresponds to the Algorithm for SCXML processing
selectTransitions() as well as the
* selectEventlessTransitions() procedure, depending on the event (or
null) in the provided step
- * <p>
+ *
* @param exctx The execution context for this step
* @param step The step
* @throws ModelException if there is a fatal SCXML state error
