Repository: beam Updated Branches: refs/heads/master cfc0a9955 -> cc12fd378
[BEAM-1092] Replace hyphens in artifactId with dots in shading relocations Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/2b55e079 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/2b55e079 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/2b55e079 Branch: refs/heads/master Commit: 2b55e0798f44e3fa644e7df1eaab43898ecf9c46 Parents: 03d7809 Author: Aviem Zur <[email protected]> Authored: Tue Mar 14 08:09:06 2017 +0200 Committer: Davor Bonaci <[email protected]> Committed: Tue Mar 14 12:47:36 2017 -0700 ---------------------------------------------------------------------- pom.xml | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/2b55e079/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d9065a3..7183264 100644 --- a/pom.xml +++ b/pom.xml @@ -1337,14 +1337,16 @@ <relocations> <relocation> <pattern>com.google.common</pattern> + <!--suppress MavenModelInspection --> <shadedPattern> - org.apache.beam.${project.artifactId}.repackaged.com.google.common + org.apache.${renderedArtifactId}.repackaged.com.google.common </shadedPattern> </relocation> <relocation> <pattern>com.google.thirdparty</pattern> + <!--suppress MavenModelInspection --> <shadedPattern> - org.apache.beam.${project.artifactId}.repackaged.com.google.thirdparty + org.apache.${renderedArtifactId}.repackaged.com.google.thirdparty </shadedPattern> </relocation> </relocations> @@ -1446,6 +1448,32 @@ </filesets> </configuration> </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>3.0.0</version> + <executions> + <execution> + <id>render-artifact-id</id> + <goals> + <goal>regex-properties</goal> + </goals> + <phase>prepare-package</phase> + <configuration> + <regexPropertySettings> + <regexPropertySetting> + <name>renderedArtifactId</name> + <regex>[^A-Za-z0-9]</regex> + <replacement>.</replacement> + <value>${project.artifactId}</value> + <failIfNoMatch>false</failIfNoMatch> + </regexPropertySetting> + </regexPropertySettings> + </configuration> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> @@ -1507,6 +1535,10 @@ </dependencies> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> </plugin>
