Repository: brooklyn-ui Updated Branches: refs/heads/master 44b38eaba -> 5d64b30f1
change versions to align with brooklyn-server also add explicit dep on brooklyn test-support as it is needed for reporting Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/a4511acb Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/a4511acb Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/a4511acb Branch: refs/heads/master Commit: a4511acbba3ba761cac8fe301ab12e846ecb826b Parents: 44b38ea Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Authored: Fri Aug 3 10:46:39 2018 +0100 Committer: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Committed: Fri Aug 3 11:44:00 2018 +0100 ---------------------------------------------------------------------- modularity-server/external-modules/pom.xml | 6 +++ modularity-server/metadata-registry/pom.xml | 6 +++ modularity-server/module-api/pom.xml | 11 +++-- modularity-server/proxy/pom.xml | 8 ++- pom.xml | 62 ++++++++---------------- 5 files changed, 48 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/a4511acb/modularity-server/external-modules/pom.xml ---------------------------------------------------------------------- diff --git a/modularity-server/external-modules/pom.xml b/modularity-server/external-modules/pom.xml index ccad0fe..0204c8f 100644 --- a/modularity-server/external-modules/pom.xml +++ b/modularity-server/external-modules/pom.xml @@ -75,6 +75,12 @@ <artifactId>osgi.cmpn</artifactId> <version>${osgi.core.version}</version> </dependency> + <dependency> + <groupId>org.apache.brooklyn</groupId> + <artifactId>brooklyn-utils-test-support</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/a4511acb/modularity-server/metadata-registry/pom.xml ---------------------------------------------------------------------- diff --git a/modularity-server/metadata-registry/pom.xml b/modularity-server/metadata-registry/pom.xml index 22880b6..7005802 100644 --- a/modularity-server/metadata-registry/pom.xml +++ b/modularity-server/metadata-registry/pom.xml @@ -73,6 +73,12 @@ <artifactId>osgi.cmpn</artifactId> <version>${osgi.core.version}</version> </dependency> + <dependency> + <groupId>org.apache.brooklyn</groupId> + <artifactId>brooklyn-utils-test-support</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/a4511acb/modularity-server/module-api/pom.xml ---------------------------------------------------------------------- diff --git a/modularity-server/module-api/pom.xml b/modularity-server/module-api/pom.xml index d5290ab..ba8fd82 100644 --- a/modularity-server/module-api/pom.xml +++ b/modularity-server/module-api/pom.xml @@ -35,7 +35,7 @@ <dependencies> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <version>${servlet-api.version}</version> </dependency> <dependency> @@ -83,8 +83,13 @@ <scope>test</scope> <version>${testng.version}</version> </dependency> - - + <dependency> + <groupId>org.apache.brooklyn</groupId> + <artifactId>brooklyn-utils-test-support</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + </dependencies> <build> http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/a4511acb/modularity-server/proxy/pom.xml ---------------------------------------------------------------------- diff --git a/modularity-server/proxy/pom.xml b/modularity-server/proxy/pom.xml index c07f62d..111b323 100644 --- a/modularity-server/proxy/pom.xml +++ b/modularity-server/proxy/pom.xml @@ -40,7 +40,7 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <version>${servlet-api.version}</version> </dependency> <dependency> @@ -99,6 +99,12 @@ <version>${slf4j.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.brooklyn</groupId> + <artifactId>brooklyn-utils-test-support</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/a4511acb/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 36ef2de..79989af 100644 --- a/pom.xml +++ b/pom.xml @@ -1,23 +1,5 @@ <?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. ---> -<!-- 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 @@ -40,10 +22,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache</groupId> - <artifactId>apache</artifactId> - <version>17</version> - <relativePath></relativePath> <!-- prevent loading of ../pom.xml as the "parent" --> + <groupId>org.apache.brooklyn</groupId> + <artifactId>brooklyn-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <relativePath>../brooklyn-server/parent/</relativePath> </parent> <groupId>org.apache.brooklyn.ui</groupId> @@ -103,31 +85,29 @@ <build.version>${revision}</build.version> <build.name>Apache Brooklyn</build.name> <buildnumber-maven-plugin.version>1.4</buildnumber-maven-plugin.version> - <testng.version>6.8</testng.version> - <mockito.version>1.10.19</mockito.version> - <commons-lang3.version>3.3.2</commons-lang3.version> - <commons-codec.version>1.9</commons-codec.version> + + <!-- versions from brooklyn server which have a different var name here --> + <osgi.core.version>${org.osgi.core.version}</osgi.core.version> + <javax.ws.rs-api.version>${jax-rs-api.version}</javax.ws.rs-api.version> + <servlet-api.version>${javax-servlet.version}</servlet-api.version> + + <!-- build tools, versions not declared in brooklyn-server but they are here --> <maven-bundle-plugin.version>3.0.1</maven-bundle-plugin.version> <build-helper-maven-plugin.version>1.10</build-helper-maven-plugin.version> - <servlet-api.version>2.5</servlet-api.version> - <jetty.version>9.3.14.v20161028</jetty.version> - <slf4j.version>1.7.14</slf4j.version> - <osgi.core.version>6.0.0</osgi.core.version> - <frontend-maven-plugin.version>1.3</frontend-maven-plugin.version> - <karaf.version>4.1.2</karaf.version> - <javax.ws.rs-api.version>2.0.1</javax.ws.rs-api.version> - <cxf.version>3.1.10</cxf.version> - <fasterxml.jackson.version>2.4.5</fasterxml.jackson.version> - <node.version>v8.4.0</node.version> - <npm.version>5.4.1</npm.version> - <commons-io.version>2.4</commons-io.version> - <snakeyaml.version>1.11</snakeyaml.version> - <guava.version>18.0</guava.version> - <pax-web-extender-whiteboard.version>6.0.6</pax-web-extender-whiteboard.version> <maven-clean-plugin.version>3.0.0</maven-clean-plugin.version> <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version> <maven-resources-plugin.version>3.0.1</maven-resources-plugin.version> <maven-war-plugin.version>3.0.0</maven-war-plugin.version> + <frontend-maven-plugin.version>1.3</frontend-maven-plugin.version> + <pax-web-extender-whiteboard.version>6.0.6</pax-web-extender-whiteboard.version> + + <!-- new deps not used in brooklyn-server --> + <node.version>v8.4.0</node.version> + <npm.version>5.4.1</npm.version> + + <!-- deps from brooklyn-server deliberately overridden here (tests, don't matter so much if at different version) --> + <mockito.version>1.10.19</mockito.version> + </properties> <build>
