You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2016/09/18 20:04:09 UTC
[1/7] brooklyn-server git commit: Temporary workaround until
jclouds-karaf catches up
Repository: brooklyn-server
Updated Branches:
refs/heads/master e947e929a -> ad5b4751f
Temporary workaround until jclouds-karaf catches up
jclouds-karaf uses an older version (0.3) of java-xmlbuilder from the one in jclouds (1.1).
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/1c205710
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/1c205710
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/1c205710
Branch: refs/heads/master
Commit: 1c2057100e764e0d75d0b2c878087841aed00ec4
Parents: e947e92
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Sep 12 16:44:43 2016 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Mon Sep 12 16:44:43 2016 +0300
----------------------------------------------------------------------
karaf/features/src/main/feature/feature.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1c205710/karaf/features/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index bea75a6..e84bc3f 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -246,6 +246,9 @@
</feature>
<feature name="brooklyn-locations-jclouds" version="${project.version}" description="Brooklyn Jclouds Location Targets">
+ <!-- Override jclouds provided 0.3_1 dependency - jclouds already depends on 1.1, but jclouds-karaf is not updated yet. -->
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.java-xmlbuilder/1.1_1</bundle>
+
<!--
OkHttp had OSGi support shortly in 3.0.0, but was immediately reverted in 3.0.1
https://github.com/square/okhttp/pull/2192
[7/7] brooklyn-server git commit: This closes #326
Posted by sj...@apache.org.
This closes #326
OSGi Features cleanup
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/ad5b4751
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/ad5b4751
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/ad5b4751
Branch: refs/heads/master
Commit: ad5b4751fa387b95508e78c892959d15a464dc77
Parents: 731b3e8 ae60ffe
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Sun Sep 18 21:01:51 2016 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Sun Sep 18 21:01:51 2016 +0100
----------------------------------------------------------------------
karaf/features/src/main/feature/feature.xml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ad5b4751/karaf/features/src/main/feature/feature.xml
----------------------------------------------------------------------
[3/7] brooklyn-server git commit: Prevent 'Refreshing bundles' by
loading brooklyn-launcher-common just once
Posted by sj...@apache.org.
Prevent 'Refreshing bundles' by loading brooklyn-launcher-common just once
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/ae60ffe9
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/ae60ffe9
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/ae60ffe9
Branch: refs/heads/master
Commit: ae60ffe92ccdbc8462adf29ebddef46dddd515d8
Parents: 1c20571
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Sep 12 17:07:44 2016 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Tue Sep 13 16:10:37 2016 +0300
----------------------------------------------------------------------
karaf/features/src/main/feature/feature.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ae60ffe9/karaf/features/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index e84bc3f..f8230aa 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -208,7 +208,7 @@
</feature>
<feature name="brooklyn-commands" version="${project.version}" description="Brooklyn Shell Commands">
- <bundle>mvn:org.apache.brooklyn/brooklyn-launcher-common/${project.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.brooklyn/brooklyn-launcher-common/${project.version}</bundle>
<bundle>mvn:org.apache.brooklyn/brooklyn-commands/${project.version}</bundle>
</feature>
@@ -316,7 +316,7 @@
<feature>brooklyn-core</feature>
<feature>brooklyn-server-software-all</feature>
<feature>brooklyn-locations-jclouds</feature>
- <bundle>mvn:org.apache.brooklyn/brooklyn-launcher-common/${project.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.brooklyn/brooklyn-launcher-common/${project.version}</bundle>
<bundle start-level="90">mvn:org.apache.brooklyn/brooklyn-karaf-init/${project.version}</bundle>
</feature>
[2/7] brooklyn-server git commit: Update geoip to latest version
Posted by sj...@apache.org.
Update geoip to latest version
Removes the dependency on google-http-client, depending directly on apache-httpcomponents
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e71b4d0b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e71b4d0b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e71b4d0b
Branch: refs/heads/master
Commit: e71b4d0b8d176dd16d1543466316845392e5b6a0
Parents: e947e92
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Tue Sep 13 16:10:14 2016 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Tue Sep 13 16:10:14 2016 +0300
----------------------------------------------------------------------
.../java/org/apache/brooklyn/camp/brooklyn/AppYamlTest.java | 2 +-
.../apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java | 2 +-
.../brooklyn/camp/brooklyn/ConfigInheritanceYamlTest.java | 2 +-
.../camp/brooklyn/ConfigLocationInheritanceYamlTest.java | 2 +-
.../apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java | 2 +-
.../java/org/apache/brooklyn/camp/brooklyn/ConfigYamlTest.java | 2 +-
.../brooklyn/core/mgmt/persist/XmlMementoSerializerTest.java | 2 +-
.../org/apache/brooklyn/util/core/file/ArchiveUtilsTest.java | 2 +-
karaf/features/src/main/feature/feature.xml | 1 -
launcher/pom.xml | 4 ----
parent/pom.xml | 5 -----
pom.xml | 5 ++---
.../apache/brooklyn/rest/resources/LocationResourceTest.java | 2 +-
13 files changed, 11 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e71b4d0b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AppYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AppYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AppYamlTest.java
index 098f911..6c57616 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AppYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AppYamlTest.java
@@ -31,7 +31,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.Test;
-import com.google.api.client.repackaged.com.google.common.base.Joiner;
+import com.google.common.base.Joiner;
import com.google.common.collect.Iterables;
@Test
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e71b4d0b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java
index 3a87622..a2ddf43 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java
@@ -43,7 +43,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.Test;
-import com.google.api.client.repackaged.com.google.common.base.Joiner;
+import com.google.common.base.Joiner;
import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e71b4d0b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigInheritanceYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigInheritanceYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigInheritanceYamlTest.java
index fd4472c..2ef3d52 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigInheritanceYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigInheritanceYamlTest.java
@@ -45,7 +45,7 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.api.client.repackaged.com.google.common.base.Joiner;
+import com.google.common.base.Joiner;
import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e71b4d0b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigLocationInheritanceYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigLocationInheritanceYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigLocationInheritanceYamlTest.java
index ff5dcae..55a53db 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigLocationInheritanceYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigLocationInheritanceYamlTest.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.api.client.repackaged.com.google.common.base.Joiner;
+import com.google.common.base.Joiner;
import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e71b4d0b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java
index 623ff16..c5f6652 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.api.client.repackaged.com.google.common.base.Joiner;
+import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e71b4d0b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigYamlTest.java
index 19c81d8..02d7b80 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigYamlTest.java
@@ -34,7 +34,7 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.api.client.repackaged.com.google.common.base.Joiner;
+import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e71b4d0b/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializerTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializerTest.java
index 7adb1fc..fab0059 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializerTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializerTest.java
@@ -78,7 +78,7 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.api.client.repackaged.com.google.common.base.Joiner;
+import com.google.common.base.Joiner;
import com.google.common.base.Objects;
import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableList;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e71b4d0b/core/src/test/java/org/apache/brooklyn/util/core/file/ArchiveUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/file/ArchiveUtilsTest.java b/core/src/test/java/org/apache/brooklyn/util/core/file/ArchiveUtilsTest.java
index 4224d8d..fef814d 100644
--- a/core/src/test/java/org/apache/brooklyn/util/core/file/ArchiveUtilsTest.java
+++ b/core/src/test/java/org/apache/brooklyn/util/core/file/ArchiveUtilsTest.java
@@ -37,7 +37,7 @@ import org.apache.brooklyn.util.core.file.ArchiveBuilder;
import org.apache.brooklyn.util.core.file.ArchiveUtils;
import org.apache.brooklyn.util.os.Os;
-import com.google.api.client.repackaged.com.google.common.base.Joiner;
+import com.google.common.base.Joiner;
import com.google.common.base.Charsets;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.Files;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e71b4d0b/karaf/features/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index bea75a6..2e55731 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -154,7 +154,6 @@
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kxml2/${kxml2.servicemix.version}</bundle>
<!-- TODO: don't use wrap -->
- <bundle dependency="true">wrap:mvn:com.google.http-client/google-http-client/1.18.0-rc</bundle> <!-- from geoip -->
<bundle dependency="true">wrap:mvn:com.maxmind.geoip2/geoip2/${maxmind.version}</bundle> <!-- from geoip2 -->
<bundle dependency="true">wrap:mvn:com.maxmind.db/maxmind-db/${maxmind-db.version}</bundle>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e71b4d0b/launcher/pom.xml
----------------------------------------------------------------------
diff --git a/launcher/pom.xml b/launcher/pom.xml
index 2a49bb7..3ee72ab 100644
--- a/launcher/pom.xml
+++ b/launcher/pom.xml
@@ -94,10 +94,6 @@
<artifactId>org.apache.felix.framework</artifactId>
</dependency>
<dependency>
- <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
- <artifactId>concurrentlinkedhashmap-lru</artifactId>
- </dependency>
- <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e71b4d0b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 55005bd..77f7e98 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -359,11 +359,6 @@
<version>${jopt.version}</version>
</dependency>
<dependency>
- <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
- <artifactId>concurrentlinkedhashmap-lru</artifactId>
- <version>${concurrentlinkedhashmap.version}</version>
- </dependency>
- <dependency>
<groupId>io.airlift</groupId>
<artifactId>airline</artifactId>
<version>${airline.version}</version>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e71b4d0b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index caa1d37..d9bdfc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,6 @@
<jtidy.version>r8-20060801</jtidy.version>
<opendmk_jmxremote_optional_jar.version>1.0-b01-ea</opendmk_jmxremote_optional_jar.version>
<jopt.version>4.3</jopt.version>
- <concurrentlinkedhashmap.version>1.0_jdk5</concurrentlinkedhashmap.version>
<javax-servlet.version>3.1.0</javax-servlet.version>
<javax-servlet-jsp.version>2.0</javax-servlet-jsp.version>
<jcommander.version>1.27</jcommander.version>
@@ -151,8 +150,8 @@
<commons-lang.version>2.4</commons-lang.version>
<hamcrest.version>1.1</hamcrest.version>
<jax-rs-api.version>2.0.1</jax-rs-api.version>
- <maxmind.version>0.8.1</maxmind.version>
- <maxmind-db.version>0.3.4</maxmind-db.version>
+ <maxmind.version>2.8.0-rc1</maxmind.version>
+ <maxmind-db.version>1.2.1</maxmind-db.version>
<jna.version>4.0.0</jna.version>
<winrm4j.version>0.4.0</winrm4j.version>
<karaf.version>4.0.4</karaf.version>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e71b4d0b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/LocationResourceTest.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/LocationResourceTest.java b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/LocationResourceTest.java
index c0131b2..c351f5b 100644
--- a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/LocationResourceTest.java
+++ b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/LocationResourceTest.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.google.api.client.repackaged.com.google.common.base.Joiner;
+import com.google.common.base.Joiner;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
[5/7] brooklyn-server git commit: This closes #328
Posted by sj...@apache.org.
This closes #328
Update pom SCM & Jenkins URLs
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/b0e0277c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/b0e0277c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/b0e0277c
Branch: refs/heads/master
Commit: b0e0277ca87650244c6359f6dae630d031ffd216
Parents: e947e92 d82b4b3
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Sun Sep 18 21:01:07 2016 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Sun Sep 18 21:01:07 2016 +0100
----------------------------------------------------------------------
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[4/7] brooklyn-server git commit: Update pom SCM & Jenkins URLs
Posted by sj...@apache.org.
Update pom SCM & Jenkins URLs
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d82b4b36
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d82b4b36
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d82b4b36
Branch: refs/heads/master
Commit: d82b4b367f714d01ba6bd22a18c5c1cbbcc552f6
Parents: e947e92
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Tue Sep 13 17:44:09 2016 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Tue Sep 13 17:44:09 2016 +0300
----------------------------------------------------------------------
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d82b4b36/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index caa1d37..574498a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,9 +46,9 @@
</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>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/brooklyn-server.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/brooklyn-server.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=brooklyn-server.git</url>
<tag>HEAD</tag>
</scm>
@@ -58,7 +58,7 @@
</issueManagement>
<ciManagement>
<system>Jenkins</system>
- <url>https://builds.apache.org/job/incubator-brooklyn-master-build/</url>
+ <url>https://builds.apache.org/view/Brooklyn/job/brooklyn-server-master/</url>
</ciManagement>
<mailingLists>
<mailingList>
[6/7] brooklyn-server git commit: This closes #327
Posted by sj...@apache.org.
This closes #327
Update geoip to latest version
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/731b3e8c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/731b3e8c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/731b3e8c
Branch: refs/heads/master
Commit: 731b3e8cffd8098e83f2177deedc41c0c2967c09
Parents: b0e0277 e71b4d0
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Sun Sep 18 21:01:16 2016 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Sun Sep 18 21:01:16 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/brooklyn/camp/brooklyn/AppYamlTest.java | 2 +-
.../apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java | 2 +-
.../brooklyn/camp/brooklyn/ConfigInheritanceYamlTest.java | 2 +-
.../camp/brooklyn/ConfigLocationInheritanceYamlTest.java | 2 +-
.../apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java | 2 +-
.../java/org/apache/brooklyn/camp/brooklyn/ConfigYamlTest.java | 2 +-
.../brooklyn/core/mgmt/persist/XmlMementoSerializerTest.java | 2 +-
.../org/apache/brooklyn/util/core/file/ArchiveUtilsTest.java | 2 +-
karaf/features/src/main/feature/feature.xml | 1 -
launcher/pom.xml | 4 ----
parent/pom.xml | 5 -----
pom.xml | 5 ++---
.../apache/brooklyn/rest/resources/LocationResourceTest.java | 2 +-
13 files changed, 11 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/731b3e8c/pom.xml
----------------------------------------------------------------------