Repository: incubator-brooklyn Updated Branches: refs/heads/master 94db5ffa4 -> 941628524
[maven-release-plugin] prepare branch 0.7.0-M2-incubating Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/94162852 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/94162852 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/94162852 Branch: refs/heads/master Commit: 94162852417fc4def3404b8aa808282bb2a2c8d6 Parents: 94db5ff Author: Richard Downer <[email protected]> Authored: Thu Nov 6 14:04:30 2014 +0000 Committer: Richard Downer <[email protected]> Committed: Thu Nov 6 14:04:30 2014 +0000 ---------------------------------------------------------------------- api/pom.xml | 5 ++- camp/camp-base/pom.xml | 2 +- camp/camp-server/pom.xml | 2 +- camp/pom.xml | 5 ++- core/pom.xml | 2 +- examples/global-web-fabric/pom.xml | 2 +- examples/pom.xml | 5 ++- examples/simple-messaging-pubsub/pom.xml | 2 +- examples/simple-nosql-cluster/pom.xml | 5 ++- examples/simple-web-cluster/pom.xml | 2 +- examples/webapps/hello-world-sql/pom.xml | 2 +- examples/webapps/hello-world-webapp/pom.xml | 2 +- examples/webapps/pom.xml | 5 ++- locations/jclouds/pom.xml | 5 ++- policy/pom.xml | 5 ++- pom.xml | 42 +++++++++++------------- software/base/pom.xml | 5 ++- software/database/pom.xml | 5 ++- software/messaging/pom.xml | 2 +- software/monitoring/pom.xml | 2 +- software/network/pom.xml | 2 +- software/nosql/pom.xml | 2 +- software/osgi/pom.xml | 2 +- software/webapp/pom.xml | 5 ++- storage/hazelcast/pom.xml | 5 ++- usage/all/pom.xml | 5 ++- usage/archetypes/quickstart/pom.xml | 7 ++-- usage/camp/pom.xml | 5 ++- usage/cli/pom.xml | 6 ++-- usage/dist/pom.xml | 6 ++-- usage/downstream-parent/pom.xml | 23 +++++++------ usage/jsgui/pom.xml | 18 ++++------ usage/launcher/pom.xml | 6 ++-- usage/logback-includes/pom.xml | 6 ++-- usage/logback-xml/pom.xml | 6 ++-- usage/qa/pom.xml | 2 +- usage/rest-api/pom.xml | 5 ++- usage/rest-client/pom.xml | 5 ++- usage/rest-server/pom.xml | 5 ++- usage/test-support/pom.xml | 6 ++-- utils/common/pom.xml | 5 ++- utils/groovy/pom.xml | 5 ++- utils/jmx/jmxmp-ssl-agent/pom.xml | 5 ++- utils/jmx/jmxrmi-agent/pom.xml | 5 ++- utils/rest-swagger/pom.xml | 5 ++- utils/test-support/pom.xml | 5 ++- 46 files changed, 110 insertions(+), 154 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/api/pom.xml ---------------------------------------------------------------------- diff --git a/api/pom.xml b/api/pom.xml index b1dd60a..0965386 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <packaging>jar</packaging> @@ -32,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/camp/camp-base/pom.xml ---------------------------------------------------------------------- diff --git a/camp/camp-base/pom.xml b/camp/camp-base/pom.xml index 507831f..12c2b2d 100644 --- a/camp/camp-base/pom.xml +++ b/camp/camp-base/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn.camp</groupId> <artifactId>camp-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/camp/camp-server/pom.xml ---------------------------------------------------------------------- diff --git a/camp/camp-server/pom.xml b/camp/camp-server/pom.xml index 6e6ee72..01c0969 100644 --- a/camp/camp-server/pom.xml +++ b/camp/camp-server/pom.xml @@ -32,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn.camp</groupId> <artifactId>camp-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/camp/pom.xml ---------------------------------------------------------------------- diff --git a/camp/pom.xml b/camp/pom.xml index 9cdaf46..5c2428c 100644 --- a/camp/pom.xml +++ b/camp/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <packaging>pom</packaging> @@ -33,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 5145381..0ac43fa 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/examples/global-web-fabric/pom.xml ---------------------------------------------------------------------- diff --git a/examples/global-web-fabric/pom.xml b/examples/global-web-fabric/pom.xml index 16c90d9..2dbd273 100644 --- a/examples/global-web-fabric/pom.xml +++ b/examples/global-web-fabric/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.brooklyn.example</groupId> <artifactId>brooklyn-examples-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index 777e8f3..dad406a 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <packaging>pom</packaging> @@ -33,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/examples/simple-messaging-pubsub/pom.xml ---------------------------------------------------------------------- diff --git a/examples/simple-messaging-pubsub/pom.xml b/examples/simple-messaging-pubsub/pom.xml index 520094c..0ef8379 100644 --- a/examples/simple-messaging-pubsub/pom.xml +++ b/examples/simple-messaging-pubsub/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.brooklyn.example</groupId> <artifactId>brooklyn-examples-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/examples/simple-nosql-cluster/pom.xml ---------------------------------------------------------------------- diff --git a/examples/simple-nosql-cluster/pom.xml b/examples/simple-nosql-cluster/pom.xml index 848cd62..cf81cca 100644 --- a/examples/simple-nosql-cluster/pom.xml +++ b/examples/simple-nosql-cluster/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <packaging>jar</packaging> <artifactId>brooklyn-example-simple-nosql-cluster</artifactId> @@ -31,7 +30,7 @@ <parent> <groupId>org.apache.brooklyn.example</groupId> <artifactId>brooklyn-examples-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/examples/simple-web-cluster/pom.xml ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/pom.xml b/examples/simple-web-cluster/pom.xml index e484edd..42392fc 100644 --- a/examples/simple-web-cluster/pom.xml +++ b/examples/simple-web-cluster/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.brooklyn.example</groupId> <artifactId>brooklyn-examples-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/examples/webapps/hello-world-sql/pom.xml ---------------------------------------------------------------------- diff --git a/examples/webapps/hello-world-sql/pom.xml b/examples/webapps/hello-world-sql/pom.xml index cc610a8..efa09da 100644 --- a/examples/webapps/hello-world-sql/pom.xml +++ b/examples/webapps/hello-world-sql/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.brooklyn.example</groupId> <artifactId>brooklyn-examples-webapps-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/examples/webapps/hello-world-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/examples/webapps/hello-world-webapp/pom.xml b/examples/webapps/hello-world-webapp/pom.xml index c2ea589..0535bf5 100644 --- a/examples/webapps/hello-world-webapp/pom.xml +++ b/examples/webapps/hello-world-webapp/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.brooklyn.example</groupId> <artifactId>brooklyn-examples-webapps-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/examples/webapps/pom.xml ---------------------------------------------------------------------- diff --git a/examples/webapps/pom.xml b/examples/webapps/pom.xml index 3bcd0f7..220f8d2 100644 --- a/examples/webapps/pom.xml +++ b/examples/webapps/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <packaging>pom</packaging> <artifactId>brooklyn-examples-webapps-parent</artifactId> @@ -30,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn.example</groupId> <artifactId>brooklyn-examples-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/locations/jclouds/pom.xml ---------------------------------------------------------------------- diff --git a/locations/jclouds/pom.xml b/locations/jclouds/pom.xml index 319253a..5fdbbbf 100644 --- a/locations/jclouds/pom.xml +++ b/locations/jclouds/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <artifactId>brooklyn-locations-jclouds</artifactId> <packaging>jar</packaging> @@ -30,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/policy/pom.xml ---------------------------------------------------------------------- diff --git a/policy/pom.xml b/policy/pom.xml index 44b2311..a027008 100644 --- a/policy/pom.xml +++ b/policy/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <artifactId>brooklyn-policy</artifactId> <packaging>jar</packaging> @@ -30,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9003018..c1b636c 100644 --- a/pom.xml +++ b/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <packaging>pom</packaging> <parent> @@ -29,7 +28,7 @@ <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <name>Brooklyn Parent Project</name> <description> @@ -67,7 +66,8 @@ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-brooklyn.git</connection> <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-brooklyn.git</developerConnection> <url>https://git-wip-us.apache.org/repos/asf?p=incubator-brooklyn.git</url> - </scm> + <tag>0.7.0-M2-incubating</tag> + </scm> <issueManagement> <system>JIRA</system> <url>https://issues.apache.org/jira/browse/BROOKLYN</url> @@ -204,7 +204,7 @@ <!-- Release --> <!-- no passphrase by default, so we can do automated deploy builds; you can still supply your own passphrase with -Dgpg.passphrase=XXX --> - <gpg.passphrase></gpg.passphrase> + <gpg.passphrase /> </properties> <dependencyManagement> @@ -859,7 +859,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -872,7 +872,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -885,7 +885,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -898,7 +898,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -911,7 +911,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -925,7 +925,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -938,7 +938,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -951,7 +951,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -968,7 +968,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> </pluginExecutions> @@ -1028,7 +1028,7 @@ <!-- Checks for whitespace --> <!-- See http://checkstyle.sf.net/config_whitespace.html --> <module name="FileTabCharacter"> - <property name="eachLine" value="true"/> + <property name="eachLine" value="true" /> </module> </module> </checkstyleRules> @@ -1120,12 +1120,12 @@ <replacement> <xpath>/classpath/classpathentry[@path='src/main/resources' and @kind='src' and @excluding='**']/@excluding</xpath> <token>**</token> - <value></value> + <value /> </replacement> <replacement> <xpath>/classpath/classpathentry[@path='src/test/resources' and @kind='src' and @excluding='**']/@excluding</xpath> <token>**</token> - <value></value> + <value /> </replacement> </replacements> </configuration> @@ -1444,7 +1444,7 @@ </goals> <configuration> <forceCreation>true</forceCreation> - <archive combine.self="override"></archive> + <archive combine.self="override" /> </configuration> </execution> </executions> @@ -1665,8 +1665,7 @@ <copy todir="target/cobertura/coverage-classes"> <fileset erroronmissingdir="false" dir="target/classes" /> </copy> - <cobertura-instrument datafile="target/cobertura/cobertura.ser" - todir="target/test-classes"> + <cobertura-instrument datafile="target/cobertura/cobertura.ser" todir="target/test-classes"> <fileset erroronmissingdir="false" dir="target/classes"> <include name="brooklyn/**/*.class" /> <exclude name="brooklyn/**/*Test.class" /> @@ -1695,8 +1694,7 @@ <available property="gogocobertura" file="target/cobertura/cobertura.ser" /> <then> <echo message="GENERATING COBERTURA COVERAGE REPORT" /> - <cobertura-report format="xml" destdir="target/site/cobertura" - datafile="target/cobertura/cobertura.ser"> + <cobertura-report format="xml" destdir="target/site/cobertura" datafile="target/cobertura/cobertura.ser"> <fileset erroronmissingdir="false" dir="src/java" /> <fileset erroronmissingdir="false" dir="target/cobertura/dependency-sources" /> </cobertura-report> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/software/base/pom.xml ---------------------------------------------------------------------- diff --git a/software/base/pom.xml b/software/base/pom.xml index 6df7654..57d3d30 100644 --- a/software/base/pom.xml +++ b/software/base/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <packaging>jar</packaging> @@ -31,7 +30,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/software/database/pom.xml ---------------------------------------------------------------------- diff --git a/software/database/pom.xml b/software/database/pom.xml index ed6b3f7..e523e02 100644 --- a/software/database/pom.xml +++ b/software/database/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <artifactId>brooklyn-software-database</artifactId> <packaging>jar</packaging> @@ -30,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/software/messaging/pom.xml ---------------------------------------------------------------------- diff --git a/software/messaging/pom.xml b/software/messaging/pom.xml index 6f661d3..6b00ba6 100644 --- a/software/messaging/pom.xml +++ b/software/messaging/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/software/monitoring/pom.xml ---------------------------------------------------------------------- diff --git a/software/monitoring/pom.xml b/software/monitoring/pom.xml index f239bc7..80301ca 100644 --- a/software/monitoring/pom.xml +++ b/software/monitoring/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/software/network/pom.xml ---------------------------------------------------------------------- diff --git a/software/network/pom.xml b/software/network/pom.xml index 80ffb4b..3cdf9ee 100644 --- a/software/network/pom.xml +++ b/software/network/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/software/nosql/pom.xml ---------------------------------------------------------------------- diff --git a/software/nosql/pom.xml b/software/nosql/pom.xml index fdb7bc1..605be99 100644 --- a/software/nosql/pom.xml +++ b/software/nosql/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/software/osgi/pom.xml ---------------------------------------------------------------------- diff --git a/software/osgi/pom.xml b/software/osgi/pom.xml index d13efb4..c4f16b3 100644 --- a/software/osgi/pom.xml +++ b/software/osgi/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/software/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/software/webapp/pom.xml b/software/webapp/pom.xml index 72fb203..341bc91 100644 --- a/software/webapp/pom.xml +++ b/software/webapp/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <artifactId>brooklyn-software-webapp</artifactId> <packaging>jar</packaging> @@ -30,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/storage/hazelcast/pom.xml ---------------------------------------------------------------------- diff --git a/storage/hazelcast/pom.xml b/storage/hazelcast/pom.xml index a703329..c5c2e01 100644 --- a/storage/hazelcast/pom.xml +++ b/storage/hazelcast/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <artifactId>brooklyn-storage-hazelcast</artifactId> <packaging>jar</packaging> @@ -30,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/usage/all/pom.xml ---------------------------------------------------------------------- diff --git a/usage/all/pom.xml b/usage/all/pom.xml index 3016d75..d672e22 100644 --- a/usage/all/pom.xml +++ b/usage/all/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <packaging>jar</packaging> @@ -33,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/usage/archetypes/quickstart/pom.xml ---------------------------------------------------------------------- diff --git a/usage/archetypes/quickstart/pom.xml b/usage/archetypes/quickstart/pom.xml index b5715ff..85022b3 100644 --- a/usage/archetypes/quickstart/pom.xml +++ b/usage/archetypes/quickstart/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <artifactId>brooklyn-archetype-quickstart</artifactId> <packaging>maven-archetype</packaging> @@ -32,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../../pom.xml</relativePath> </parent> @@ -87,7 +86,7 @@ <exclude>*.log</exclude> </excludes> - <replacements/> + <replacements /> </configuration> </execution> <!-- would be nice to reduce the repetion below, but don't see how; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/usage/camp/pom.xml ---------------------------------------------------------------------- diff --git a/usage/camp/pom.xml b/usage/camp/pom.xml index e581969..1585b1f 100644 --- a/usage/camp/pom.xml +++ b/usage/camp/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <artifactId>brooklyn-camp</artifactId> <packaging>jar</packaging> @@ -30,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/usage/cli/pom.xml ---------------------------------------------------------------------- diff --git a/usage/cli/pom.xml b/usage/cli/pom.xml index ea7fa26..e087552 100644 --- a/usage/cli/pom.xml +++ b/usage/cli/pom.xml @@ -17,9 +17,7 @@ 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";> +<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> <artifactId>brooklyn-cli</artifactId> <packaging>jar</packaging> @@ -32,7 +30,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/usage/dist/pom.xml ---------------------------------------------------------------------- diff --git a/usage/dist/pom.xml b/usage/dist/pom.xml index 23be653..56812f8 100644 --- a/usage/dist/pom.xml +++ b/usage/dist/pom.xml @@ -17,9 +17,7 @@ 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";> +<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> <packaging>jar</packaging> @@ -34,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/usage/downstream-parent/pom.xml ---------------------------------------------------------------------- diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml index 9bd08ed..be50095 100644 --- a/usage/downstream-parent/pom.xml +++ b/usage/downstream-parent/pom.xml @@ -17,13 +17,12 @@ 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";> +<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> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-downstream-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <packaging>pom</packaging> <name>Brooklyn Downstream Project Parent</name> @@ -45,7 +44,7 @@ <excludedTestGroups>Integration,Acceptance,Live,Live-sanity,WIP</excludedTestGroups> <!-- Dependencies --> - <brooklyn.version>0.7.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION --> + <brooklyn.version>0.7.0-M3-incubating-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION --> <!-- versions should match those used by Brooklyn, to avoid conflicts --> <jclouds.version>1.8.0</jclouds.version> <logback.version>1.0.7</logback.version> @@ -218,7 +217,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -231,7 +230,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -244,7 +243,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -257,7 +256,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -271,7 +270,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -284,7 +283,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -297,7 +296,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> </pluginExecutions> @@ -426,7 +425,7 @@ </property> </activation> <properties> - <gpg.passphrase></gpg.passphrase> + <gpg.passphrase /> </properties> <build> <plugins> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/usage/jsgui/pom.xml ---------------------------------------------------------------------- diff --git a/usage/jsgui/pom.xml b/usage/jsgui/pom.xml index 598ee61..283f13b 100644 --- a/usage/jsgui/pom.xml +++ b/usage/jsgui/pom.xml @@ -17,9 +17,7 @@ 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";> +<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> <packaging>war</packaging> @@ -34,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> @@ -421,14 +419,10 @@ </goals> <configuration> <target> - <gzip src="${project.build.webapp}/assets/css/styles.min.css" - destfile="${project.build.webapp}/assets/css/styles.min.css.gz"/> - <gzip src="${project.build.webapp}/assets/css/brooklyn.css" - destfile="${project.build.webapp}/assets/css/brooklyn.css.gz"/> - <gzip src="${project.build.webapp}/assets/js/gui.all.min.js" - destfile="${project.build.webapp}/assets/js/gui.all.min.js.gz"/> - <gzip src="${project.build.webapp}/assets/js/libs/require.js" - destfile="${project.build.webapp}/assets/js/libs/require.js.gz"/> + <gzip src="${project.build.webapp}/assets/css/styles.min.css" destfile="${project.build.webapp}/assets/css/styles.min.css.gz" /> + <gzip src="${project.build.webapp}/assets/css/brooklyn.css" destfile="${project.build.webapp}/assets/css/brooklyn.css.gz" /> + <gzip src="${project.build.webapp}/assets/js/gui.all.min.js" destfile="${project.build.webapp}/assets/js/gui.all.min.js.gz" /> + <gzip src="${project.build.webapp}/assets/js/libs/require.js" destfile="${project.build.webapp}/assets/js/libs/require.js.gz" /> </target> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/usage/launcher/pom.xml ---------------------------------------------------------------------- diff --git a/usage/launcher/pom.xml b/usage/launcher/pom.xml index 7a872fa..275fecd 100644 --- a/usage/launcher/pom.xml +++ b/usage/launcher/pom.xml @@ -17,9 +17,7 @@ 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";> +<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> <artifactId>brooklyn-launcher</artifactId> <packaging>jar</packaging> @@ -33,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/usage/logback-includes/pom.xml ---------------------------------------------------------------------- diff --git a/usage/logback-includes/pom.xml b/usage/logback-includes/pom.xml index aca98e2..0de0550 100644 --- a/usage/logback-includes/pom.xml +++ b/usage/logback-includes/pom.xml @@ -17,9 +17,7 @@ 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";> +<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> <artifactId>brooklyn-logback-includes</artifactId> <packaging>jar</packaging> @@ -34,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/usage/logback-xml/pom.xml ---------------------------------------------------------------------- diff --git a/usage/logback-xml/pom.xml b/usage/logback-xml/pom.xml index a0cd758..bf5eb7a 100644 --- a/usage/logback-xml/pom.xml +++ b/usage/logback-xml/pom.xml @@ -17,9 +17,7 @@ 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";> +<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> <artifactId>brooklyn-logback-xml</artifactId> <packaging>jar</packaging> @@ -40,7 +38,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/usage/qa/pom.xml ---------------------------------------------------------------------- diff --git a/usage/qa/pom.xml b/usage/qa/pom.xml index e236eed..62cbe61 100644 --- a/usage/qa/pom.xml +++ b/usage/qa/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/usage/rest-api/pom.xml ---------------------------------------------------------------------- diff --git a/usage/rest-api/pom.xml b/usage/rest-api/pom.xml index f0369e4..1782eff 100644 --- a/usage/rest-api/pom.xml +++ b/usage/rest-api/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <artifactId>brooklyn-rest-api</artifactId> <packaging>jar</packaging> @@ -30,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/usage/rest-client/pom.xml ---------------------------------------------------------------------- diff --git a/usage/rest-client/pom.xml b/usage/rest-client/pom.xml index 9aadae7..45bd465 100644 --- a/usage/rest-client/pom.xml +++ b/usage/rest-client/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <artifactId>brooklyn-rest-client</artifactId> <packaging>jar</packaging> @@ -30,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/usage/rest-server/pom.xml ---------------------------------------------------------------------- diff --git a/usage/rest-server/pom.xml b/usage/rest-server/pom.xml index 6f0e388..251e924 100644 --- a/usage/rest-server/pom.xml +++ b/usage/rest-server/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <artifactId>brooklyn-rest-server</artifactId> <packaging>jar</packaging> @@ -30,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/usage/test-support/pom.xml ---------------------------------------------------------------------- diff --git a/usage/test-support/pom.xml b/usage/test-support/pom.xml index 9eceafa..065a3f5 100644 --- a/usage/test-support/pom.xml +++ b/usage/test-support/pom.xml @@ -17,9 +17,7 @@ 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";> +<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> <artifactId>brooklyn-test-support</artifactId> <name>Brooklyn Test Support</name> @@ -29,7 +27,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/utils/common/pom.xml ---------------------------------------------------------------------- diff --git a/utils/common/pom.xml b/utils/common/pom.xml index d45ceb0..f35c343 100644 --- a/utils/common/pom.xml +++ b/utils/common/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <packaging>jar</packaging> @@ -32,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/utils/groovy/pom.xml ---------------------------------------------------------------------- diff --git a/utils/groovy/pom.xml b/utils/groovy/pom.xml index 791e23c..8daa2a2 100644 --- a/utils/groovy/pom.xml +++ b/utils/groovy/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <packaging>jar</packaging> @@ -32,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/utils/jmx/jmxmp-ssl-agent/pom.xml ---------------------------------------------------------------------- diff --git a/utils/jmx/jmxmp-ssl-agent/pom.xml b/utils/jmx/jmxmp-ssl-agent/pom.xml index 989cddd..ccc161c 100644 --- a/utils/jmx/jmxmp-ssl-agent/pom.xml +++ b/utils/jmx/jmxmp-ssl-agent/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <packaging>jar</packaging> @@ -33,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/utils/jmx/jmxrmi-agent/pom.xml ---------------------------------------------------------------------- diff --git a/utils/jmx/jmxrmi-agent/pom.xml b/utils/jmx/jmxrmi-agent/pom.xml index d76aa32..0cc1516 100644 --- a/utils/jmx/jmxrmi-agent/pom.xml +++ b/utils/jmx/jmxrmi-agent/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <packaging>jar</packaging> @@ -33,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/utils/rest-swagger/pom.xml ---------------------------------------------------------------------- diff --git a/utils/rest-swagger/pom.xml b/utils/rest-swagger/pom.xml index a88a0b1..daa3176 100644 --- a/utils/rest-swagger/pom.xml +++ b/utils/rest-swagger/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <packaging>jar</packaging> @@ -32,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94162852/utils/test-support/pom.xml ---------------------------------------------------------------------- diff --git a/utils/test-support/pom.xml b/utils/test-support/pom.xml index e2a6d30..bd2a114 100644 --- a/utils/test-support/pom.xml +++ b/utils/test-support/pom.xml @@ -17,8 +17,7 @@ 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";> +<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> <packaging>jar</packaging> @@ -32,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-M3-incubating-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent>
