You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2015/07/14 18:53:22 UTC
[06/13] incubator-brooklyn git commit: More fixes to build poms in
preparation for release
More fixes to build poms in preparation for release
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f5c087a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f5c087a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f5c087a9
Branch: refs/heads/master
Commit: f5c087a9515f3154c1c1eadb0e4e712ce0e9dfca
Parents: f4ecf0e
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Tue Jul 7 16:51:26 2015 -0400
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Tue Jul 7 16:51:26 2015 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
software/nosql/pom.xml | 22 +++++++++++
usage/archetypes/quickstart/pom.xml | 9 +++++
.../quickstart/src/brooklyn-sample/pom.xml | 39 ++++++--------------
usage/downstream-parent/pom.xml | 3 +-
5 files changed, 45 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f5c087a9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 784a78a..8c31787 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
<module>storage/hazelcast</module>
<module>usage/all</module>
- <!-- module>usage/archetypes/quickstart</module -->
+ <module>usage/archetypes/quickstart</module>
<module>usage/camp</module>
<module>usage/cli</module>
<module>usage/dist</module>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f5c087a9/software/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/software/nosql/pom.xml b/software/nosql/pom.xml
index 3e6da5a..a1f7944 100644
--- a/software/nosql/pom.xml
+++ b/software/nosql/pom.xml
@@ -295,4 +295,26 @@
</plugins>
</pluginManagement>
</build>
+
+ <profiles>
+ <profile>
+ <id>defaultProfile</id>
+ <activation>
+ <property><name>!brooklyn.cloudtest</name></property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/CassandraFabricTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f5c087a9/usage/archetypes/quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/pom.xml b/usage/archetypes/quickstart/pom.xml
index 3f20411..4f0b107 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/incubator-brooklyn/blob/f5c087a9/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 0129679..7e2e528 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.8.0-SNAPSHOT</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.8.0-SNAPSHOT</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/incubator-brooklyn/blob/f5c087a9/usage/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml
index 267d5ce..a5bea45 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.8.0-SNAPSHOT</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>