This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-paimon-shade.git
The following commit(s) were added to refs/heads/main by this push:
new d2c13f2 [guava] add guava shade module (#2)
d2c13f2 is described below
commit d2c13f232fce5f309d12ee4fc4e4e8dab6a001db
Author: Kerwin <[email protected]>
AuthorDate: Wed Mar 22 11:39:27 2023 +0800
[guava] add guava shade module (#2)
---
.github/workflows/ci.yml | 6 +-
paimon-shade-guava-30/pom.xml | 96 ++++++++++++++++++++++
.../src/main/resources/META-INF/NOTICE | 10 +++
pom.xml | 33 +-------
4 files changed, 111 insertions(+), 34 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b8895c8..bff41ca 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,8 +43,4 @@ jobs:
-DaltDeploymentRepository=validation_repository::default::file:${{
env.MVN_VALIDATION_DIR }} \
| tee ${{ env.MVN_BUILD_OUTPUT_FILE }}
- - name: Check licensing
- run: |
- ./mvnw ${MVN_COMMON_OPTIONS} exec:java@check-licensing -N \
- -Dexec.args="${{ env.MVN_BUILD_OUTPUT_FILE }} $(pwd) ${{
env.MVN_VALIDATION_DIR }}" \
- -Dlog4j.configurationFile=file://$(pwd)/tools/ci/log4j.properties
\ No newline at end of file
+ # TODO Add check licensing
diff --git a/paimon-shade-guava-30/pom.xml b/paimon-shade-guava-30/pom.xml
new file mode 100644
index 0000000..31fc3a6
--- /dev/null
+++ b/paimon-shade-guava-30/pom.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-shade</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>paimon-shade-guava-30</artifactId>
+ <name>paimon-shade-guava-30</name>
+ <version>${guava.version}-1.0</version>
+
+ <packaging>jar</packaging>
+
+ <properties>
+ <guava.version>30.1.1-jre</guava.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ <exclusions>
+ <exclusion>
+ <!-- this dependency is actually empty and appears to be
some weird legacy artifact -->
+ <groupId>com.google.guava</groupId>
+ <artifactId>listenablefuture</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>shade-paimon</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+
<createDependencyReducedPom>true</createDependencyReducedPom>
+
<dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation>
+ <artifactSet>
+ <includes>
+ <include>com.google.guava:*</include>
+ </includes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>com.google</pattern>
+
<shadedPattern>${shading.prefix}.guava30.com.google</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <!-- Used to resolve variables in the 'version' tag -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/paimon-shade-guava-30/src/main/resources/META-INF/NOTICE
b/paimon-shade-guava-30/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..6c23d82
--- /dev/null
+++ b/paimon-shade-guava-30/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,10 @@
+paimon-shade-guava-30
+Copyright 2023-2023 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This project bundles the following dependencies under the Apache Software
License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+- com.google.guava:guava:30.1.1-jre
+- com.google.guava:failureaccess:1.0.1
diff --git a/pom.xml b/pom.xml
index 4e413d7..2e58196 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,10 @@ under the License.
</pluginRepository>
</pluginRepositories>
+ <modules>
+ <module>paimon-shade-guava-30</module>
+ </modules>
+
<properties>
<shading.prefix>org.apache.paimon.shade</shading.prefix>
</properties>
@@ -291,35 +295,6 @@ under the License.
</excludes>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>3.1.0</version>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>check-license</id>
- <!-- manually called -->
- <phase>none</phase>
- <goals>
- <goal>java</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
-
<mainClass>org.apache.flink.tools.ci.licensecheck.LicenseChecker</mainClass>
- <includePluginDependencies>true</includePluginDependencies>
-
<includeProjectDependencies>false</includeProjectDependencies>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-ci-tools</artifactId>
- <version>1.17-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </plugin>
</plugins>
</build>
