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 <svetoslav.ney...@cloudsoftcorp.com> Authored: Tue Sep 13 16:10:14 2016 +0300 Committer: Svetoslav Neykov <svetoslav.ney...@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;