- Extended the plugin to not deploy test-jar signatures. - Added the apache release profile plugins to the test projects poms.
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/805d9430 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/805d9430 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/805d9430 Branch: refs/heads/develop Commit: 805d94302db84497d0b0e0a2eb3253198f6273bd Parents: a2becd8 Author: Christofer Dutz <christofer.d...@c-ware.de> Authored: Wed Feb 21 12:19:03 2018 +0100 Committer: Christofer Dutz <christofer.d...@c-ware.de> Committed: Wed Feb 21 12:19:03 2018 +0100 ---------------------------------------------------------------------- .../pom.xml | 3 -- .../src/it/with-plugin/pom.xml | 38 +++++++++++++++++++ .../src/it/without-plugin/pom.xml | 39 ++++++++++++++++++++ .../deploymentfilter/FilterTestJarsMojo.java | 3 +- 4 files changed, 79 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/805d9430/utils/edgent-deployment-filter-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/utils/edgent-deployment-filter-maven-plugin/pom.xml b/utils/edgent-deployment-filter-maven-plugin/pom.xml index a3ed058..64bbf7e 100644 --- a/utils/edgent-deployment-filter-maven-plugin/pom.xml +++ b/utils/edgent-deployment-filter-maven-plugin/pom.xml @@ -33,9 +33,6 @@ <name>edgent-deployment-filter-maven-plugin Maven Plugin</name> - <!-- FIXME change it to the project's website --> - <url>http://maven.apache.org</url> - <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/805d9430/utils/edgent-deployment-filter-maven-plugin/src/it/with-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/utils/edgent-deployment-filter-maven-plugin/src/it/with-plugin/pom.xml b/utils/edgent-deployment-filter-maven-plugin/src/it/with-plugin/pom.xml index b59f56f..26dc3cf 100644 --- a/utils/edgent-deployment-filter-maven-plugin/src/it/with-plugin/pom.xml +++ b/utils/edgent-deployment-filter-maven-plugin/src/it/with-plugin/pom.xml @@ -78,6 +78,44 @@ </execution> </executions> </plugin> + + <!-- Rest of the apache-release profile --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <executions> + <execution> + <id>sign-release-artifacts</id> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/805d9430/utils/edgent-deployment-filter-maven-plugin/src/it/without-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/utils/edgent-deployment-filter-maven-plugin/src/it/without-plugin/pom.xml b/utils/edgent-deployment-filter-maven-plugin/src/it/without-plugin/pom.xml index cea659b..e90f322 100644 --- a/utils/edgent-deployment-filter-maven-plugin/src/it/without-plugin/pom.xml +++ b/utils/edgent-deployment-filter-maven-plugin/src/it/without-plugin/pom.xml @@ -62,6 +62,45 @@ </execution> </executions> </plugin> + + + <!-- Rest of the apache-release profile --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <executions> + <execution> + <id>sign-release-artifacts</id> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/805d9430/utils/edgent-deployment-filter-maven-plugin/src/main/java/org/apache/edgent/plugins/deploymentfilter/FilterTestJarsMojo.java ---------------------------------------------------------------------- diff --git a/utils/edgent-deployment-filter-maven-plugin/src/main/java/org/apache/edgent/plugins/deploymentfilter/FilterTestJarsMojo.java b/utils/edgent-deployment-filter-maven-plugin/src/main/java/org/apache/edgent/plugins/deploymentfilter/FilterTestJarsMojo.java index 7e90550..0315f19 100644 --- a/utils/edgent-deployment-filter-maven-plugin/src/main/java/org/apache/edgent/plugins/deploymentfilter/FilterTestJarsMojo.java +++ b/utils/edgent-deployment-filter-maven-plugin/src/main/java/org/apache/edgent/plugins/deploymentfilter/FilterTestJarsMojo.java @@ -51,7 +51,8 @@ public class FilterTestJarsMojo // concurrent modification exceptions. List<Artifact> toBeRemovedArtifacts = new LinkedList<Artifact>(); for(Artifact artifact : project.getAttachedArtifacts()) { - if("test-jar".equals(artifact.getType())) { + if("test-jar".equals(artifact.getType()) || + ("jar.asc".equals(artifact.getType()) && "tests".equals(artifact.getClassifier()))) { toBeRemovedArtifacts.add(artifact); } }
