brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [06/11] incubator-brooklyn git commit: update osgi test entities pom file, and improve README
Date Thu, 20 Aug 2015 20:28:56 GMT
update osgi test entities pom file, and improve README


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

Branch: refs/heads/master
Commit: 8fe885e5f8b3110934a1985ce3e66ba0af8cab64
Parents: 51b560d
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Thu Aug 20 13:59:13 2015 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Thu Aug 20 14:41:34 2015 +0100

----------------------------------------------------------------------
 core/src/test/dependencies/osgi/README.md                     | 4 ++++
 core/src/test/dependencies/osgi/entities/pom.xml              | 2 +-
 core/src/test/dependencies/osgi/more-entities-v1/pom.xml      | 4 ++--
 .../test/dependencies/osgi/more-entities-v2-evil-twin/pom.xml | 4 ++--
 core/src/test/dependencies/osgi/more-entities-v2/pom.xml      | 7 ++++---
 5 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8fe885e5/core/src/test/dependencies/osgi/README.md
----------------------------------------------------------------------
diff --git a/core/src/test/dependencies/osgi/README.md b/core/src/test/dependencies/osgi/README.md
index ee8539b..bda2287 100644
--- a/core/src/test/dependencies/osgi/README.md
+++ b/core/src/test/dependencies/osgi/README.md
@@ -7,6 +7,10 @@ are included in source control to speed up build times
 (as these projects do not change much).  These projects are
 NOT built as part of the normal brooklyn build.
 
+To rebuild all:
+
+    for x in *entities* ; do pushd $x ; mvn clean install ; popd ; done
+
 See OsgiTestResources.java for information on the bundles.
 
 ----

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8fe885e5/core/src/test/dependencies/osgi/entities/pom.xml
----------------------------------------------------------------------
diff --git a/core/src/test/dependencies/osgi/entities/pom.xml b/core/src/test/dependencies/osgi/entities/pom.xml
index 767fc83..1bab253 100644
--- a/core/src/test/dependencies/osgi/entities/pom.xml
+++ b/core/src/test/dependencies/osgi/entities/pom.xml
@@ -36,7 +36,7 @@
         <groupId>org.apache.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
         <version>0.8.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
-        <relativePath>../../../../../../pom.xml</relativePath>
+        <relativePath>../../../../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8fe885e5/core/src/test/dependencies/osgi/more-entities-v1/pom.xml
----------------------------------------------------------------------
diff --git a/core/src/test/dependencies/osgi/more-entities-v1/pom.xml b/core/src/test/dependencies/osgi/more-entities-v1/pom.xml
index 6ee754d..75fb76a 100644
--- a/core/src/test/dependencies/osgi/more-entities-v1/pom.xml
+++ b/core/src/test/dependencies/osgi/more-entities-v1/pom.xml
@@ -36,7 +36,7 @@
         <groupId>org.apache.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
         <version>0.8.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
-        <relativePath>../../../../../../pom.xml</relativePath>
+        <relativePath>../../../../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
         <dependency>
@@ -64,7 +64,7 @@
                 <version>2.3.2</version>
                 <configuration>
                     <outputDirectory>../../../resources/brooklyn/osgi</outputDirectory>
-                    <finalName>brooklyn-test-osgi-more-entities_${version}</finalName>
+                    <finalName>brooklyn-test-osgi-more-entities_${project.version}</finalName>
                 </configuration>
             </plugin>
             <plugin>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8fe885e5/core/src/test/dependencies/osgi/more-entities-v2-evil-twin/pom.xml
----------------------------------------------------------------------
diff --git a/core/src/test/dependencies/osgi/more-entities-v2-evil-twin/pom.xml b/core/src/test/dependencies/osgi/more-entities-v2-evil-twin/pom.xml
index 6cb032a..0b01b53 100644
--- a/core/src/test/dependencies/osgi/more-entities-v2-evil-twin/pom.xml
+++ b/core/src/test/dependencies/osgi/more-entities-v2-evil-twin/pom.xml
@@ -36,7 +36,7 @@
         <groupId>org.apache.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
         <version>0.8.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
-        <relativePath>../../../../../../pom.xml</relativePath>
+        <relativePath>../../../../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
         <dependency>
@@ -69,7 +69,7 @@
                 <version>2.3.2</version>
                 <configuration>
                     <outputDirectory>../../../resources/brooklyn/osgi</outputDirectory>
-                    <finalName>brooklyn-test-osgi-more-entities_evil-twin_${version}</finalName>
+                    <finalName>brooklyn-test-osgi-more-entities_evil-twin_${project.version}</finalName>
                 </configuration>
             </plugin>
             <plugin>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8fe885e5/core/src/test/dependencies/osgi/more-entities-v2/pom.xml
----------------------------------------------------------------------
diff --git a/core/src/test/dependencies/osgi/more-entities-v2/pom.xml b/core/src/test/dependencies/osgi/more-entities-v2/pom.xml
index b512470..0b01b53 100644
--- a/core/src/test/dependencies/osgi/more-entities-v2/pom.xml
+++ b/core/src/test/dependencies/osgi/more-entities-v2/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
 
-    <groupId>org.apache.brooklyn.test.resources.osgi</groupId>
+    <groupId>org.apache.brooklyn.test.resources.osgi.evil_twin</groupId>
     <artifactId>brooklyn-test-osgi-more-entities</artifactId>
     <version>0.2.0</version>
 
@@ -36,7 +36,7 @@
         <groupId>org.apache.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
         <version>0.8.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
-        <relativePath>../../../../../../pom.xml</relativePath>
+        <relativePath>../../../../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
         <dependency>
@@ -69,7 +69,7 @@
                 <version>2.3.2</version>
                 <configuration>
                     <outputDirectory>../../../resources/brooklyn/osgi</outputDirectory>
-                    <finalName>brooklyn-test-osgi-more-entities_${version}</finalName>
+                    <finalName>brooklyn-test-osgi-more-entities_evil-twin_${project.version}</finalName>
                 </configuration>
             </plugin>
             <plugin>
@@ -78,6 +78,7 @@
                 <version>2.5.3</version>
                 <configuration>
                     <instructions>
+                        <Bundle-SymbolicName>org.apache.brooklyn.test.resources.osgi.brooklyn-test-osgi-more-entities</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
                     </instructions>
                 </configuration>


Mime
View raw message