Remove references to release and gpg as they are reused from apache parent Backport of fix on master by Hadrian Zbarcea <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/81431ccd Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/81431ccd Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/81431ccd Branch: refs/heads/0.7.0-incubating Commit: 81431ccde6ef290aec75e55b695fd645a086ec14 Parents: cc70cc5 Author: Hadrian Zbarcea <[email protected]> Authored: Sat Jul 11 12:13:00 2015 -0400 Committer: Richard Downer <[email protected]> Committed: Wed Jul 15 08:22:09 2015 +0000 ---------------------------------------------------------------------- parent/pom.xml | 29 ----------------------------- utils/test-support/pom.xml | 16 +++++++--------- 2 files changed, 7 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/81431ccd/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 11d08af..07ccb50 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -642,22 +642,6 @@ <version>2.18.1</version> </plugin> <plugin> - <artifactId>maven-gpg-plugin</artifactId> - <version>1.6</version> - <executions> - <execution> - <id>sign-artifacts</id> - <phase>verify</phase> - <goals> - <goal>sign</goal> - </goals> - <configuration> - <executable>gpg2</executable> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-jar-plugin</artifactId> <!-- version 2.4+ seems to break eclipse integration as per https://github.com/tesla/m2eclipse-extras/issues/10 but cannot find issue on GitHub any more - 404 error --> @@ -699,19 +683,6 @@ </executions> </plugin> <plugin> - <artifactId>maven-release-plugin</artifactId> - <version>2.5.2</version> - <!-- 'release' is not used; easier just to checkout, tag, `mvn deploy` manually - with -Dbrooklyn.deployTo=TARGET ... and note we need to update docs and examples, - which is a non-maven task!) --> - <configuration> - <mavenExecutorId>forked-path</mavenExecutorId> - <useReleaseProfile>false</useReleaseProfile> - <arguments>-Dbrooklyn.deployTo=apache</arguments> - <goals>deploy</goals> - </configuration> - </plugin> - <plugin> <artifactId>maven-resources-plugin</artifactId> <version>2.7</version> </plugin> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/81431ccd/utils/test-support/pom.xml ---------------------------------------------------------------------- diff --git a/utils/test-support/pom.xml b/utils/test-support/pom.xml index f7cba63..d6d1d5c 100644 --- a/utils/test-support/pom.xml +++ b/utils/test-support/pom.xml @@ -19,15 +19,7 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <packaging>jar</packaging> - <artifactId>brooklyn-utils-test-support</artifactId> - <name>Brooklyn Utilities to Support Testing (listeners etc)</name> - - <description> - Test utility classes and methods developed for Brooklyn but not dependendent on Brooklyn or much else - </description> - <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> @@ -35,6 +27,12 @@ <relativePath>../../parent/pom.xml</relativePath> </parent> + <artifactId>brooklyn-utils-test-support</artifactId> + <name>Brooklyn Test Support Utilities</name> + <description> + Test utility classes and methods developed for Brooklyn but not dependendent on Brooklyn or much else + </description> + <dependencies> <dependency> <groupId>com.google.guava</groupId> @@ -53,5 +51,5 @@ <artifactId>slf4j-api</artifactId> </dependency> </dependencies> - + </project>
