You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2019/04/16 10:26:18 UTC
[camel] branch master updated: CAMEL-13386: Maven Flatten plugin
refinements
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new c348cb6 CAMEL-13386: Maven Flatten plugin refinements
c348cb6 is described below
commit c348cb6ca68265dcf7ca94ba3943d384e69d0e11
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Mon Apr 15 22:13:58 2019 +0200
CAMEL-13386: Maven Flatten plugin refinements
This makes sure that Maven Flatten plugin is run in all profiles not
just for `release` and changes the `properties` element processing to
`keep` in contrast to the previous setting (`expand`) it should not
replace property placeholders with expanded properties that might
contain values specific to the machine the build is running.
Also makes sure that the distribution archives do not hold the
`.flattened-pom.xml` file.
---
apache-camel/src/main/descriptors/src.xml | 1 +
apache-camel/src/main/descriptors/unix-bin.xml | 1 +
apache-camel/src/main/descriptors/windows-bin.xml | 1 +
pom.xml | 83 +++++++++--------------
4 files changed, 34 insertions(+), 52 deletions(-)
diff --git a/apache-camel/src/main/descriptors/src.xml b/apache-camel/src/main/descriptors/src.xml
index f32e427..c2162a1 100644
--- a/apache-camel/src/main/descriptors/src.xml
+++ b/apache-camel/src/main/descriptors/src.xml
@@ -54,6 +54,7 @@
<exclude>**/cobertura.ser</exclude>
<exclude>**/node_modules/**</exclude>
+ <exclude>**/.flattened-pom.xml</exclude>
</excludes>
</fileSet>
diff --git a/apache-camel/src/main/descriptors/unix-bin.xml b/apache-camel/src/main/descriptors/unix-bin.xml
index 4d4eab3..616959b 100644
--- a/apache-camel/src/main/descriptors/unix-bin.xml
+++ b/apache-camel/src/main/descriptors/unix-bin.xml
@@ -49,6 +49,7 @@
<exclude>**/target/*</exclude>
<exclude>**/*.ser</exclude>
<exclude>**/*.log</exclude>
+ <exclude>**/.flattened-pom.xml</exclude>
</excludes>
<lineEnding>unix</lineEnding>
</fileSet>
diff --git a/apache-camel/src/main/descriptors/windows-bin.xml b/apache-camel/src/main/descriptors/windows-bin.xml
index bf6eee7..0a80974 100644
--- a/apache-camel/src/main/descriptors/windows-bin.xml
+++ b/apache-camel/src/main/descriptors/windows-bin.xml
@@ -49,6 +49,7 @@
<exclude>**/target/*</exclude>
<exclude>**/*.ser</exclude>
<exclude>**/*.log</exclude>
+ <exclude>**/.flattened-pom.xml</exclude>
</excludes>
<lineEnding>dos</lineEnding>
</fileSet>
diff --git a/pom.xml b/pom.xml
index b7a3e9b..50fb0d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,6 +162,15 @@
<build>
<defaultGoal>install</defaultGoal>
+
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <version>1.1.0</version>
+ </plugin>
+ </plugins>
+
<pluginManagement>
<plugins>
<plugin>
@@ -326,6 +335,28 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.1.0</version>
+ <executions>
+ <execution>
+ <id>default-cli</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ <configuration>
+ <updatePomFile>true</updatePomFile>
+ <pomElements>
+ <build>keep</build>
+ <dependencyManagement>keep</dependencyManagement>
+ <description>keep</description>
+ <name>keep</name>
+ <parent>expand</parent>
+ <pluginManagement>keep</pluginManagement>
+ <profiles>remove</profiles>
+ <properties>keep</properties>
+ </pomElements>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
@@ -620,32 +651,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>flatten-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>default-cli</id>
- <phase>process-resources</phase>
- <goals>
- <goal>flatten</goal>
- </goals>
- <configuration>
- <updatePomFile>true</updatePomFile>
- <pomElements>
- <build>keep</build>
- <dependencyManagement>keep</dependencyManagement>
- <description>keep</description>
- <name>keep</name>
- <parent>expand</parent>
- <pluginManagement>keep</pluginManagement>
- <profiles>remove</profiles>
- <properties>expand</properties>
- </pomElements>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>
@@ -730,32 +735,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>flatten-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>default-cli</id>
- <phase>process-resources</phase>
- <goals>
- <goal>flatten</goal>
- </goals>
- <configuration>
- <updatePomFile>true</updatePomFile>
- <pomElements>
- <build>keep</build>
- <dependencyManagement>keep</dependencyManagement>
- <description>keep</description>
- <name>keep</name>
- <parent>expand</parent>
- <pluginManagement>keep</pluginManagement>
- <profiles>remove</profiles>
- <properties>expand</properties>
- </pomElements>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>