[flink-shaded] branch master updated: [FLINK-22326][guava] Adjust artifact name and directory

[chesnay]

This is an automated email from the ASF dual-hosted git repository.

chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-shaded.git


The following commit(s) were added to refs/heads/master by this push:
     new 4782c96  [FLINK-22326][guava] Adjust artifact name and directory
4782c96 is described below

commit 4782c96be88d2b5378423f58385f07ec08565e67
Author: Chesnay Schepler <ches...@apache.org>
AuthorDate: Fri Jul 9 17:15:29 2021 +0200

    [FLINK-22326][guava] Adjust artifact name and directory
---
 {flink-shaded-guava-18 => flink-shaded-guava-30}/pom.xml                | 2 +-
 .../src/main/resources/META-INF/NOTICE                                  | 2 +-
 pom.xml                                                                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/flink-shaded-guava-18/pom.xml b/flink-shaded-guava-30/pom.xml
similarity index 98%
rename from flink-shaded-guava-18/pom.xml
rename to flink-shaded-guava-30/pom.xml
index 140df56..7ad8eb8 100644
--- a/flink-shaded-guava-18/pom.xml
+++ b/flink-shaded-guava-30/pom.xml
@@ -30,7 +30,7 @@ under the License.
     </parent>
 
     <artifactId>flink-shaded-guava</artifactId>
-    <name>flink-shaded-guava-18</name>
+    <name>flink-shaded-guava-30</name>
     <version>${guava.version}-14.0</version>
 
     <packaging>jar</packaging>
diff --git a/flink-shaded-guava-18/src/main/resources/META-INF/NOTICE 
b/flink-shaded-guava-30/src/main/resources/META-INF/NOTICE
similarity index 84%
rename from flink-shaded-guava-18/src/main/resources/META-INF/NOTICE
rename to flink-shaded-guava-30/src/main/resources/META-INF/NOTICE
index 0daf6e3..a127561 100644
--- a/flink-shaded-guava-18/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-guava-30/src/main/resources/META-INF/NOTICE
@@ -1,4 +1,4 @@
-flink-shaded-guava-18
+flink-shaded-guava-30
 Copyright 2014-2021 The Apache Software Foundation
 
 This product includes software developed at
diff --git a/pom.xml b/pom.xml
index ec7e2c2..48e4880 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@ under the License.
     <modules>
         <module>flink-shaded-force-shading</module>
         <module>flink-shaded-asm-7</module>
-        <module>flink-shaded-guava-18</module>
+        <module>flink-shaded-guava-30</module>
         <module>flink-shaded-netty-4</module>
         <module>flink-shaded-netty-tcnative-dynamic</module>
         <module>flink-shaded-jackson-parent</module>