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 2016/02/01 18:34:53 UTC
[13/51] [abbrv] brooklyn-dist git commit: Merge commit 'e430723' into
reorg2
Merge commit 'e430723' into reorg2
Newer PR's moved to the right place.
Conflicts:
brooklyn-library/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java
brooklyn-library/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java
brooklyn-library/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java
brooklyn-library/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeDriver.java
brooklyn-library/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java
brooklyn-library/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java
brooklyn-library/sandbox/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/hazelcast/hazelcast-brooklyn.xml
brooklyn-library/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java
brooklyn-library/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java
sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java
sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java
sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java
sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeDriver.java
sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java
sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java
sandbox/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/hazelcast/hazelcast-brooklyn.xml
sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java
sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeDriver.java
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java
software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/hazelcast/hazelcast-brooklyn.xml
software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java
software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastTestHelper.java
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/16b72507
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/16b72507
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/16b72507
Branch: refs/heads/master
Commit: 16b72507275fa87fe1b1b198c091acb34c27f5ed
Parents: f5c7339 29757ee
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Dec 21 12:09:30 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Dec 21 12:09:30 2015 +0000
----------------------------------------------------------------------
brooklyn-dist/.gitattributes | 6 +
brooklyn-dist/.gitignore | 32 +
brooklyn-dist/LICENSE | 455 ++++
brooklyn-dist/NOTICE | 5 +
brooklyn-dist/README.md | 21 +
brooklyn-dist/all/pom.xml | 117 +
brooklyn-dist/archetypes/quickstart/NOTES.txt | 76 +
brooklyn-dist/archetypes/quickstart/pom.xml | 232 ++
.../quickstart/src/brooklyn-sample/README.md | 73 +
.../quickstart/src/brooklyn-sample/pom.xml | 102 +
.../src/main/assembly/assembly.xml | 88 +
.../src/main/assembly/files/README.txt | 96 +
.../src/main/assembly/files/conf/logback.xml | 11 +
.../src/main/assembly/scripts/start.sh | 40 +
.../com/acme/sample/brooklyn/SampleMain.java | 81 +
.../app/ClusterWebServerDatabaseSample.java | 137 ++
.../sample/app/SingleWebServerSample.java | 32 +
.../src/main/resources/logback-custom.xml | 10 +
.../src/main/resources/sample-icon.png | Bin 0 -> 46490 bytes
.../main/resources/visitors-creation-script.sql | 35 +
.../app/SampleLocalhostIntegrationTest.java | 81 +
.../brooklyn/sample/app/SampleUnitTest.java | 69 +
.../quickstart/src/main/resources/.gitignore | 1 +
.../META-INF/maven/archetype-metadata.xml | 65 +
.../projects/integration-test-1/.gitignore | 1 +
.../integration-test-1/archetype.properties | 22 +
.../projects/integration-test-1/goal.txt | 1 +
brooklyn-dist/dist/licensing/.gitignore | 2 +
brooklyn-dist/dist/licensing/MAIN_LICENSE_ASL2 | 176 ++
brooklyn-dist/dist/licensing/README.md | 78 +
brooklyn-dist/dist/licensing/extras-files | 1 +
.../dist/licensing/licenses/binary/ASL2 | 177 ++
.../dist/licensing/licenses/binary/BSD-2-Clause | 23 +
.../dist/licensing/licenses/binary/BSD-3-Clause | 27 +
.../dist/licensing/licenses/binary/CDDL1 | 381 ++++
.../dist/licensing/licenses/binary/CDDL1.1 | 304 +++
.../dist/licensing/licenses/binary/EPL1 | 212 ++
.../dist/licensing/licenses/binary/MIT | 20 +
.../dist/licensing/licenses/binary/WTFPL | 15 +
.../dist/licensing/licenses/binary/bouncycastle | 23 +
.../dist/licensing/licenses/binary/jtidy | 53 +
.../dist/licensing/licenses/binary/jython | 27 +
.../licenses/binary/metastuff-bsd-style | 43 +
.../licenses/binary/xpp3_indiana_university | 45 +
brooklyn-dist/dist/licensing/licenses/cli/MIT | 20 +
.../dist/licensing/licenses/jsgui/BSD-2-Clause | 23 +
.../dist/licensing/licenses/jsgui/BSD-3-Clause | 27 +
brooklyn-dist/dist/licensing/licenses/jsgui/MIT | 20 +
.../dist/licensing/licenses/source/BSD-2-Clause | 23 +
.../dist/licensing/licenses/source/BSD-3-Clause | 27 +
.../dist/licensing/licenses/source/MIT | 20 +
.../dist/licensing/make-all-licenses.sh | 61 +
.../dist/licensing/make-one-license.sh | 79 +
brooklyn-dist/dist/licensing/overrides.yaml | 383 ++++
.../licensing/projects-with-custom-licenses | 2 +
brooklyn-dist/dist/pom.xml | 158 ++
.../dist/src/main/config/build-distribution.xml | 96 +
.../dist/src/main/dist/bin/.gitattributes | 3 +
brooklyn-dist/dist/src/main/dist/bin/brooklyn | 51 +
.../dist/src/main/dist/bin/brooklyn.bat | 111 +
.../dist/src/main/dist/bin/brooklyn.ps1 | 135 ++
.../dist/src/main/dist/conf/logback.xml | 14 +
brooklyn-dist/dist/src/main/license/README.md | 2 +
.../dist/src/main/license/files/DISCLAIMER | 8 +
.../dist/src/main/license/files/LICENSE | 2149 ++++++++++++++++++
.../dist/src/main/license/files/NOTICE | 5 +
.../brooklyn/cli/BaseCliIntegrationTest.java | 189 ++
.../apache/brooklyn/cli/CliIntegrationTest.java | 219 ++
brooklyn-dist/downstream-parent/pom.xml | 519 +++++
brooklyn-dist/release/.gitignore | 2 +
brooklyn-dist/release/README.md | 50 +
brooklyn-dist/release/Vagrantfile | 66 +
brooklyn-dist/release/change-version.sh | 70 +
brooklyn-dist/release/gpg-agent.conf | 2 +
brooklyn-dist/release/make-release-artifacts.sh | 257 +++
brooklyn-dist/release/print-vote-email.sh | 130 ++
.../release/pull-request-reports/Gemfile | 5 +
.../release/pull-request-reports/Gemfile.lock | 38 +
.../release/pull-request-reports/pr_report.rb | 12 +
brooklyn-dist/release/settings.xml | 29 +
brooklyn-dist/scripts/buildAndTest | 102 +
brooklyn-dist/scripts/grep-in-poms.sh | 25 +
.../scripts/release-branch-from-master | 114 +
brooklyn-dist/scripts/release-make | 83 +
release/.gitignore | 2 -
release/README.md | 50 -
release/Vagrantfile | 66 -
release/change-version.sh | 70 -
release/gpg-agent.conf | 2 -
release/make-release-artifacts.sh | 257 ---
release/print-vote-email.sh | 130 --
release/pull-request-reports/Gemfile | 5 -
release/pull-request-reports/Gemfile.lock | 38 -
release/pull-request-reports/pr_report.rb | 12 -
release/settings.xml | 29 -
usage/all/pom.xml | 117 -
usage/archetypes/quickstart/NOTES.txt | 76 -
usage/archetypes/quickstart/pom.xml | 232 --
.../quickstart/src/brooklyn-sample/README.md | 73 -
.../quickstart/src/brooklyn-sample/pom.xml | 102 -
.../src/main/assembly/assembly.xml | 88 -
.../src/main/assembly/files/README.txt | 96 -
.../src/main/assembly/files/conf/logback.xml | 11 -
.../src/main/assembly/scripts/start.sh | 40 -
.../com/acme/sample/brooklyn/SampleMain.java | 81 -
.../app/ClusterWebServerDatabaseSample.java | 137 --
.../sample/app/SingleWebServerSample.java | 32 -
.../src/main/resources/logback-custom.xml | 10 -
.../src/main/resources/sample-icon.png | Bin 46490 -> 0 bytes
.../main/resources/visitors-creation-script.sql | 35 -
.../app/SampleLocalhostIntegrationTest.java | 81 -
.../brooklyn/sample/app/SampleUnitTest.java | 69 -
.../quickstart/src/main/resources/.gitignore | 1 -
.../META-INF/maven/archetype-metadata.xml | 65 -
.../projects/integration-test-1/.gitignore | 1 -
.../integration-test-1/archetype.properties | 22 -
.../projects/integration-test-1/goal.txt | 1 -
usage/dist/licensing/.gitignore | 2 -
usage/dist/licensing/MAIN_LICENSE_ASL2 | 176 --
usage/dist/licensing/README.md | 78 -
usage/dist/licensing/extras-files | 1 -
usage/dist/licensing/licenses/binary/ASL2 | 177 --
.../dist/licensing/licenses/binary/BSD-2-Clause | 23 -
.../dist/licensing/licenses/binary/BSD-3-Clause | 27 -
usage/dist/licensing/licenses/binary/CDDL1 | 381 ----
usage/dist/licensing/licenses/binary/CDDL1.1 | 304 ---
usage/dist/licensing/licenses/binary/EPL1 | 212 --
usage/dist/licensing/licenses/binary/MIT | 20 -
usage/dist/licensing/licenses/binary/WTFPL | 15 -
.../dist/licensing/licenses/binary/bouncycastle | 23 -
usage/dist/licensing/licenses/binary/jtidy | 53 -
usage/dist/licensing/licenses/binary/jython | 27 -
.../licenses/binary/metastuff-bsd-style | 43 -
.../licenses/binary/xpp3_indiana_university | 45 -
usage/dist/licensing/licenses/cli/MIT | 20 -
.../dist/licensing/licenses/jsgui/BSD-2-Clause | 23 -
.../dist/licensing/licenses/jsgui/BSD-3-Clause | 27 -
usage/dist/licensing/licenses/jsgui/MIT | 20 -
.../dist/licensing/licenses/source/BSD-2-Clause | 23 -
.../dist/licensing/licenses/source/BSD-3-Clause | 27 -
usage/dist/licensing/licenses/source/MIT | 20 -
usage/dist/licensing/make-all-licenses.sh | 61 -
usage/dist/licensing/make-one-license.sh | 79 -
usage/dist/licensing/overrides.yaml | 383 ----
.../licensing/projects-with-custom-licenses | 2 -
usage/dist/pom.xml | 158 --
.../dist/src/main/config/build-distribution.xml | 96 -
usage/dist/src/main/dist/bin/.gitattributes | 3 -
usage/dist/src/main/dist/bin/brooklyn | 51 -
usage/dist/src/main/dist/bin/brooklyn.bat | 111 -
usage/dist/src/main/dist/bin/brooklyn.ps1 | 135 --
usage/dist/src/main/dist/conf/logback.xml | 14 -
usage/dist/src/main/license/README.md | 2 -
usage/dist/src/main/license/files/DISCLAIMER | 8 -
usage/dist/src/main/license/files/LICENSE | 2149 ------------------
usage/dist/src/main/license/files/NOTICE | 5 -
.../brooklyn/cli/BaseCliIntegrationTest.java | 189 --
.../apache/brooklyn/cli/CliIntegrationTest.java | 219 --
usage/downstream-parent/pom.xml | 519 -----
usage/jsgui/src/main/license/files/LICENSE | 482 ----
usage/jsgui/src/main/license/files/NOTICE | 5 -
usage/jsgui/src/test/license/DISCLAIMER | 8 -
usage/jsgui/src/test/license/NOTICE | 5 -
usage/scripts/buildAndTest | 102 -
usage/scripts/grep-in-poms.sh | 25 -
usage/scripts/release-branch-from-master | 114 -
usage/scripts/release-make | 83 -
167 files changed, 8825 insertions(+), 8806 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/16b72507/brooklyn-dist/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --cc brooklyn-dist/downstream-parent/pom.xml
index 0000000,6580281..c1731fd
mode 000000,100644..100644
--- a/brooklyn-dist/downstream-parent/pom.xml
+++ b/brooklyn-dist/downstream-parent/pom.xml
@@@ -1,0 -1,506 +1,519 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
+ <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">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn</artifactId>
+ <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>brooklyn-downstream-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>Brooklyn Downstream Project Parent</name>
+ <description>
+ Parent pom that can be used by downstream projects that use Brooklyn,
+ or that contribute additional functionality to Brooklyn.
+ </description>
+
+ <properties>
+ <!-- Compilation -->
+ <java.version>1.7</java.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ <!-- Testing -->
+ <testng.version>6.8.8</testng.version>
+ <surefire.version>2.18.1</surefire.version>
+ <includedTestGroups />
+ <excludedTestGroups>Integration,Acceptance,Live,Live-sanity,WIP</excludedTestGroups>
+
+ <!-- Dependencies -->
+ <brooklyn.version>0.9.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION -->
+ <jclouds.groupId>org.apache.jclouds</jclouds.groupId> <!-- JCLOUDS_GROUPID_VERSION -->
+
+ <!-- versions should match those used by Brooklyn, to avoid conflicts -->
+ <jclouds.version>1.9.1</jclouds.version> <!-- JCLOUDS_VERSION -->
+ <logback.version>1.0.7</logback.version>
+ <slf4j.version>1.6.6</slf4j.version> <!-- used for java.util.logging jul-to-slf4j interception -->
+ <guava.version>17.0</guava.version>
+ <xstream.version>1.4.7</xstream.version>
+ <jackson.version>1.9.13</jackson.version> <!-- codehaus jackson, used by brooklyn rest server -->
+ <fasterxml.jackson.version>2.4.5</fasterxml.jackson.version> <!-- more recent jackson, but not compatible with old annotations! -->
+ <jersey.version>1.19</jersey.version>
+ <httpclient.version>4.4.1</httpclient.version>
+ <commons-lang3.version>3.1</commons-lang3.version>
+ <groovy.version>2.3.7</groovy.version> <!-- Version supported by https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.1-Release-Notes -->
+ <jsr305.version>2.0.1</jsr305.version>
+ <snakeyaml.version>1.11</snakeyaml.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <!-- this would pull in all brooklyn entities and clouds;
+ you can cherry pick selected ones instead (for a smaller build) -->
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-all</artifactId>
+ <version>${brooklyn.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <!-- this gives us flexible and easy-to-use logging; just edit logback-custom.xml! -->
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-logback-xml</artifactId>
+ <version>${brooklyn.version}</version>
+ <!-- optional so that this project has logging; dependencies may redeclare or supply their own;
+ provided so that it isn't put into the assembly (as it supplies its own explicit logback.xml);
+ see Logging in the Brooklyn website/userguide for more info -->
+ <optional>true</optional>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <!-- includes testng and useful logging for tests -->
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-test-support</artifactId>
+ <version>${brooklyn.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <!-- includes org.apache.brooklyn.test.support.LoggingVerboseReporter -->
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-utils-test-support</artifactId>
+ <version>${brooklyn.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.5.4</version>
+ <configuration>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.6.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.3</version>
+ <configuration>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.8.2</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.10</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.18.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.6</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.3</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.18.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.4</version>
+ </plugin>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <versionRange>[2.4.1,)</versionRange>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <versionRange>[1.7,)</versionRange>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <versionRange>[1.3.1,)</versionRange>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <versionRange>[1.5,)</versionRange>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <versionRange>[2.8,)</versionRange>
+ <goals>
+ <goal>unpack</goal>
+ <goal>copy</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>com.github.skwakman.nodejs-maven-plugin</groupId>
+ <artifactId>nodejs-maven-plugin</artifactId>
+ <versionRange>[1.0.3,)</versionRange>
+ <goals>
+ <goal>extract</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <versionRange>[2.4,)</versionRange>
+ <goals>
+ <goal>exploded</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>.</directory>
+ <includes>
+ <include>brooklyn*.log</include>
+ <include>brooklyn*.log.*</include>
+ <include>stacktrace.log</include>
+ <include>test-output</include>
+ <include>prodDb.*</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <additionalProjectnatures>
+ <projectnature>org.maven.ide.eclipse.maven2Nature</projectnature>
+ </additionalProjectnatures>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Xms256m -Xmx512m -XX:MaxPermSize=512m</argLine>
+ <properties>
+ <property>
+ <name>listener</name>
+ <value>org.apache.brooklyn.test.support.LoggingVerboseReporter</value>
+ </property>
+ </properties>
+ <enableAssertions>true</enableAssertions>
+ <groups>${includedTestGroups}</groups>
+ <excludedGroups>${excludedTestGroups}</excludedGroups>
+ <testFailureIgnore>false</testFailureIgnore>
+ <systemPropertyVariables>
+ <verbose>-1</verbose>
+ <net.sourceforge.cobertura.datafile>${project.build.directory}/cobertura/cobertura.ser</net.sourceforge.cobertura.datafile>
+ <cobertura.user.java.nio>false</cobertura.user.java.nio>
+ </systemPropertyVariables>
+ <printSummary>true</printSummary>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+
+ <profile>
+ <id>Tests</id>
+ <activation>
+ <file> <exists>${basedir}/src/test</exists> </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>test-jar-creation</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ <configuration>
+ <forceCreation>true</forceCreation>
+ <archive combine.self="override" />
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- run Integration tests with -PIntegration -->
+ <profile>
+ <id>Integration</id>
+ <properties>
+ <includedTestGroups>Integration</includedTestGroups>
+ <excludedTestGroups>Acceptance,Live,Live-sanity,WIP</excludedTestGroups>
+ </properties>
+ </profile>
+
+ <!-- run Live tests with -PLive -->
+ <profile>
+ <id>Live</id>
+ <properties>
+ <includedTestGroups>Live,Live-sanity</includedTestGroups>
+ <excludedTestGroups>Acceptance,WIP</excludedTestGroups>
+ </properties>
+ </profile>
+
+ <!-- run Live-sanity tests with -PLive-sanity -->
+ <profile>
+ <id>Live-sanity</id>
+ <properties>
+ <includedTestGroups>Live-sanity</includedTestGroups>
+ <excludedTestGroups>Acceptance,WIP</excludedTestGroups>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>test-jar-creation</id>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>Bundle</id>
+ <activation>
+ <file>
+ <!-- NB - this is all the leaf projects, including logback-* (with no src);
+ the archetype project neatly ignores this however -->
+ <exists>${basedir}/src</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <!-- configure plugin to generate MANIFEST.MF
+ adapted from http://blog.knowhowlab.org/2010/06/osgi-tutorial-from-project-structure-to.html -->
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <supportedProjectTypes>
+ <supportedProjectType>jar</supportedProjectType>
+ </supportedProjectTypes>
+ <instructions>
- <!-- OSGi specific instruction -->
+ <!--
- By default packages containing impl and internal
- are not included in the export list. Setting an
- explicit wildcard will include all packages
- regardless of name.
- In time we should minimize our export lists to
- what is really needed.
++ Exclude packages used by Brooklyn that are not OSGi bundles. Including any
++ of the below may cause bundles to fail to load into the catalogue with
++ messages like "Unable to resolve 150.0: missing requirement [150.0]
++ osgi.wiring.package; (osgi.wiring.package=com.maxmind.geoip2)".
++ -->
++ <Import-Package>
++ !com.maxmind.geoip2.*,
++ !io.airlift.command.*,
++ !io.cloudsoft.winrm4j.*,
++ !javax.inject.*,
++ !org.apache.felix.framework.*,
++ !org.apache.http.*,
++ !org.jclouds.googlecomputeengine.*,
++ !org.osgi.jmx,
++ !org.python.*,
++ !org.reflections.*,
++ !org.w3c.tidy.*,
++ *
++ </Import-Package>
++ <!--
++ Brooklyn-Feature prefix triggers inclusion of the project's metadata in the
++ server's features list.
+ -->
- <Export-Package>brooklyn.*,org.apache.brooklyn.*</Export-Package>
- <!-- Brooklyn-Feature prefix triggers inclusion of the project's metadata in the server's features list. -->
+ <Brooklyn-Feature-Name>${project.name}</Brooklyn-Feature-Name>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- different properties used to deploy to different locations depending on profiles;
+ default is cloudsoft filesystem repo, but some sources still use cloudsoft artifactory as source
+ and soon we will support artifactory. use this profile for the ASF repositories and
+ sonatype-oss-release profile for the Sonatype OSS repositories.
+ -->
+ <!-- profile>
+ <id>apache-release</id>
+ <activation>
+ <property>
+ <name>brooklyn.deployTo</name>
+ <value>apache</value>
+ </property>
+ </activation>
+ <distributionManagement>
+ <repository>
+ <id>apache.releases.https</id>
+ <name>Apache Release Distribution Repository</name>
+ <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
+ </repository>
+ <snapshotRepository>
+ <id>apache.snapshots.https</id>
+ <name>Apache Development Snapshot Repository</name>
+ <url>https://repository.apache.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+ </profile -->
+ </profiles>
+
+ </project>