Merge pull request #269 from 52North/dev

Merge dev branch
52North · Feb 4, 2019 · 3f15429 · 3f15429
2 parents daba4f0 + 01d66cd
commit 3f15429
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 33 deletions.
diff --git a/52n-wps-io-geotools/pom.xml b/52n-wps-io-geotools/pom.xml
@@ -25,14 +25,6 @@
 			<name>Open Source Geospatial Foundation Repository</name>
 			<url>http://download.osgeo.org/webdav/geotools/</url>
 		</repository>
-		<repository>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<id>opengeo</id>
-			<name>OpenGeo Maven Repository</name>
-			<url>http://repo.opengeo.org</url>
-		</repository>
 	</repositories>
 	<build>
 		<resources>

diff --git a/52n-wps-io-impl/pom.xml b/52n-wps-io-impl/pom.xml
@@ -17,14 +17,6 @@
 			<name>Open Source Geospatial Foundation Repository</name>
 			<url>http://download.osgeo.org/webdav/geotools/</url>
 		</repository>
-		<repository>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<id>opengeo</id>
-			<name>OpenGeo Maven Repository</name>
-			<url>http://repo.opengeo.org</url>
-		</repository>
 	</repositories>
 	<build>
 		<plugins>

diff --git a/52n-wps-io/pom.xml b/52n-wps-io/pom.xml
@@ -17,14 +17,6 @@
 			<name>Open Source Geospatial Foundation Repository</name>
 			<url>http://download.osgeo.org/webdav/geotools/</url>
 		</repository>
-		<repository>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<id>opengeo</id>
-			<name>OpenGeo Maven Repository</name>
-			<url>http://repo.opengeo.org</url>
-		</repository>
 	</repositories>
 
 	<licenses>

diff --git a/NOTICE b/NOTICE
@@ -51,6 +51,8 @@ This project includes:
   AOP alliance under Public Domain
   Apache Commons Exec under Apache License, Version 2.0
   Apache Commons Lang under The Apache Software License, Version 2.0
+  Apache HttpClient under Apache License, Version 2.0
+  Apache HttpCore under Apache License, Version 2.0
   API interfaces under Lesser General Public License (LGPL)
   ArcGrid datasource module under Lesser General Public License (LGPL)
   authentication under GNU GENERAL PUBLIC LICENSE Version 2, June 1991
@@ -102,7 +104,6 @@ This project includes:
   HSQLDB under HSQLDB License
   htmlparser under The MIT License
   HttpClient under Apache License
-  HttpCore under Apache License
   ibatis-sqlmap under The Apache Software License, Version 2.0
   Image I/O-Extensions - Custom Streams under GNU Lesser General Public License, version 3 or later (LGPL)
   Image I/O-Extensions - Improved TIFF Plugin under BSD License

diff --git a/pom.xml b/pom.xml
@@ -62,11 +62,6 @@
 				<enabled>true</enabled>
 			</snapshots>
 		</repository>
-		<repository>
-			<id>OpenGEO</id>
-			<name>opengeo repository</name>
-			<url>http://repo.opengeo.org</url>
-		</repository>
 	</repositories>
 	<build>
 		<pluginManagement>
@@ -416,13 +411,12 @@
 			<dependency>
 				<groupId>org.apache.httpcomponents</groupId>
 				<artifactId>httpclient</artifactId>
-				<version>4.2.1</version>
-				<scope>compile</scope>
+				<version>4.5.6</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.httpcomponents</groupId>
 				<artifactId>httpcore</artifactId>
-				<version>4.2.1</version>
+				<version>4.4.10</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.derby</groupId>