You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2020/03/25 13:57:05 UTC
[flink-shaded] branch master updated: [FLINK-16527][build] Resolve
properties in version field
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 d898878 [FLINK-16527][build] Resolve properties in version field
d898878 is described below
commit d898878f7f5abe03bd25fbc52ce820c7f31d5791
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Wed Mar 25 14:56:56 2020 +0100
[FLINK-16527][build] Resolve properties in version field
---
flink-shaded-asm-7/pom.xml | 6 +++++
flink-shaded-guava-18/pom.xml | 6 +++++
.../flink-shaded-hadoop-2-uber/pom.xml | 6 +++++
.../flink-shaded-hadoop-2/pom.xml | 5 ++++
.../flink-shaded-jackson-2/pom.xml | 6 +++++
.../pom.xml | 6 +++++
flink-shaded-netty-4/pom.xml | 6 +++++
flink-shaded-netty-tcnative-dynamic/pom.xml | 6 +++++
flink-shaded-netty-tcnative-static/pom.xml | 6 +++++
flink-shaded-zookeeper-parent/pom.xml | 6 +++++
pom.xml | 30 ++++++++++++++++++++++
11 files changed, 89 insertions(+)
diff --git a/flink-shaded-asm-7/pom.xml b/flink-shaded-asm-7/pom.xml
index bf48eb6..b86fd95 100644
--- a/flink-shaded-asm-7/pom.xml
+++ b/flink-shaded-asm-7/pom.xml
@@ -97,6 +97,12 @@ under the License.
</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>
diff --git a/flink-shaded-guava-18/pom.xml b/flink-shaded-guava-18/pom.xml
index 999724c..b821037 100644
--- a/flink-shaded-guava-18/pom.xml
+++ b/flink-shaded-guava-18/pom.xml
@@ -77,6 +77,12 @@ under the License.
</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>
diff --git a/flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2-uber/pom.xml b/flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2-uber/pom.xml
index ec64b89..079c4e7 100644
--- a/flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2-uber/pom.xml
+++ b/flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2-uber/pom.xml
@@ -189,6 +189,12 @@ under the License.
</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/flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2/pom.xml b/flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2/pom.xml
index 78da4f0..78bcfee 100644
--- a/flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2/pom.xml
+++ b/flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2/pom.xml
@@ -975,6 +975,11 @@ under the License.
</executions>
</plugin>
+ <plugin>
+ <!-- Used to resolve variables in the 'version' tag -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ </plugin>
</plugins>
</build>
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
index 7b84783..9955e7a 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
@@ -82,6 +82,12 @@ under the License.
</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>
\ No newline at end of file
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
index 26a6201..a7e8428 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
@@ -77,6 +77,12 @@ under the License.
</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>
\ No newline at end of file
diff --git a/flink-shaded-netty-4/pom.xml b/flink-shaded-netty-4/pom.xml
index 1449c56..cf049e2 100644
--- a/flink-shaded-netty-4/pom.xml
+++ b/flink-shaded-netty-4/pom.xml
@@ -107,6 +107,12 @@ under the License.
</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>
diff --git a/flink-shaded-netty-tcnative-dynamic/pom.xml b/flink-shaded-netty-tcnative-dynamic/pom.xml
index 6927d93..7bdd8bc 100644
--- a/flink-shaded-netty-tcnative-dynamic/pom.xml
+++ b/flink-shaded-netty-tcnative-dynamic/pom.xml
@@ -179,6 +179,12 @@ under the License.
</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>
diff --git a/flink-shaded-netty-tcnative-static/pom.xml b/flink-shaded-netty-tcnative-static/pom.xml
index 2494477..0b007ee 100644
--- a/flink-shaded-netty-tcnative-static/pom.xml
+++ b/flink-shaded-netty-tcnative-static/pom.xml
@@ -103,6 +103,12 @@ under the License.
</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>
diff --git a/flink-shaded-zookeeper-parent/pom.xml b/flink-shaded-zookeeper-parent/pom.xml
index 1b1572a..fadb889 100644
--- a/flink-shaded-zookeeper-parent/pom.xml
+++ b/flink-shaded-zookeeper-parent/pom.xml
@@ -85,6 +85,12 @@ under the License.
</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>
diff --git a/pom.xml b/pom.xml
index 7887ff7..9e7be5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -196,6 +196,36 @@ under the License.
</transformers>
</configuration>
</plugin>
+
+ <plugin>
+ <!-- Used to resolve variables in the 'version' tag -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <id>flatten</id>
+ <phase>package</phase>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ <configuration>
+ <!-- The least invasive mode that effectively only resolves variables -->
+ <flattenMode>resolveCiFriendliesOnly</flattenMode>
+ <!-- By default the resulting pom is written into the modules base directory to work around MNG-6405.
+ We aren't affected, so we use the proper location. -->
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>flatten.clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>