This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 65cda27081 royale-compiler now requires failureaccess.jar as a
dependency for guava
65cda27081 is described below
commit 65cda2708146d6034f90601a4c0c243176d226e5
Author: Josh Tynjala <joshtynj...@apache.org>
AuthorDate: Tue Dec 12 08:49:54 2023 -0800
royale-compiler now requires failureaccess.jar as a dependency for guava
It used to be part of the same library, but Google split it into a separate
one
---
ApproveRoyale.xml | 2 ++
distribution/src/main/assembly/component-royale.xml | 2 ++
2 files changed, 4 insertions(+)
diff --git a/ApproveRoyale.xml b/ApproveRoyale.xml
index 6fcaaa3be8..e462df0838 100644
--- a/ApproveRoyale.xml
+++ b/ApproveRoyale.xml
@@ -564,6 +564,7 @@
<exclude name="royale-asjs/js/lib/externc.jar"/>
<exclude name="royale-asjs/js/lib/flex-tool-api.jar"/>
<exclude name="royale-asjs/js/lib/guava.jar"/>
+ <exclude name="royale-asjs/js/lib/failureaccess.jar"/>
<exclude name="royale-asjs/js/lib/jsc.jar"/>
<exclude name="royale-asjs/js/lib/junit-4.10.jar"/>
<exclude name="royale-asjs/js/lib/mxmlc.jar"/>
@@ -597,6 +598,7 @@
<exclude
name="royale-asjs/lib/external/commons-lang3-3.4.jar"/>
<exclude name="royale-asjs/lib/external/flex-tool-api.jar"/>
<exclude name="royale-asjs/lib/external/guava.jar"/>
+ <exclude name="royale-asjs/lib/external/failureaccess.jar"/>
<exclude name="royale-asjs/lib/external/jburg.jar"/>
<exclude name="royale-asjs/lib/external/jflex.jar"/>
<exclude name="royale-asjs/lib/external/junit-4.10.jar"/>
diff --git a/distribution/src/main/assembly/component-royale.xml
b/distribution/src/main/assembly/component-royale.xml
index 3c42375ce2..8feebae661 100644
--- a/distribution/src/main/assembly/component-royale.xml
+++ b/distribution/src/main/assembly/component-royale.xml
@@ -67,6 +67,7 @@
<include>*:commons-lang3:jar</include><!-- Why is this needed?
-->
<include>*:flex-tool-api:jar</include>
<include>*:guava:jar</include>
+ <include>*:failureaccess:jar</include>
<include>*:lzma-sdk-4j:jar</include>
</includes>
</dependencySet>
@@ -95,6 +96,7 @@
<include>*:dom4j:*</include>
<include>*:flex-tool-api:*</include>
<include>*:guava:*</include>
+ <include>*:failureaccess:*</include>
<include>*:jsc:*</include>
<include>*:slf4j-api:*</include>
</includes>
