Remove references to release and gpg as they are reused from apache parent
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/97761fa7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/97761fa7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/97761fa7 Branch: refs/heads/master Commit: 97761fa72af587d54466bb58c897b4be1d6cc31c Parents: f5c087a Author: Hadrian Zbarcea <[email protected]> Authored: Sat Jul 11 12:13:00 2015 -0400 Committer: Hadrian Zbarcea <[email protected]> Committed: Sat Jul 11 12:13:00 2015 -0400 ---------------------------------------------------------------------- parent/pom.xml | 29 ---------- usage/downstream-parent/pom.xml | 100 +---------------------------------- utils/test-support/pom.xml | 16 +++--- 3 files changed, 9 insertions(+), 136 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/97761fa7/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 3517342..03a20f4 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/incubator-brooklyn/blob/97761fa7/usage/downstream-parent/pom.xml ---------------------------------------------------------------------- diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml index a5bea45..8d544fc 100644 --- a/usage/downstream-parent/pom.xml +++ b/usage/downstream-parent/pom.xml @@ -163,10 +163,6 @@ <version>2.10.3</version> </plugin> <plugin> - <artifactId>maven-release-plugin</artifactId> - <version>2.5.2</version> - </plugin> - <plugin> <artifactId>maven-resources-plugin</artifactId> <version>2.7</version> </plugin> @@ -344,16 +340,6 @@ <printSummary>true</printSummary> </configuration> </plugin> - - <plugin> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <mavenExecutorId>forked-path</mavenExecutorId> - <useReleaseProfile>true</useReleaseProfile> - <releaseProfiles>Release</releaseProfiles> - <goals>deploy</goals> - </configuration> - </plugin> </plugins> </build> @@ -428,88 +414,6 @@ </build> </profile> - <!-- - Make release build (e.g. for Sonatype) with -PRelease - Note that a sonatype release requires signed artifacts, javadoc and source jars; - this snippet doesn't do everything, as you need to set up a key etc, - but it should get you a long way there (and prevent maven faffing). - If you don't deploy you can delete or ignore this (it has no effect unless you - enter -PRelease). - --> - <profile> - <id>Release</id> - <activation> - <property> - <name>performRelease</name> - </property> - </activation> - <properties> - <gpg.passphrase /> - </properties> - <build> - <plugins> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <inherited>true</inherited> - <executions> - <execution> - <id>attach-sources</id> - <phase>verify</phase> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <!-- disable 'use' reporting because of NPE deploying to sonatype: - http://stackoverflow.com/questions/888199/why-does-maven-install-fail-during-javadoc-generation - http://bugs.sun.com/bugdatabase/view_bug.do;jsessionid=ac084ab7f47c4e7f1df2117cecd?bug_id=5101868 --> - <use>false</use> - <links> - <link>http://download.oracle.com/javaee/6/api</link> - </links> - <keywords>true</keywords> - <author>false</author> - <quiet>true</quiet> - <aggregate>false</aggregate> - <detectLinks /> - <tags> - <tag> - <name>todo</name> - <placement>a</placement> - <head>To-do:</head> - </tag> - </tags> - </configuration> - <executions> - <execution> - <id>attach-javadocs</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-gpg-plugin</artifactId> - <executions> - <execution> - <id>sign-artifacts</id> - <phase>verify</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> <id>Bundle</id> <activation> @@ -574,7 +478,7 @@ and soon we will support artifactory. use this profile for the ASF repositories and sonatype-oss-release profile for the Sonatype OSS repositories. --> - <profile> + <!-- profile> <id>apache-release</id> <activation> <property> @@ -594,7 +498,7 @@ <url>https://repository.apache.org/content/repositories/snapshots</url> </snapshotRepository> </distributionManagement> - </profile> + </profile --> </profiles> </project> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/97761fa7/utils/test-support/pom.xml ---------------------------------------------------------------------- diff --git a/utils/test-support/pom.xml b/utils/test-support/pom.xml index 603bc4e..1fa064e 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>
