This is an automated email from the ASF dual-hosted git repository. nicknezis pushed a commit to branch nicknezis/shading-license-fix in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
commit 04dc56229efa1b6feccbef7e87eaa25add872772 Author: Nicholas Nezis <[email protected]> AuthorDate: Tue May 3 01:43:42 2022 -0400 Updated shade rules based on namespaces found in built jar --- heron/api/src/java/shade.conf | 3 +++ heron/ckptmgr/src/java/shade.conf | 8 +++++++- heron/instance/src/java/shade.conf | 3 ++- heron/simulator/src/java/shade.conf | 3 +++ storm-compatibility/v0.10.2/src/java/shade.conf | 5 +++++ storm-compatibility/v2.2.0/src/java/shade.conf | 4 ++++ 6 files changed, 24 insertions(+), 2 deletions(-) diff --git a/heron/api/src/java/shade.conf b/heron/api/src/java/shade.conf index 4cca52c04f7..ebf96076a15 100644 --- a/heron/api/src/java/shade.conf +++ b/heron/api/src/java/shade.conf @@ -16,3 +16,6 @@ # under the License. rule com.google.protobuf** org.apache.heron.shaded.@0 +rule org.slf4j** org.apache.heron.shaded.@0 +rule javax.xml.bind** org.apache.heron.shaded.@0 +rule org.apache.commons** org.apache.heron.shaded.@0 diff --git a/heron/ckptmgr/src/java/shade.conf b/heron/ckptmgr/src/java/shade.conf index 44617bef672..09138560f50 100644 --- a/heron/ckptmgr/src/java/shade.conf +++ b/heron/ckptmgr/src/java/shade.conf @@ -17,4 +17,10 @@ rule com.google.protobuf** org.apache.heron.shaded.@0 rule org.yaml.snakeyaml** org.apache.heron.shaded.@0 - +rule org.slf4j** org.apache.heron.shaded.@0 +rule org.codehaus** org.apache.heron.shaded.@0 +rule org.checkerframework** org.apache.heron.shaded.@0 +rule org.apache.commons** org.apache.heron.shaded.@0 +rule javax** org.apache.heron.shaded.@0 +rule com.google** org.apache.heron.shaded.@0 +rule afu** org.apache.heron.shaded.@0 diff --git a/heron/instance/src/java/shade.conf b/heron/instance/src/java/shade.conf index c3cab9ab506..865cb623658 100644 --- a/heron/instance/src/java/shade.conf +++ b/heron/instance/src/java/shade.conf @@ -18,4 +18,5 @@ rule com.google.protobuf** org.apache.heron.shaded.@0 rule org.yaml.snakeyaml** org.apache.heron.shaded.@0 rule org.apache.commons** org.apache.heron.shaded.@0 -rule org.slf4j** org.apache.heron.shaded.@0 \ No newline at end of file +rule org.slf4j** org.apache.heron.shaded.@0 +rule javax** org.apache.heron.shaded.@0 diff --git a/heron/simulator/src/java/shade.conf b/heron/simulator/src/java/shade.conf index 4cca52c04f7..b993d1c8117 100644 --- a/heron/simulator/src/java/shade.conf +++ b/heron/simulator/src/java/shade.conf @@ -16,3 +16,6 @@ # under the License. rule com.google.protobuf** org.apache.heron.shaded.@0 +rule org.apache.commons** org.apache.heron.shaded.@0 +rule org.yaml.snakeyaml** org.apache.heron.shaded.@0 +rule javax** org.apache.heron.shaded.@0 diff --git a/storm-compatibility/v0.10.2/src/java/shade.conf b/storm-compatibility/v0.10.2/src/java/shade.conf index 1e6c1546669..d0b74961ffb 100644 --- a/storm-compatibility/v0.10.2/src/java/shade.conf +++ b/storm-compatibility/v0.10.2/src/java/shade.conf @@ -18,3 +18,8 @@ rule com.google.protobuf** org.apache.heron.shaded.@0 rule org.yaml.snakeyaml** org.apache.heron.shaded.@0 rule org.json.simple** org.apache.heron.shaded.@0 +rule org.apache.commons** org.apache.heron.shaded.@0 +rule ch.qos** org.apache.heron.shaded.@0 +rule javax.xml** org.apache.heron.shaded.@0 +rule org.slf4j** org.apache.heron.shaded.@0 +rule org.apache.log4j** org.apache.heron.shaded.@0 diff --git a/storm-compatibility/v2.2.0/src/java/shade.conf b/storm-compatibility/v2.2.0/src/java/shade.conf index 5b9358ea201..d0b74961ffb 100644 --- a/storm-compatibility/v2.2.0/src/java/shade.conf +++ b/storm-compatibility/v2.2.0/src/java/shade.conf @@ -19,3 +19,7 @@ rule com.google.protobuf** org.apache.heron.shaded.@0 rule org.yaml.snakeyaml** org.apache.heron.shaded.@0 rule org.json.simple** org.apache.heron.shaded.@0 rule org.apache.commons** org.apache.heron.shaded.@0 +rule ch.qos** org.apache.heron.shaded.@0 +rule javax.xml** org.apache.heron.shaded.@0 +rule org.slf4j** org.apache.heron.shaded.@0 +rule org.apache.log4j** org.apache.heron.shaded.@0
