You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:43:12 UTC
[1/9] brooklyn-dist git commit: Change version to 0.7.0-incubating
Repository: brooklyn-dist
Updated Branches:
refs/heads/0.7.0-incubating [created] 839e9258a
Change version to 0.7.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/d596df96
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/d596df96
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/d596df96
Branch: refs/heads/0.7.0-incubating
Commit: d596df960a3cb90bd533c063f20be6d4cfd711db
Parents: 23a6e66
Author: Richard Downer <ri...@apache.org>
Authored: Fri Jun 26 14:10:44 2015 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Fri Jun 26 14:10:44 2015 +0000
----------------------------------------------------------------------
usage/all/pom.xml | 2 +-
usage/archetypes/quickstart/NOTES.txt | 2 +-
usage/archetypes/quickstart/pom.xml | 2 +-
usage/archetypes/quickstart/src/brooklyn-sample/pom.xml | 2 +-
usage/dist/pom.xml | 2 +-
usage/downstream-parent/pom.xml | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/d596df96/usage/all/pom.xml
----------------------------------------------------------------------
diff --git a/usage/all/pom.xml b/usage/all/pom.xml
index bc0dd00..21657df 100644
--- a/usage/all/pom.xml
+++ b/usage/all/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/d596df96/usage/archetypes/quickstart/NOTES.txt
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/NOTES.txt b/usage/archetypes/quickstart/NOTES.txt
index 41c6ec2..195a053 100644
--- a/usage/archetypes/quickstart/NOTES.txt
+++ b/usage/archetypes/quickstart/NOTES.txt
@@ -32,7 +32,7 @@ To test a build:
pushd /tmp
rm -rf brooklyn-sample
- export BV=0.7.0-SNAPSHOT # BROOKLYN_VERSION
+ export BV=0.7.0-incubating # BROOKLYN_VERSION
mvn archetype:generate \
\
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/d596df96/usage/archetypes/quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/pom.xml b/usage/archetypes/quickstart/pom.xml
index 20080f6..cb814cf 100644
--- a/usage/archetypes/quickstart/pom.xml
+++ b/usage/archetypes/quickstart/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/d596df96/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml b/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
index c5952d7..9253eb0 100644
--- a/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
+++ b/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
@@ -42,7 +42,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-downstream-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/d596df96/usage/dist/pom.xml
----------------------------------------------------------------------
diff --git a/usage/dist/pom.xml b/usage/dist/pom.xml
index e226237..5e57346 100644
--- a/usage/dist/pom.xml
+++ b/usage/dist/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/d596df96/usage/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml
index d0b93ea..6306af8 100644
--- a/usage/downstream-parent/pom.xml
+++ b/usage/downstream-parent/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-downstream-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION -->
<packaging>pom</packaging>
<parent>
@@ -50,7 +50,7 @@
<excludedTestGroups>Integration,Acceptance,Live,Live-sanity,WIP</excludedTestGroups>
<!-- Dependencies -->
- <brooklyn.version>0.7.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION -->
+ <brooklyn.version>0.7.0-incubating</brooklyn.version> <!-- BROOKLYN_VERSION -->
<!-- versions should match those used by Brooklyn, to avoid conflicts -->
<jclouds.version>1.9.0</jclouds.version>
<logback.version>1.0.7</logback.version>
[7/9] brooklyn-dist git commit: Rely on project order instead of
dependency
Posted by he...@apache.org.
Rely on project order instead of dependency
Backport of fix on master by Hadrian Zbarcea <ha...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/5e8cf964
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/5e8cf964
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/5e8cf964
Branch: refs/heads/0.7.0-incubating
Commit: 5e8cf964be4ba3579d831d5a9eff82c98080b377
Parents: 4e76aa7
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Mon Jul 13 17:37:06 2015 -0400
Committer: Richard Downer <ri...@apache.org>
Committed: Wed Jul 15 08:22:09 2015 +0000
----------------------------------------------------------------------
usage/archetypes/quickstart/pom.xml | 9 ---------
1 file changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/5e8cf964/usage/archetypes/quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/pom.xml b/usage/archetypes/quickstart/pom.xml
index 6440581..d7217b2 100644
--- a/usage/archetypes/quickstart/pom.xml
+++ b/usage/archetypes/quickstart/pom.xml
@@ -35,15 +35,6 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
- <dependencies>
- <dependency>
- <groupId>org.apache.brooklyn</groupId>
- <artifactId>brooklyn-downstream-parent</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- </dependency>
- </dependencies>
-
<build>
<plugins>
<plugin>
[9/9] brooklyn-dist git commit: Add apache snapshot repository to
quickstart archetype
Posted by he...@apache.org.
Add apache snapshot repository to quickstart archetype
Backport of fix on master by Hadrian Zbarcea <ha...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/839e9258
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/839e9258
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/839e9258
Branch: refs/heads/0.7.0-incubating
Commit: 839e9258aabb4058f3343998e02b188f9e762465
Parents: 5e8cf96
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Mon Jul 13 18:01:24 2015 -0400
Committer: Richard Downer <ri...@apache.org>
Committed: Wed Jul 15 08:22:09 2015 +0000
----------------------------------------------------------------------
usage/archetypes/quickstart/src/brooklyn-sample/pom.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/839e9258/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml b/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
index 9536d83..aef48be 100644
--- a/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
+++ b/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
@@ -50,6 +50,17 @@
<project.entry>com.acme.sample.brooklyn.SampleMain</project.entry>
</properties>
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<!-- this pulls in all brooklyn entities and clouds;
[2/9] brooklyn-dist git commit: Update downstream POM to match JDK
version
Posted by he...@apache.org.
Update downstream POM to match JDK version
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/ea1c0d28
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/ea1c0d28
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/ea1c0d28
Branch: refs/heads/0.7.0-incubating
Commit: ea1c0d2857a5edf443b43992402d25cc5818adf4
Parents: d596df9
Author: Andrew Kennedy <gr...@apache.org>
Authored: Sun Jun 28 17:22:31 2015 +0100
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Sun Jun 28 17:23:21 2015 +0100
----------------------------------------------------------------------
usage/downstream-parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/ea1c0d28/usage/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml
index 6306af8..8ebdce6 100644
--- a/usage/downstream-parent/pom.xml
+++ b/usage/downstream-parent/pom.xml
@@ -39,7 +39,7 @@
<properties>
<!-- Compilation -->
- <java.version>1.6</java.version>
+ <java.version>1.7</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
[3/9] brooklyn-dist git commit: Remove references to release and gpg
as they are reused from apache parent
Posted by he...@apache.org.
Remove references to release and gpg as they are reused from apache parent
Backport of fix on master by Hadrian Zbarcea <ha...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/4e76aa7e
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/4e76aa7e
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/4e76aa7e
Branch: refs/heads/0.7.0-incubating
Commit: 4e76aa7e1ee7e8c97170c7ae69c4c67d72196174
Parents: 9638ea5
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Sat Jul 11 12:13:00 2015 -0400
Committer: Richard Downer <ri...@apache.org>
Committed: Wed Jul 15 08:22:09 2015 +0000
----------------------------------------------------------------------
usage/downstream-parent/pom.xml | 100 +----------------------------------
1 file changed, 2 insertions(+), 98 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/4e76aa7e/usage/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml
index bd2a85d..e0ebecc 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>
[8/9] brooklyn-dist git commit: Introduce a parent/pom and prepare
for release
Posted by he...@apache.org.
Introduce a parent/pom and prepare for release
Backport of fix on master by Hadrian Zbarcea <ha...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/ed745b9f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/ed745b9f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/ed745b9f
Branch: refs/heads/0.7.0-incubating
Commit: ed745b9fdb85e500bd0195af8f1425070c28830d
Parents: 0fae663
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Mon Jul 6 22:47:05 2015 -0400
Committer: Richard Downer <ri...@apache.org>
Committed: Wed Jul 15 08:22:09 2015 +0000
----------------------------------------------------------------------
usage/all/pom.xml | 2 +-
usage/archetypes/quickstart/pom.xml | 2 +-
usage/dist/pom.xml | 2 +-
usage/downstream-parent/pom.xml | 13 +++++--------
4 files changed, 8 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/ed745b9f/usage/all/pom.xml
----------------------------------------------------------------------
diff --git a/usage/all/pom.xml b/usage/all/pom.xml
index 21657df..a20f0ac 100644
--- a/usage/all/pom.xml
+++ b/usage/all/pom.xml
@@ -32,7 +32,7 @@
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
<version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION -->
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/ed745b9f/usage/archetypes/quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/pom.xml b/usage/archetypes/quickstart/pom.xml
index cb814cf..d7217b2 100644
--- a/usage/archetypes/quickstart/pom.xml
+++ b/usage/archetypes/quickstart/pom.xml
@@ -32,7 +32,7 @@
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
<version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION -->
- <relativePath>../../../pom.xml</relativePath>
+ <relativePath>../../../parent/pom.xml</relativePath>
</parent>
<build>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/ed745b9f/usage/dist/pom.xml
----------------------------------------------------------------------
diff --git a/usage/dist/pom.xml b/usage/dist/pom.xml
index 5e57346..d803988 100644
--- a/usage/dist/pom.xml
+++ b/usage/dist/pom.xml
@@ -33,7 +33,7 @@
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
<version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION -->
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/ed745b9f/usage/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml
index c8372d0..fb90a22 100644
--- a/usage/downstream-parent/pom.xml
+++ b/usage/downstream-parent/pom.xml
@@ -20,17 +20,14 @@
<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>
- <groupId>org.apache.brooklyn</groupId>
- <artifactId>brooklyn-downstream-parent</artifactId>
- <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION -->
- <packaging>pom</packaging>
-
<parent>
- <groupId>org.sonatype.oss</groupId>
- <artifactId>oss-parent</artifactId>
- <version>9</version>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn</artifactId>
+ <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION -->
</parent>
+ <artifactId>brooklyn-downstream-parent</artifactId>
+ <packaging>pom</packaging>
<name>Brooklyn Downstream Project Parent</name>
<description>
Parent pom that can be used by downstream projects that use Brooklyn,
[6/9] brooklyn-dist git commit: More fixes to build poms in
preparation for release
Posted by he...@apache.org.
More fixes to build poms in preparation for release
Backport of fix on master by Hadrian Zbarcea <ha...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/9638ea57
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/9638ea57
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/9638ea57
Branch: refs/heads/0.7.0-incubating
Commit: 9638ea5728122655756348e009c6a947f80d261f
Parents: ed745b9
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Tue Jul 7 16:51:26 2015 -0400
Committer: Richard Downer <ri...@apache.org>
Committed: Wed Jul 15 08:22:09 2015 +0000
----------------------------------------------------------------------
usage/archetypes/quickstart/pom.xml | 9 +++++
.../quickstart/src/brooklyn-sample/pom.xml | 39 ++++++--------------
usage/downstream-parent/pom.xml | 3 +-
3 files changed, 22 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/9638ea57/usage/archetypes/quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/pom.xml b/usage/archetypes/quickstart/pom.xml
index d7217b2..6440581 100644
--- a/usage/archetypes/quickstart/pom.xml
+++ b/usage/archetypes/quickstart/pom.xml
@@ -35,6 +35,15 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-downstream-parent</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/9638ea57/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml b/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
index af5e789..9536d83 100644
--- a/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
+++ b/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
@@ -1,8 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
+ 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>
+ <parent>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-downstream-parent</artifactId>
+ <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION -->
+ </parent>
+
<groupId>com.acme.sample</groupId>
<artifactId>brooklyn-sample</artifactId>
<version>0.1.0-SNAPSHOT</version>
@@ -10,10 +17,10 @@
<name>Sample Brooklyn Project com.acme.sample:brooklyn-sample v0.1.0-SNAPSHOT</name>
<description>
- Sample optional description goes here.
- </description>
+ Sample optional description goes here.
+ </description>
-<!-- Optional metadata (commented out in this sample)
+ <!-- Optional metadata (commented out in this sample)
<url>https://github.com/sample/sample</url>
@@ -39,34 +46,10 @@
-->
- <parent>
- <groupId>org.apache.brooklyn</groupId>
- <artifactId>brooklyn-downstream-parent</artifactId>
- <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION -->
- <relativePath>../pom.xml</relativePath>
- </parent>
-
<properties>
<project.entry>com.acme.sample.brooklyn.SampleMain</project.entry>
</properties>
- <!-- enable apache snapshots repo if necessary -->
- <!--
- <repositories>
- <repository>
- <id>apache-snapshots</id>
- <name>Apache Snapshots Repository</name>
- <url>https://repository.apache.org/content/repositories/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- -->
-
<dependencies>
<dependency>
<!-- this pulls in all brooklyn entities and clouds;
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/9638ea57/usage/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml
index fb90a22..bd2a85d 100644
--- a/usage/downstream-parent/pom.xml
+++ b/usage/downstream-parent/pom.xml
@@ -24,6 +24,7 @@
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn</artifactId>
<version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION -->
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>brooklyn-downstream-parent</artifactId>
@@ -42,7 +43,7 @@
<!-- Testing -->
<testng.version>6.8.8</testng.version>
- <surefire.version>2.18</surefire.version>
+ <surefire.version>2.18.1</surefire.version>
<includedTestGroups />
<excludedTestGroups>Integration,Acceptance,Live,Live-sanity,WIP</excludedTestGroups>
[4/9] brooklyn-dist git commit: Remove unnecessary use of snapshot
repositories
Posted by he...@apache.org.
Remove unnecessary use of snapshot repositories
Backport of fix on master by Hadrian Zbarcea <ha...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/96170373
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/96170373
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/96170373
Branch: refs/heads/0.7.0-incubating
Commit: 9617037382d6ae8a14536cbbfaf43acad74b5da2
Parents: ea1c0d2
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Sat Jun 27 09:43:29 2015 -0400
Committer: Richard Downer <ri...@apache.org>
Committed: Wed Jul 15 08:22:09 2015 +0000
----------------------------------------------------------------------
usage/downstream-parent/pom.xml | 27 ---------------------------
1 file changed, 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/96170373/usage/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml
index 8ebdce6..c8372d0 100644
--- a/usage/downstream-parent/pom.xml
+++ b/usage/downstream-parent/pom.xml
@@ -107,33 +107,6 @@
</dependency>
</dependencies>
- <repositories>
- <!-- enable snapshots from sonatype -->
- <repository>
- <id>sonatype-nexus-snapshots</id>
- <name>Sonatype Nexus Snapshots</name>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <!-- enable snapshots from apache -->
- <repository>
- <id>apache-nexus-snapshots</id>
- <name>Apache Nexus Snapshots</name>
- <url>https://repository.apache.org/content/repositories/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<build>
<testSourceDirectory>src/test/java</testSourceDirectory>
<testResources>
[5/9] brooklyn-dist git commit: Add apache snapshot repository
(commented out) to archetype
Posted by he...@apache.org.
Add apache snapshot repository (commented out) to archetype
Backport of fix on master by Hadrian Zbarcea <ha...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/0fae663e
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/0fae663e
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/0fae663e
Branch: refs/heads/0.7.0-incubating
Commit: 0fae663e93080f88af09723e0b8ec80f31101165
Parents: 9617037
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Mon Jun 29 21:40:49 2015 -0400
Committer: Richard Downer <ri...@apache.org>
Committed: Wed Jul 15 08:22:09 2015 +0000
----------------------------------------------------------------------
.../quickstart/src/brooklyn-sample/pom.xml | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/0fae663e/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml b/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
index 9253eb0..af5e789 100644
--- a/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
+++ b/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
@@ -50,6 +50,23 @@
<project.entry>com.acme.sample.brooklyn.SampleMain</project.entry>
</properties>
+ <!-- enable apache snapshots repo if necessary -->
+ <!--
+ <repositories>
+ <repository>
+ <id>apache-snapshots</id>
+ <name>Apache Snapshots Repository</name>
+ <url>https://repository.apache.org/content/repositories/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ -->
+
<dependencies>
<dependency>
<!-- this pulls in all brooklyn entities and clouds;