diff --git a/pom.xml b/pom.xml index 4defe8f2..dd122228 100644 --- a/pom.xml +++ b/pom.xml @@ -250,8 +250,9 @@ ${project.groupId}:${project.artifactId}:${project.version}:flatten -Drevision=1.2.3.4 src/it/projects - verify setup + verify + true diff --git a/src/it/mrm/repository/org/cudehaus/mojo/flatten/its/core/3.2.1/core-3.2.1.jar b/src/it/mrm/repository/org/cudehaus/mojo/flatten/its/core/3.2.1/core-3.2.1.jar new file mode 100644 index 00000000..3ce2d618 Binary files /dev/null and b/src/it/mrm/repository/org/cudehaus/mojo/flatten/its/core/3.2.1/core-3.2.1.jar differ diff --git a/src/it/projects/flatten-shaded-drp/invoker.properties b/src/it/projects/flatten-shaded-drp/invoker.properties new file mode 100644 index 00000000..f6e40a28 --- /dev/null +++ b/src/it/projects/flatten-shaded-drp/invoker.properties @@ -0,0 +1 @@ +invoker.goals=package \ No newline at end of file diff --git a/src/it/projects/flatten-shaded-drp/pom.xml b/src/it/projects/flatten-shaded-drp/pom.xml new file mode 100644 index 00000000..7a001641 --- /dev/null +++ b/src/it/projects/flatten-shaded-drp/pom.xml @@ -0,0 +1,103 @@ + + 4.0.0 + org.codehaus.mojo.flatten.its + flatten-shaded-drp + 0.0.1${rev}-SNAPSHOT + + + 3.2.1 + + + + + + com.google.guava + guava + 16.0.1 + + + org.apache.maven + maven-archiver + 2.5 + + + + + package + + + + org.codehaus.mojo + flatten-maven-plugin + + true + ossrh + true + + + + flatten + prepare-package + + flatten + + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.3.0 + + true + true + + + com.google.guava:* + + + + + + shade + package + + shade + + + + + + + + + + + foo + + + willNotBeActive + + + + + + org.codehaus.mojo.flatten.its + core + ${flatten.its.version} + + + + + + + + no-one + @repository.proxy.url@ + + + + + \ No newline at end of file diff --git a/src/it/projects/flatten-shaded-drp/src/main/java/com/example/Main.java b/src/it/projects/flatten-shaded-drp/src/main/java/com/example/Main.java new file mode 100644 index 00000000..c9cba180 --- /dev/null +++ b/src/it/projects/flatten-shaded-drp/src/main/java/com/example/Main.java @@ -0,0 +1,12 @@ +package com.example; + +import java.util.List; +import com.google.common.collect.ImmutableList; +import org.apache.maven.archiver.MavenArchiver; + +public class Main { + public static void main(String[] args) { + List l = ImmutableList.of(); + MavenArchiver a = new MavenArchiver(); + } +} \ No newline at end of file diff --git a/src/it/projects/flatten-shaded-drp/verify.groovy b/src/it/projects/flatten-shaded-drp/verify.groovy new file mode 100644 index 00000000..2935c6ba --- /dev/null +++ b/src/it/projects/flatten-shaded-drp/verify.groovy @@ -0,0 +1,38 @@ +/* + * 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. + */ +File originalPom = new File( basedir, 'pom.xml' ) +assert originalPom.exists() + +def originalProject = new XmlSlurper().parse( originalPom ) +assert 1 == originalProject.dependencies.size() +assert 2 == originalProject.dependencies.dependency.size() + +File flattendPom = new File( basedir, 'dependency-reduced-pom.xml' ) +assert flattendPom.exists() + +def flattendProject = new XmlSlurper().parse( flattendPom ) +assert 1 == flattendProject.dependencies.size() +assert 1 == flattendProject.dependencies.dependency.size() + +def archiver = flattendProject.dependencies.dependency.find { + it.groupId == 'org.apache.maven' && it.artifactId == 'maven-archiver' +} +assert '2.5' == archiver.version.text() +assert 'compile' == archiver.scope.text() + diff --git a/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java b/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java index 84e6ad83..b2dfb53a 100644 --- a/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java +++ b/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java @@ -396,6 +396,7 @@ public void execute() if ( isUpdatePomFile() ) { this.project.setPomFile( flattenedPomFile ); + this.project.setOriginalModel( flattenedPom ); } }