brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [27/71] [abbrv] incubator-brooklyn git commit: [SERVER] simple pom.xml updates post-reorg
Date Wed, 23 Dec 2015 11:06:50 GMT
[SERVER] simple pom.xml updates post-reorg


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

Branch: refs/heads/master
Commit: c6ad9cf69f942c169f9a5dd19f621d3491e6a752
Parents: 3d79300
Author: John McCabe <john@johnmccabe.net>
Authored: Wed Dec 16 14:08:16 2015 +0000
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Mon Dec 21 16:43:33 2015 +0000

----------------------------------------------------------------------
 brooklyn-server/camp/pom.xml           |   1 +
 brooklyn-server/karaf/pom.xml          |   2 +-
 brooklyn-server/launcher/pom.xml       |   2 +-
 brooklyn-server/parent/pom.xml         |   2 +-
 brooklyn-server/pom.xml                | 237 ++++++++++++++++++++++++++++
 brooklyn-server/server-cli/pom.xml     |   2 +-
 brooklyn-server/test-framework/pom.xml |   2 +-
 brooklyn-server/test-support/pom.xml   |   2 +-
 8 files changed, 244 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c6ad9cf6/brooklyn-server/camp/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/pom.xml b/brooklyn-server/camp/pom.xml
index 1f6b60e..bcce5ff 100644
--- a/brooklyn-server/camp/pom.xml
+++ b/brooklyn-server/camp/pom.xml
@@ -39,6 +39,7 @@
     <modules>
         <module>camp-base</module>
         <module>camp-server</module>
+        <module>camp-brooklyn</module>
     </modules>
 
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c6ad9cf6/brooklyn-server/karaf/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-server/karaf/pom.xml b/brooklyn-server/karaf/pom.xml
index ea14e91..1014be4 100644
--- a/brooklyn-server/karaf/pom.xml
+++ b/brooklyn-server/karaf/pom.xml
@@ -26,7 +26,7 @@
 
   <parent>
     <groupId>org.apache.brooklyn</groupId>
-    <artifactId>brooklyn</artifactId>
+    <artifactId>brooklyn-server</artifactId>
     <version>0.9.SPLITWIP-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
     <relativePath>../pom.xml</relativePath>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c6ad9cf6/brooklyn-server/launcher/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-server/launcher/pom.xml b/brooklyn-server/launcher/pom.xml
index 25c1248..7585dee 100644
--- a/brooklyn-server/launcher/pom.xml
+++ b/brooklyn-server/launcher/pom.xml
@@ -32,7 +32,7 @@
         <groupId>org.apache.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
         <version>0.9.SPLITWIP-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c6ad9cf6/brooklyn-server/parent/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-server/parent/pom.xml b/brooklyn-server/parent/pom.xml
index c8e75d6..b63d73a 100644
--- a/brooklyn-server/parent/pom.xml
+++ b/brooklyn-server/parent/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.brooklyn</groupId>
-        <artifactId>brooklyn</artifactId>
+        <artifactId>brooklyn-server</artifactId>
         <version>0.9.SPLITWIP-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c6ad9cf6/brooklyn-server/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-server/pom.xml b/brooklyn-server/pom.xml
