You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by ni...@apache.org on 2022/05/04 02:33:40 UTC
[incubator-heron] branch master updated: Added License file to published Jars (#3827)
This is an automated email from the ASF dual-hosted git repository.
nicknezis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/master by this push:
new 820679cfa01 Added License file to published Jars (#3827)
820679cfa01 is described below
commit 820679cfa014f820cc8f4a56e103b7e533f5c318
Author: Nicholas Nezis <ni...@gmail.com>
AuthorDate: Tue May 3 22:33:35 2022 -0400
Added License file to published Jars (#3827)
* Added disclaimers filegroup as jar resource
* Updated shade rules based on namespaces found in built jar
---
contrib/bolts/kafka/src/java/BUILD | 1 +
contrib/spouts/kafka/src/java/BUILD | 1 +
heron/api/src/java/BUILD | 1 +
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/BUILD | 1 +
heron/simulator/src/java/shade.conf | 3 +++
heron/spi/src/java/BUILD | 1 +
storm-compatibility/v0.10.2/src/java/BUILD | 1 +
storm-compatibility/v0.10.2/src/java/shade.conf | 5 +++++
storm-compatibility/v2.2.0/src/java/BUILD | 1 +
storm-compatibility/v2.2.0/src/java/shade.conf | 4 ++++
13 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/contrib/bolts/kafka/src/java/BUILD b/contrib/bolts/kafka/src/java/BUILD
index 6937bb5a7d2..aa95185be0a 100644
--- a/contrib/bolts/kafka/src/java/BUILD
+++ b/contrib/bolts/kafka/src/java/BUILD
@@ -25,6 +25,7 @@ kafka_bolt_deps = [
java_library(
name = "heron-kafka-bolt-java",
srcs = glob(["org/apache/heron/bolts/kafka/**/*.java"]),
+ resources = ["//:disclaimers"],
javacopts = DOCLINT_HTML_AND_SYNTAX,
deps = kafka_bolt_deps,
)
diff --git a/contrib/spouts/kafka/src/java/BUILD b/contrib/spouts/kafka/src/java/BUILD
index bef16be97b0..f0a8f007526 100644
--- a/contrib/spouts/kafka/src/java/BUILD
+++ b/contrib/spouts/kafka/src/java/BUILD
@@ -25,6 +25,7 @@ kafka_spout_deps = [
java_library(
name = "heron-kafka-spout-java",
srcs = glob(["org/apache/heron/spouts/kafka/**/*.java"]),
+ resources = ["//:disclaimers"],
javacopts = DOCLINT_HTML_AND_SYNTAX,
deps = kafka_spout_deps,
)
diff --git a/heron/api/src/java/BUILD b/heron/api/src/java/BUILD
index 1762d846910..eb0bc11821a 100644
--- a/heron/api/src/java/BUILD
+++ b/heron/api/src/java/BUILD
@@ -50,6 +50,7 @@ java_library(
"org/apache/heron/streamlet/**/*.java",
]),
javacopts = DOCLINT_HTML_AND_SYNTAX,
+ resources = ["//:disclaimers"],
deps = api_deps_files + [
"//third_party/java:kryo-neverlink",
"@maven//:org_apache_commons_commons_lang3",
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/BUILD b/heron/simulator/src/java/BUILD
index bffe6ed6c26..aaaa4c6e88d 100644
--- a/heron/simulator/src/java/BUILD
+++ b/heron/simulator/src/java/BUILD
@@ -34,6 +34,7 @@ java_library(
java_binary(
name = "simulator-unshaded",
srcs = glob(["org/apache/heron/simulator/**/*.java"]),
+ resources = ["//:disclaimers"],
deps = simulator_deps_files + [
"//third_party/java:kryo-neverlink",
"@maven//:org_apache_commons_commons_lang3",
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/heron/spi/src/java/BUILD b/heron/spi/src/java/BUILD
index 657ae28004b..4f7e6876090 100644
--- a/heron/spi/src/java/BUILD
+++ b/heron/spi/src/java/BUILD
@@ -24,6 +24,7 @@ java_library(
"**/spi/metricsmgr/**/*.java",
]),
javacopts = DOCLINT_HTML_AND_SYNTAX,
+ resources = ["//:disclaimers"],
deps = [
"//heron/api/src/java:api-java-low-level",
"//heron/api/src/java:classification",
diff --git a/storm-compatibility/v0.10.2/src/java/BUILD b/storm-compatibility/v0.10.2/src/java/BUILD
index 0f42b885acc..8f8b63e8036 100644
--- a/storm-compatibility/v0.10.2/src/java/BUILD
+++ b/storm-compatibility/v0.10.2/src/java/BUILD
@@ -62,6 +62,7 @@ java_library(
java_binary(
name = "storm-compatibility-unshaded",
srcs = glob(["**/*.java"]),
+ resources = ["//:disclaimers"],
deps = storm_deps_files + [
"//eco/src/java:eco-java",
],
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/BUILD b/storm-compatibility/v2.2.0/src/java/BUILD
index 8cf666424e0..2c2fa0ad554 100644
--- a/storm-compatibility/v2.2.0/src/java/BUILD
+++ b/storm-compatibility/v2.2.0/src/java/BUILD
@@ -64,6 +64,7 @@ java_library(
java_binary(
name = "storm-compatibility-unshaded",
srcs = glob(["**/*.java"]),
+ resources = ["//:disclaimers"],
deps = storm_deps_files + [
"//eco/src/java:eco-java",
],
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