You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2015/07/02 12:44:51 UTC
[1/4] incubator-brooklyn git commit: Remove unnecessary use of
snapshot repositories
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master ea1d6cba7 -> b0243f005
Remove unnecessary use of snapshot repositories
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/474f8fc5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/474f8fc5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/474f8fc5
Branch: refs/heads/master
Commit: 474f8fc59728e24b205dfad6feb321fecbeda99d
Parents: 32960be
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Sat Jun 27 09:43:29 2015 -0400
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Sat Jun 27 09:43:29 2015 -0400
----------------------------------------------------------------------
examples/pom.xml | 19 -------------------
pom.xml | 18 ------------------
usage/downstream-parent/pom.xml | 27 ---------------------------
3 files changed, 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/474f8fc5/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index c696d52..ab73620 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -36,25 +36,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <repositories>
- <!-- enable sonatype snapshots repo (only for snapshots) -->
- <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>
-
<modules>
<module>webapps</module>
<module>simple-web-cluster</module>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/474f8fc5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 48c54db..853b1fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,24 +88,6 @@
</mailingList>
</mailingLists>
- <repositories>
- <!-- enable sonatype snapshots repo (only for snapshots) -->
- <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>
- <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>
-
<properties>
<!-- Compilation -->
<java.version>1.7</java.version>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/474f8fc5/usage/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml
index 6df3ef5..5be01ff 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>
[3/4] incubator-brooklyn git commit: Merge remote-tracking branch
'upstream/master'
Posted by sj...@apache.org.
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c6dc664b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c6dc664b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c6dc664b
Branch: refs/heads/master
Commit: c6dc664b476f6e96e67e16a0e8bde1a2990b205d
Parents: 9632405 ea1d6cb
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Mon Jun 29 21:41:58 2015 -0400
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Mon Jun 29 21:41:58 2015 -0400
----------------------------------------------------------------------
.../entity/basic/AbstractApplication.java | 18 +++
.../basic/AbstractApplicationLegacyTest.java | 75 ++++++++----
.../test/entity/TestApplicationImpl.java | 2 +-
...lusterDatabaseExampleAppIntegrationTest.java | 8 +-
.../proxy/nginx/NginxRebindIntegrationTest.java | 24 ++--
.../nginx/NginxUrlMappingIntegrationTest.java | 35 +++---
.../io/brooklyn/camp/brooklyn/AppYamlTest.java | 119 +++++++++++++++++++
usage/downstream-parent/pom.xml | 2 +-
.../BrooklynEntityMirrorIntegrationTest.java | 4 +
.../vanilla-software-with-child-blueprint.yaml | 18 ++-
10 files changed, 245 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c6dc664b/usage/downstream-parent/pom.xml
----------------------------------------------------------------------
[2/4] incubator-brooklyn git commit: Add apache snapshot repository
(commented out) to archetype
Posted by sj...@apache.org.
Add apache snapshot repository (commented out) to archetype
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/9632405a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/9632405a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/9632405a
Branch: refs/heads/master
Commit: 9632405a5852df4d5855b170d56b9e602c4ad587
Parents: 474f8fc
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Mon Jun 29 21:40:49 2015 -0400
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Mon Jun 29 21:40:49 2015 -0400
----------------------------------------------------------------------
.../quickstart/src/brooklyn-sample/pom.xml | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9632405a/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 1f40c3c..0129679 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;
[4/4] incubator-brooklyn git commit: This closes #724
Posted by sj...@apache.org.
This closes #724
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b0243f00
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b0243f00
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b0243f00
Branch: refs/heads/master
Commit: b0243f005a88e4f60766e6df17d1eb409f54af2e
Parents: ea1d6cb c6dc664
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Thu Jul 2 11:30:40 2015 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Thu Jul 2 11:30:40 2015 +0100
----------------------------------------------------------------------
examples/pom.xml | 19 --------------
pom.xml | 18 -------------
.../quickstart/src/brooklyn-sample/pom.xml | 17 ++++++++++++
usage/downstream-parent/pom.xml | 27 --------------------
4 files changed, 17 insertions(+), 64 deletions(-)
----------------------------------------------------------------------