diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 0000000000..b4c5d1d29e --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1 @@ +-Dorg.slf4j.simpleLogger.log.com.networknt.schema=error diff --git a/examples/autoscaling/pom.xml b/examples/autoscaling/pom.xml index 76ac1c4652..7914ab28ed 100644 --- a/examples/autoscaling/pom.xml +++ b/examples/autoscaling/pom.xml @@ -106,7 +106,7 @@ under the License. org.apache.maven.plugins maven-shade-plugin - 3.0.0 + @@ -125,13 +125,41 @@ under the License. - *:* + + module-info.class + META-INF/**/module-info.class + META-INF/*.SF META-INF/*.DSA META-INF/*.RSA + + META-INF/maven/** + + META-INF/DEPENDENCIES + META-INF/LICENSE + META-INF/LICENSE.txt + META-INF/license.txt + META-INF/NOTICE + META-INF/NOTICE.txt + META-INF/licenses/** + + META-INF/*.kotlin_module + + META-INF/proguard/** + META-INF/native-image/** + + META-INF/MANIFEST.MF + + + + + com.squareup.okio:okio + + META-INF/okio.kotlin_module diff --git a/examples/flink-beam-example/pom.xml b/examples/flink-beam-example/pom.xml index a48c9fee4c..0cb0008ec9 100644 --- a/examples/flink-beam-example/pom.xml +++ b/examples/flink-beam-example/pom.xml @@ -66,6 +66,22 @@ under the License. org.springframework spring-jcl + + + org.apache.beam + beam-sdks-java-extensions-ml + @@ -120,7 +136,7 @@ under the License. org.apache.maven.plugins maven-shade-plugin - 3.1.1 + @@ -139,19 +155,125 @@ under the License. - *:* - META-INF/versions/9/module-info.class + + module-info.class + META-INF/**/module-info.class + META-INF/*.SF META-INF/*.DSA META-INF/*.RSA + + META-INF/maven/** + + META-INF/DEPENDENCIES + META-INF/LICENSE + META-INF/LICENSE.txt + META-INF/license.txt + META-INF/NOTICE + META-INF/NOTICE.txt + META-INF/license/** + META-INF/licenses/** + LICENSE + LICENSE.txt + LICENSE-*.txt + about.html + + META-INF/*.kotlin_module + META-INF/kotlin-project-structure-metadata.json + commonMain/** + + META-INF/proguard/** + META-INF/native-image/** + + arrow-git.properties + + META-INF/io.netty.versions.properties + + mozilla/public-suffix-list.txt + + META-INF/MANIFEST.MF + + + + + com.squareup:kotlinpoet + + ** + + + + + com.squareup.wire:wire-runtime + + ** + + + + com.squareup.wire:wire-schema + + ** + + + + + com.squareup.wire:wire-compiler + + com/squareup/wire/schema/DirectedAcyclicGraph*.class + com/squareup/wire/schema/PartitionedSchema*.class + com/squareup/wire/schema/Target*.class + com/squareup/wire/schema/WireRun*.class + + + + + com.squareup.wire:wire-schema-jvm + + google/protobuf/*.proto + + + + + org.apache.beam:beam-sdks-java-harness + + org/apache/beam/runners/core/** + + diff --git a/examples/flink-sql-runner-example/pom.xml b/examples/flink-sql-runner-example/pom.xml index 6ea19990d6..7171184e2f 100644 --- a/examples/flink-sql-runner-example/pom.xml +++ b/examples/flink-sql-runner-example/pom.xml @@ -94,7 +94,7 @@ under the License. org.apache.maven.plugins maven-shade-plugin - 3.1.1 + @@ -113,13 +113,42 @@ under the License. - *:* + + module-info.class + META-INF/**/module-info.class + META-INF/*.SF META-INF/*.DSA META-INF/*.RSA + + META-INF/maven/** + + META-INF/DEPENDENCIES + META-INF/LICENSE + META-INF/LICENSE.txt + META-INF/license.txt + META-INF/NOTICE + META-INF/NOTICE.txt + META-INF/licenses/** + + META-INF/*.kotlin_module + + META-INF/proguard/** + META-INF/native-image/** + + META-INF/MANIFEST.MF + + + + + com.squareup.okio:okio + + META-INF/okio.kotlin_module diff --git a/flink-autoscaler-standalone/pom.xml b/flink-autoscaler-standalone/pom.xml index 31bebf61b1..c198e85f10 100644 --- a/flink-autoscaler-standalone/pom.xml +++ b/flink-autoscaler-standalone/pom.xml @@ -183,6 +183,22 @@ under the License. org.apache.maven.plugins maven-shade-plugin + + + + org.apache.logging.log4j + log4j-transform-maven-shade-plugin-extensions + 0.2.0 + + @@ -199,14 +215,91 @@ under the License. - *:* + META-INF/*.SF META-INF/*.DSA META-INF/*.RSA + + module-info.class META-INF/**/module-info.class + + META-INF/maven/** + + META-INF/DEPENDENCIES + META-INF/LICENSE + META-INF/LICENSE.txt + META-INF/license.txt + META-INF/NOTICE + META-INF/NOTICE.txt + META-INF/licenses/** + + META-INF/*.kotlin_module + + META-INF/proguard/** + + META-INF/native-image/** + + META-INF/MANIFEST.MF + + + + + org.apache.flink:flink-runtime + + org/apache/flink/runtime/rest/messages/job/metrics/AggregatedMetric.class + org/apache/flink/runtime/rest/messages/job/metrics/IOMetricsInfo.class + org/apache/flink/runtime/rest/messages/job/JobDetailsInfo.class + org/apache/flink/runtime/rest/messages/job/JobDetailsInfo$*.class + org/apache/flink/runtime/rest/messages/json/SlotSharingGroupIDDeserializer.class + org/apache/flink/runtime/rest/messages/json/SlotSharingGroupIDSerializer.class + + + + + org.apache.flink:flink-autoscaler + + org/apache/flink/runtime/rest/messages/job/metrics/AggregatedMetric.class + + + + + com.squareup.okio:okio + + META-INF/okio.kotlin_module @@ -215,6 +308,14 @@ under the License. org.apache.flink.autoscaler.standalone.StandaloneAutoscalerEntrypoint + + diff --git a/flink-kubernetes-operator/pom.xml b/flink-kubernetes-operator/pom.xml index f488127568..27ea4cdd1d 100644 --- a/flink-kubernetes-operator/pom.xml +++ b/flink-kubernetes-operator/pom.xml @@ -259,6 +259,22 @@ under the License. org.apache.maven.plugins maven-shade-plugin + + + + org.apache.logging.log4j + log4j-transform-maven-shade-plugin-extensions + 0.2.0 + + shade-flink-operator @@ -268,17 +284,154 @@ under the License. true + + false *:* + + module-info.class META-INF/**/module-info.class + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + META-INF/maven/** + + META-INF/DEPENDENCIES + META-INF/LICENSE + META-INF/LICENSE.txt + META-INF/license.txt + META-INF/NOTICE + META-INF/NOTICE.txt + META-INF/licenses/** + + META-INF/*.kotlin_module + + META-INF/proguard/** + + META-INF/native-image/** + + META-INF/jandex.idx + + META-INF/io.netty.versions.properties + + META-INF/MANIFEST.MF org.apache.flink:flink-kubernetes META-INF/versions/**/com/fasterxml/jackson/core/io/doubleparser/** + + org/apache/flink/kubernetes/kubeclient/decorators/FlinkConfMountDecorator.class + + + + + org.apache.flink:flink-runtime + + org/apache/flink/runtime/rest/messages/job/metrics/AggregatedMetric.class + org/apache/flink/runtime/rest/messages/job/metrics/IOMetricsInfo.class + org/apache/flink/runtime/rest/messages/JobExceptionsInfoWithHistory.class + org/apache/flink/runtime/rest/messages/JobExceptionsInfoWithHistory$*.class + org/apache/flink/runtime/rest/messages/job/JobDetailsInfo.class + org/apache/flink/runtime/rest/messages/job/JobDetailsInfo$*.class + org/apache/flink/runtime/rest/messages/json/SlotSharingGroupIDDeserializer.class + org/apache/flink/runtime/rest/messages/json/SlotSharingGroupIDSerializer.class + + + + + org.apache.flink:flink-autoscaler + + org/apache/flink/runtime/rest/messages/job/metrics/AggregatedMetric.class + + + + + org.apache.flink:flink-shaded-zookeeper-3 + + META-INF/io.netty.versions.properties + META-INF/native-image/io.netty/** + + + + + org.apache.flink:flink-kubernetes-operator-api + + log4j2.properties + + + + + com.squareup.okio:okio + + META-INF/okio.kotlin_module @@ -292,6 +445,14 @@ under the License. implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> org.apache.flink.kubernetes.operator.FlinkOperator + + @@ -377,6 +538,20 @@ under the License. org.apache.maven.plugins maven-assembly-plugin + + 3.8.0 + + + test-plugins + create-test-plugin-jar @@ -385,7 +560,6 @@ under the License. single - test-plugins false src/test/assembly/test-plugins-assembly.xml diff --git a/flink-kubernetes-operator/src/test/assembly/test-plugins-assembly.xml b/flink-kubernetes-operator/src/test/assembly/test-plugins-assembly.xml index 3cb8b5d176..785c8c1f68 100644 --- a/flink-kubernetes-operator/src/test/assembly/test-plugins-assembly.xml +++ b/flink-kubernetes-operator/src/test/assembly/test-plugins-assembly.xml @@ -25,7 +25,6 @@ under the License. ${project.build.testOutputDirectory} - / org/apache/flink/kubernetes/operator/validation/TestValidator.class @@ -37,7 +36,7 @@ under the License. ${project.basedir}/src/test/resources/META-INF/services - /META-INF/services + META-INF/services diff --git a/flink-kubernetes-webhook/pom.xml b/flink-kubernetes-webhook/pom.xml index e5cc0e4d4e..12e4590a8e 100644 --- a/flink-kubernetes-webhook/pom.xml +++ b/flink-kubernetes-webhook/pom.xml @@ -101,6 +101,20 @@ under the License. org.apache.maven.plugins maven-assembly-plugin + + 3.8.0 + + + test-plugins + create-test-plugin-jar @@ -109,7 +123,6 @@ under the License. single - test-plugins false src/test/assembly/test-plugins-assembly.xml @@ -130,6 +143,17 @@ under the License. true + + + + *:* + + META-INF/MANIFEST.MF + + + io.javaoperatorsdk:kubernetes-webhooks-framework-core diff --git a/flink-kubernetes-webhook/src/test/assembly/test-plugins-assembly.xml b/flink-kubernetes-webhook/src/test/assembly/test-plugins-assembly.xml index 8f974d939d..30991770d2 100644 --- a/flink-kubernetes-webhook/src/test/assembly/test-plugins-assembly.xml +++ b/flink-kubernetes-webhook/src/test/assembly/test-plugins-assembly.xml @@ -25,7 +25,6 @@ under the License. ${project.build.testOutputDirectory} - / org/apache/flink/kubernetes/operator/mutator/TestMutator.class @@ -35,7 +34,7 @@ under the License. ${project.basedir}/src/test/resources/META-INF/services - /META-INF/services + META-INF/services diff --git a/pom.xml b/pom.xml index f3a0a8bc30..1dd7b2c4d1 100644 --- a/pom.xml +++ b/pom.xml @@ -339,7 +339,7 @@ under the License. org.apache.rat apache-rat-plugin - 0.16.1 + 0.18 false @@ -351,75 +351,79 @@ under the License. false - 0 - - - - AL2 - Apache License 2.0 - - - Licensed to the Apache Software Foundation (ASF) under one - - - - - - Apache License 2.0 - - - + + true + + ${maven.multiModuleProjectDirectory}/tools/rat/rat-config.xml + + + Unapproved:0 + + - **/.*/** - **/*.prefs - **/*.log - **/dependency-reduced-pom.xml + **/.*/** + **/*.prefs + **/*.log + **/dependency-reduced-pom.xml - **/README.md - .git/** - .github/** + **/README.md + .git/** + .github/** - **/*.iml + **/*.iml - **/target/** - apache-maven-3.2.5/** + **/target/** + apache-maven-3.2.5/** - docs/static/font-awesome/** - docs/resources/** - docs/public/** - docs/themes/book/** - docs/assets/github.css - docs/static/js/anchor.min.js - docs/layouts/shortcodes/generated/** + docs/static/font-awesome/** + docs/resources/** + docs/public/** + docs/themes/book/** + docs/assets/github.css + docs/static/js/anchor.min.js + docs/layouts/shortcodes/generated/** - **/.idea/** + **/.idea/** - helm/flink-kubernetes-operator/crds/flinkbluegreendeployments.flink.apache.org-v1.yml - helm/flink-kubernetes-operator/crds/flinkdeployments.flink.apache.org-v1.yml - helm/flink-kubernetes-operator/crds/flinksessionjobs.flink.apache.org-v1.yml - helm/flink-kubernetes-operator/crds/flinkstatesnapshots.flink.apache.org-v1.yml - rio.yml + helm/flink-kubernetes-operator/crds/flinkbluegreendeployments.flink.apache.org-v1.yml + helm/flink-kubernetes-operator/crds/flinkdeployments.flink.apache.org-v1.yml + helm/flink-kubernetes-operator/crds/flinksessionjobs.flink.apache.org-v1.yml + helm/flink-kubernetes-operator/crds/flinkstatesnapshots.flink.apache.org-v1.yml + rio.yml - **/packaged_licenses/LICENSE.*.txt - **/licenses/LICENSE* - **/licenses-binary/LICENSE* - tools/license/NOTICE-binary_PREAMBLE.txt - + **/packaged_licenses/LICENSE.*.txt + **/licenses/LICENSE* + **/licenses-binary/LICENSE* + LICENSE.rsync-deployments + tools/license/NOTICE-binary_PREAMBLE.txt + + e2e-tests/cert-manager.yaml + @@ -449,6 +453,15 @@ under the License. org.apache.maven.plugins maven-shade-plugin + + 3.6.2 @@ -491,7 +504,7 @@ under the License. org.cyclonedx cyclonedx-maven-plugin - 2.9.0 + 2.9.1 package diff --git a/tools/rat/rat-config.xml b/tools/rat/rat-config.xml new file mode 100644 index 0000000000..790e79189b --- /dev/null +++ b/tools/rat/rat-config.xml @@ -0,0 +1,55 @@ + + + + + + + + + + Licensed to the Apache Software Foundation (ASF) under one + + + + + + +