WEB-5220 - Update libraries for dotCMS and MaxMind

aquent · Sep 25, 2017 · 6a7e142 · 6a7e142
1 parent 9013c25
commit 6a7e142
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -12,10 +12,10 @@ repositories {
 }
 
 dependencies {
-	compile('com.dotcms:dotcms:3.6.1') { transitive = true }
-	compile('com.maxmind.geoip2:geoip2:2.3.1')
-	compile('com.fasterxml.jackson.core:jackson-core:2.5.3')
-	compile('com.fasterxml.jackson.core:jackson-annotations:2.5.0')
+	compile('com.dotcms:dotcms:4.1.1') { transitive = true }
+	compile('com.maxmind.geoip2:geoip2:2.9.0')
+	compile('com.fasterxml.jackson.core:jackson-core:2.8.8')
+	compile('com.fasterxml.jackson.core:jackson-annotations:2.8.0')
 	provided('javax.servlet:servlet-api:2.5')
 }
 
@@ -36,7 +36,6 @@ jar {
 		instruction 'Bundle-Description', 'Aquent GeoLocation Plugin'
 		instruction 'Bundle-DocURL', 'http://www.aquent.com'
 		instruction 'Bundle-Activator', 'com.aquent.viewtools.GeoIPActivator'
-		instruction 'Bundle-ClassPath', '.', 'lib/maxmindgeoip.jar'
 		instruction 'DynamicImport-Package', '*'
 		instruction 'Import-Package', '!org.springframework.*', '!com.maxmind.*', '*;version=0'
 		instruction 'Embed-Dependency', 'geoip2', 'jackson-core', 'jackson-annotations'

diff --git a/build/.gitignore b/build/.gitignore
@@ -0,0 +1 @@
+/com/
diff --git a/build/libs/dotcms-plugins-geolocation-2.1.0-SNAPSHOT.jar b/build/libs/dotcms-plugins-geolocation-2.1.0-SNAPSHOT.jar
diff --git a/src/main/java/com/aquent/viewtools/GeoIPActivator.java b/src/main/java/com/aquent/viewtools/GeoIPActivator.java
@@ -1,8 +1,9 @@
 package com.aquent.viewtools;
 
-import com.dotcms.repackage.org.osgi.framework.BundleContext;
 import com.dotmarketing.osgi.GenericBundleActivator;
 
+import org.osgi.framework.BundleContext;
+
 /**
  * @author cfalzone
  *