You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/08/20 13:41:41 UTC

[1/2] incubator-brooklyn git commit: Skip Maven deploy for the OSGi test bundles

Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master 147f9ec44 -> d70091b0c


Skip Maven deploy for the OSGi test bundles

Like 320bed4, but uses a different property (that one didn't work).

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.deploy.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/a6db7bca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a6db7bca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a6db7bca

Branch: refs/heads/master
Commit: a6db7bca2301b9d2663e095bebab3791dfeefac3
Parents: 147f9ec
Author: Richard Downer <ri...@apache.org>
Authored: Thu Aug 20 11:03:04 2015 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Thu Aug 20 11:08:40 2015 +0100

----------------------------------------------------------------------
 utils/test-bundles/entities/pom.xml                   | 1 +
 utils/test-bundles/more-entities-v1/pom.xml           | 1 +
 utils/test-bundles/more-entities-v2-evil-twin/pom.xml | 1 +
 utils/test-bundles/more-entities-v2/pom.xml           | 1 +
 4 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a6db7bca/utils/test-bundles/entities/pom.xml
----------------------------------------------------------------------
diff --git a/utils/test-bundles/entities/pom.xml b/utils/test-bundles/entities/pom.xml
index 90f5c0b..9e78c37 100644
--- a/utils/test-bundles/entities/pom.xml
+++ b/utils/test-bundles/entities/pom.xml
@@ -41,6 +41,7 @@
 
     <properties>
         <maven.install.skip>true</maven.install.skip>
+        <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a6db7bca/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 87407ee..a498082 100644
--- a/utils/test-bundles/more-entities-v1/pom.xml
+++ b/utils/test-bundles/more-entities-v1/pom.xml
@@ -58,6 +58,7 @@
 
     <properties>
         <maven.install.skip>true</maven.install.skip>
+        <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
 
     <build>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a6db7bca/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 287b106..0794ed1 100644
--- a/utils/test-bundles/more-entities-v2-evil-twin/pom.xml
+++ b/utils/test-bundles/more-entities-v2-evil-twin/pom.xml
@@ -41,6 +41,7 @@
 
     <properties>
         <maven.install.skip>true</maven.install.skip>
+        <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a6db7bca/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 23d4002..7eed44b 100644
--- a/utils/test-bundles/more-entities-v2/pom.xml
+++ b/utils/test-bundles/more-entities-v2/pom.xml
@@ -41,6 +41,7 @@
 
     <properties>
         <maven.install.skip>true</maven.install.skip>
+        <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
 
     <dependencies>


[2/2] incubator-brooklyn git commit: This closes #855

Posted by al...@apache.org.
This closes #855


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d70091b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d70091b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d70091b0

Branch: refs/heads/master
Commit: d70091b0c51d0078756e5c37a7e3a205f4215afa
Parents: 147f9ec a6db7bc
Author: Aled Sage <al...@gmail.com>
Authored: Thu Aug 20 12:42:05 2015 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Aug 20 12:42:05 2015 +0100

----------------------------------------------------------------------
 utils/test-bundles/entities/pom.xml                   | 1 +
 utils/test-bundles/more-entities-v1/pom.xml           | 1 +
 utils/test-bundles/more-entities-v2-evil-twin/pom.xml | 1 +
 utils/test-bundles/more-entities-v2/pom.xml           | 1 +
 4 files changed, 4 insertions(+)
----------------------------------------------------------------------