new file mode 100644
index 0000000..96e5b64
--- /dev/null
+++ b/brooklyn-server/pom.xml
@@ -0,0 +1,237 @@
+<?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</groupId>
+        <artifactId>apache</artifactId>
+        <version>17</version>
+    </parent>
+
+    <groupId>org.apache.brooklyn</groupId>
+    <artifactId>brooklyn-server</artifactId>
+    <version>0.9.SPLITWIP-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+    <packaging>pom</packaging>
+
+    <name>Brooklyn Server Root</name>
+    <description>
+        Brooklyn Server project root, serving as the ancestor POM for all projects --
+        declaring versions, profiles, and the modules to build
+    </description>
+    <url>https://brooklyn.apache.org/</url>
+    <inceptionYear>2012</inceptionYear>
+
+    <developers>
+        <!-- TODO update with PMC members and committers -->
+    </developers>
+
+    <scm>
+        <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>
+        <tag>HEAD</tag>
+    </scm>
+
+    <issueManagement>
+        <system>JIRA</system>
+        <url>https://issues.apache.org/jira/browse/BROOKLYN</url>
+    </issueManagement>
+    <ciManagement>
+        <system>Jenkins</system>
+        <url>https://builds.apache.org/job/incubator-brooklyn-master-build/</url>
+    </ciManagement>
+    <mailingLists>
+        <mailingList>
+            <name>Brooklyn Developer List</name>
+            <subscribe>dev-subscribe@brooklyn.apache.org</subscribe>
+            <unsubscribe>dev-unsubscribe@brooklyn.apache.org</unsubscribe>
+            <post>dev@brooklyn.apache.org</post>
+            <archive>
+                http://mail-archives.apache.org/mod_mbox/brooklyn-dev/
+            </archive>
+        </mailingList>
+    </mailingLists>
+
+    <properties>
+        <brooklyn.version>0.9.SPLITWIP-SNAPSHOT</brooklyn.version>  <!-- BROOKLYN_VERSION
-->
+
+        <!-- Compilation -->
+        <java.version>1.7</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+        <!-- Testing -->
+        <assertj.version>2.2.0</assertj.version> <!-- v 2.2.0 is being used
as v 3.20 introduces Java8 dependencies-->
+        <cobertura.plugin.version>2.7</cobertura.plugin.version>
+        <surefire.version>2.18.1</surefire.version>
+        <plantuml.version>6121</plantuml.version>
+        <ant.version>1.8.4</ant.version>
+        <includedTestGroups />
+        <excludedTestGroups>Integration,Acceptance,Live,WIP,Broken</excludedTestGroups>
+        <surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
+
+        <!-- Dependencies -->
+        <jclouds.groupId>org.apache.jclouds</jclouds.groupId> <!-- JCLOUDS_GROUPID_VERSION
-->
+
+        <!-- These dependencies also appear in usage/downstream-parent/pom.xml -
+           - please synchronise versions between these two pom files -->
+        <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>
+
+        <!-- Ordinary dependencies -->
+        <testng.version>6.8.8</testng.version>
+        <mockito.version>1.10.8</mockito.version>
+        <swagger.version>1.5.3</swagger.version>
+        <jansi.version>1.2.1</jansi.version>
+        <gson.version>2.3</gson.version>
+        <ivy.version>2.2.0</ivy.version>
+        <mx4j.version>3.0.1</mx4j.version>
+        <bouncycastle.version>1.49</bouncycastle.version>
+        <sshj.version>0.8.1</sshj.version>
+        <felix.framework.version>4.4.0</felix.framework.version>
+        <reflections.version>0.9.9-RC1</reflections.version>
+        <jetty.version>9.2.13.v20150730</jetty.version>
+        <jetty-schemas.version>3.1.M0</jetty-schemas.version>
+        <airline.version>0.6</airline.version>
+        <mockwebserver.version>20121111</mockwebserver.version>
+        <freemarker.version>2.3.22</freemarker.version>
+        <commons-io.version>2.4</commons-io.version>
+        <hazelcast.version>3.0</hazelcast.version>
+        <jsonPath.version>2.0.0</jsonPath.version>
+        <commons-compress.version>1.4</commons-compress.version>
+        <qpid.version>0.20</qpid.version>
+        <mongodb.version>3.0.3</mongodb.version>
+        <riak.version>1.4.0</riak.version>
+        <maven-war-plugin.version>2.4</maven-war-plugin.version>
+        <validation-api.version>1.1.0.Final</validation-api.version>
+        <geronimo-jms_1.1_spec.version>1.1.1</geronimo-jms_1.1_spec.version>
+        <geronimo-jta_1.1_spec.version>1.1.1</geronimo-jta_1.1_spec.version>
+        <sleepycat-je.version>5.0.34</sleepycat-je.version>
+        <org.marre.smsj.version>1.0.0-20051126</org.marre.smsj.version>
+        <mysql-connector-java.version>5.1.18</mysql-connector-java.version>
+        <hadoop.version>1.0.2</hadoop.version>
+        <commons-cli.version>1.2</commons-cli.version>
+        <postgresql.version>9.1-901.jdbc4</postgresql.version>
+        <activemq.version>5.10.0</activemq.version>
+        <rabbitmq-version>2.8.7</rabbitmq-version>
+        <kafka.version>0.8.2.1</kafka.version>
+        <storm.version>0.8.2</storm.version>
+        <redis.version>1.5.2</redis.version>
+        <astyanax.version>1.56.24</astyanax.version>
+        <jcouchdb.version>0.11.0-1</jcouchdb.version>
+        <solr.version>4.7.0</solr.version>
+        <jtidy.version>r8-20060801</jtidy.version>
+        <opendmk_jmxremote_optional_jar.version>1.0-b01-ea</opendmk_jmxremote_optional_jar.version>
+        <resteasy.version>3.0.8.Final</resteasy.version>
+        <maven-dependency-plugin.version>2.8</maven-dependency-plugin.version>
+        <jopt.version>4.3</jopt.version>
+        <concurrentlinkedhashmap.version>1.0_jdk5</concurrentlinkedhashmap.version>
+        <maven-replacer-plugin.version>1.5.2</maven-replacer-plugin.version>
+        <nodejs-maven-plugin.version>1.0.3</nodejs-maven-plugin.version>
+        <nodejs-maven-binaries.version>0.10.25</nodejs-maven-binaries.version>
+        <jasmine-maven-plugin.version>1.3.1.5</jasmine-maven-plugin.version>
+        <requirejs-maven-plugin.version>2.0.0</requirejs-maven-plugin.version>
+        <maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
+        <javax-servlet.version>3.1.0</javax-servlet.version>
+        <jcommander.version>1.27</jcommander.version>
+        <xml-apis.version>1.0.b2</xml-apis.version>
+        <jsr250-api.version>1.0</jsr250-api.version>
+        <guice.version>3.0</guice.version>
+        <javax-inject.version>1</javax-inject.version>
+        <aopalliance.version>1.0</aopalliance.version>
+        <commons-configuration.version>1.7</commons-configuration.version>
+        <commons-lang.version>2.4</commons-lang.version>
+        <hamcrest.version>1.1</hamcrest.version>
+        <jsr311-api.version>1.1.1</jsr311-api.version>
+        <maxmind.version>0.8.1</maxmind.version>
+        <jna.version>4.0.0</jna.version>
+        <winrm4j.version>0.1.0</winrm4j.version>
+        <coverage.target>${working.dir}</coverage.target>
+
+        <!-- Transitive dependencies, declared explicitly to avoid version mismatch -->
+        <clojure.version>1.4.0</clojure.version>
+        <zookeeper.version>3.3.4</zookeeper.version>
+        <ring-core.version>1.1.5</ring-core.version>
+        <clj-time.version>0.4.1</clj-time.version>
+        <commons-codec.version>1.9</commons-codec.version>
+        <log4j.version>1.2.17</log4j.version>
+        <commons-logging.version>1.2</commons-logging.version>
+        <jline.version>2.12</jline.version>
+        <jsonSmart.version>2.1.1</jsonSmart.version>
+        <minidev.asm.version>1.0.2</minidev.asm.version>
+        <commons-beanutils.version>1.9.1</commons-beanutils.version>
+        <commons-collections.version>3.2.1</commons-collections.version>
+
+        <!-- Compilation -->
+    </properties>
+
+    <modules>
+        <module>parent</module>
+
+        <module>api</module>
+        <module>camp</module>
+        <module>core</module>
+        <module>policy</module>
+
+        <module>locations/jclouds</module>
+
+        <module>software/base</module>
+        <module>software/winrm</module>
+
+        <module>storage/hazelcast</module>
+
+        <module>server-cli</module>
+        <module>launcher</module>
+        <module>logging/logback-includes</module>
+        <module>logging/logback-xml</module>
+        <module>rest/rest-api</module>
+        <module>rest/rest-client</module>
+        <module>rest/rest-server</module>
+        <module>test-framework</module>
+        <module>test-support</module>
+
+        <module>utils/common</module>
+        <module>utils/groovy</module>
+        <module>utils/jmx/jmxmp-ssl-agent</module>
+        <module>utils/jmx/jmxrmi-agent</module>
+        <module>utils/test-support</module>
+        <module>utils/rest-swagger</module>
+
+        <module>karaf</module>
+
+        <module>utils/rt-osgi</module>
+        <module>utils/rt-felix</module>
+
+    </modules>
+
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c6ad9cf6/brooklyn-server/server-cli/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-server/server-cli/pom.xml b/brooklyn-server/server-cli/pom.xml
index 6d94808..531b1fe 100644
--- a/brooklyn-server/server-cli/pom.xml
+++ b/brooklyn-server/server-cli/pom.xml
@@ -31,7 +31,7 @@
         <groupId>org.apache.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
         <version>0.9.SPLITWIP-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c6ad9cf6/brooklyn-server/test-framework/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-server/test-framework/pom.xml b/brooklyn-server/test-framework/pom.xml
index cd27389..aa1bc35 100644
--- a/brooklyn-server/test-framework/pom.xml
+++ b/brooklyn-server/test-framework/pom.xml
@@ -25,7 +25,7 @@
         <artifactId>brooklyn-parent</artifactId>
         <groupId>org.apache.brooklyn</groupId>
         <version>0.9.SPLITWIP-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c6ad9cf6/brooklyn-server/test-support/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-server/test-support/pom.xml b/brooklyn-server/test-support/pom.xml
index fb16b90..e326117 100644
--- a/brooklyn-server/test-support/pom.xml
+++ b/brooklyn-server/test-support/pom.xml
@@ -28,7 +28,7 @@
 		<groupId>org.apache.brooklyn</groupId>
 		<artifactId>brooklyn-parent</artifactId>
 		<version>0.9.SPLITWIP-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
-		<relativePath>../../parent/pom.xml</relativePath>
+		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 
     <dependencies>


Mime
View raw message