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 2015/08/19 17:45:07 UTC
[1/2] incubator-brooklyn git commit: Skip Maven install for the OSGi
test bundles
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master fb6a4a1d0 -> 9e80f3311
Skip Maven install for the OSGi test bundles
These cannot be installed into a repository and uploaded to Nexus as
they do not use the same version number as Brooklyn. They have been
breaking our Jenkins CI builds as Nexus refuses to accept
non-SNAPSHOT-versioned artifacts into the snapshot repository. We would
also likely encounter versioning conflicts for release, too.
This change sets `maven.install.skip` on the affected modules so they
are not installed into the local repository, therefore Jenkins will not
attempt to deploy them into the remote repository.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/320bed45
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/320bed45
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/320bed45
Branch: refs/heads/master
Commit: 320bed451249fdb0f123f3df5a4da0470761458b
Parents: fb6a4a1
Author: Richard Downer <ri...@apache.org>
Authored: Wed Aug 19 15:49:13 2015 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Wed Aug 19 15:49:13 2015 +0100
----------------------------------------------------------------------
utils/test-bundles/entities/pom.xml | 5 +++++
utils/test-bundles/more-entities-v1/pom.xml | 6 +++++-
utils/test-bundles/more-entities-v2-evil-twin/pom.xml | 5 +++++
utils/test-bundles/more-entities-v2/pom.xml | 5 +++++
4 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/320bed45/utils/test-bundles/entities/pom.xml
----------------------------------------------------------------------
diff --git a/utils/test-bundles/entities/pom.xml b/utils/test-bundles/entities/pom.xml
index 027b0c8..90f5c0b 100644
--- a/utils/test-bundles/entities/pom.xml
+++ b/utils/test-bundles/entities/pom.xml
@@ -38,6 +38,11 @@
<version>0.8.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
+
+ <properties>
+ <maven.install.skip>true</maven.install.skip>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.brooklyn</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/320bed45/utils/test-bundles/more-entities-v1/pom.xml
----------------------------------------------------------------------
diff --git a/utils/test-bundles/more-entities-v1/pom.xml b/utils/test-bundles/more-entities-v1/pom.xml
index 5b5e855..87407ee 100644
--- a/utils/test-bundles/more-entities-v1/pom.xml
+++ b/utils/test-bundles/more-entities-v1/pom.xml
@@ -55,7 +55,11 @@
<version>${brooklyn.version}</version>
</dependency>
</dependencies>
-
+
+ <properties>
+ <maven.install.skip>true</maven.install.skip>
+ </properties>
+
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/320bed45/utils/test-bundles/more-entities-v2-evil-twin/pom.xml
----------------------------------------------------------------------
diff --git a/utils/test-bundles/more-entities-v2-evil-twin/pom.xml b/utils/test-bundles/more-entities-v2-evil-twin/pom.xml
index 5db9c8b..287b106 100644
--- a/utils/test-bundles/more-entities-v2-evil-twin/pom.xml
+++ b/utils/test-bundles/more-entities-v2-evil-twin/pom.xml
@@ -38,6 +38,11 @@
<version>0.8.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
+
+ <properties>
+ <maven.install.skip>true</maven.install.skip>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.brooklyn</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/320bed45/utils/test-bundles/more-entities-v2/pom.xml
----------------------------------------------------------------------
diff --git a/utils/test-bundles/more-entities-v2/pom.xml b/utils/test-bundles/more-entities-v2/pom.xml
index d066557..23d4002 100644
--- a/utils/test-bundles/more-entities-v2/pom.xml
+++ b/utils/test-bundles/more-entities-v2/pom.xml
@@ -38,6 +38,11 @@
<version>0.8.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
+
+ <properties>
+ <maven.install.skip>true</maven.install.skip>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.brooklyn</groupId>
[2/2] incubator-brooklyn git commit: This closes #851
Posted by he...@apache.org.
This closes #851
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/9e80f331
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/9e80f331
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/9e80f331
Branch: refs/heads/master
Commit: 9e80f3311f5594fab2a134bc1f44c8ed650c5f27
Parents: fb6a4a1 320bed4
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Aug 19 16:44:51 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Aug 19 16:44:51 2015 +0100
----------------------------------------------------------------------
utils/test-bundles/entities/pom.xml | 5 +++++
utils/test-bundles/more-entities-v1/pom.xml | 6 +++++-
utils/test-bundles/more-entities-v2-evil-twin/pom.xml | 5 +++++
utils/test-bundles/more-entities-v2/pom.xml | 5 +++++
4 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------