- Update to 0.40.1

3 files changed, 48 insertions, 48 deletions

diff --git a/astro/osmosis/Makefile b/astro/osmosis/Makefile
index 434dc5bb8afd..1ecb98ce27a5 100644
--- a/astro/osmosis/Makefile
+++ b/astro/osmosis/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	osmosis
-PORTVERSION=	0.39
+PORTVERSION=	0.40.1
 CATEGORIES=	astro java
 MASTER_SITES=	http://bretth.dev.openstreetmap.org/osmosis-build/
 EXTRACT_SUFX=	.tgz
@@ -24,13 +24,13 @@ SUB_FILES=	osmosis
 
 JAVAJARDIR_REL=	 ${JAVAJARDIR:C,${PREFIX}/?,,}
 JARFILES=	aopalliance-1.0.jar \
-		commons-codec-1.4.jar \
-		commons-compress-1.0.jar \
+		commons-codec-1.5.jar \
+		commons-compress-1.2.jar \
 		commons-dbcp-1.4.jar \
 		commons-logging-1.1.1.jar \
 		commons-pool-1.5.4.jar \
 		jpf-1.5.jar \
-		mysql-connector-java-5.1.10.jar \
+		mysql-connector-java-5.1.18.jar \
 		osmosis-apidb-${PORTVERSION}.jar \
 		osmosis-areafilter-${PORTVERSION}.jar \
 		osmosis-core-${PORTVERSION}.jar \
@@ -45,20 +45,20 @@ JARFILES=	aopalliance-1.0.jar \
 		osmosis-tagfilter-${PORTVERSION}.jar \
 		osmosis-xml-${PORTVERSION}.jar \
 		osmpbf-1.1.1-754a33af.jar \
-		plexus-classworlds-2.2.2.jar \
+		plexus-classworlds-2.4.jar \
 		postgis-jdbc-1.3.3.jar \
-		postgresql-8.4-701.jdbc4.jar \
-		protobuf-java-2.3.0.jar \
-		spring-aop-3.0.3.RELEASE.jar \
-		spring-asm-3.0.3.RELEASE.jar \
-		spring-beans-3.0.3.RELEASE.jar \
-		spring-context-3.0.3.RELEASE.jar \
-		spring-core-3.0.3.RELEASE.jar \
-		spring-expression-3.0.3.RELEASE.jar \
-		spring-jdbc-3.0.3.RELEASE.jar \
-		spring-tx-3.0.3.RELEASE.jar \
-		stax2-api-3.0.2.jar \
-		woodstox-core-lgpl-4.0.3.jar \
+		postgresql-9.0-801.jdbc4.jar \
+		protobuf-java-2.4.1.jar \
+		spring-aop-3.0.6.RELEASE.jar \
+		spring-asm-3.0.6.RELEASE.jar \
+		spring-beans-3.0.6.RELEASE.jar \
+		spring-context-3.0.6.RELEASE.jar \
+		spring-core-3.0.6.RELEASE.jar \
+		spring-expression-3.0.6.RELEASE.jar \
+		spring-jdbc-3.0.6.RELEASE.jar \
+		spring-tx-3.0.6.RELEASE.jar \
+		stax2-api-3.1.1.jar \
+		woodstox-core-lgpl-4.1.2.jar \
 		xercesImpl-2.9.1.jar
 
 CONFFILES=	plexus.conf
diff --git a/astro/osmosis/distinfo b/astro/osmosis/distinfo
index f0d6f93776f5..4e5671ddad2d 100644
--- a/astro/osmosis/distinfo
+++ b/astro/osmosis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (osmosis-0.39.tgz) = 8143bbe58b9ac2f7fa55a9e69d1fc407d1b786c31579b739b2b611268aad4fd3
-SIZE (osmosis-0.39.tgz) = 7408247
+SHA256 (osmosis-0.40.1.tgz) = 3f4e29184341fbe8996f6dcd70d5c8104cab2a3c643ae4ca6d5389fc232a2d00
+SIZE (osmosis-0.40.1.tgz) = 7683042
diff --git a/astro/osmosis/pkg-plist b/astro/osmosis/pkg-plist
index d49769b20acb..dcf09bf6ba45 100644
--- a/astro/osmosis/pkg-plist
+++ b/astro/osmosis/pkg-plist
@@ -1,41 +1,41 @@
 bin/osmosis
 %%DATADIR%%/config/plexus.conf
 %%DATADIR%%/lib/default/aopalliance-1.0.jar
-%%DATADIR%%/lib/default/commons-codec-1.4.jar
-%%DATADIR%%/lib/default/commons-compress-1.0.jar
+%%DATADIR%%/lib/default/commons-codec-1.5.jar
+%%DATADIR%%/lib/default/commons-compress-1.2.jar
 %%DATADIR%%/lib/default/commons-dbcp-1.4.jar
 %%DATADIR%%/lib/default/commons-logging-1.1.1.jar
 %%DATADIR%%/lib/default/commons-pool-1.5.4.jar
 %%DATADIR%%/lib/default/jpf-1.5.jar
-%%DATADIR%%/lib/default/mysql-connector-java-5.1.10.jar
-%%DATADIR%%/lib/default/osmosis-apidb-0.39.jar
-%%DATADIR%%/lib/default/osmosis-areafilter-0.39.jar
-%%DATADIR%%/lib/default/osmosis-core-0.39.jar
-%%DATADIR%%/lib/default/osmosis-dataset-0.39.jar
-%%DATADIR%%/lib/default/osmosis-extract-0.39.jar
-%%DATADIR%%/lib/default/osmosis-hstore-0.39.jar
-%%DATADIR%%/lib/default/osmosis-pbf-0.39.jar
-%%DATADIR%%/lib/default/osmosis-pgsimple-0.39.jar
-%%DATADIR%%/lib/default/osmosis-pgsnapshot-0.39.jar
-%%DATADIR%%/lib/default/osmosis-replication-0.39.jar
-%%DATADIR%%/lib/default/osmosis-set-0.39.jar
-%%DATADIR%%/lib/default/osmosis-tagfilter-0.39.jar
-%%DATADIR%%/lib/default/osmosis-xml-0.39.jar
+%%DATADIR%%/lib/default/mysql-connector-java-5.1.18.jar
+%%DATADIR%%/lib/default/osmosis-apidb-0.40.1.jar
+%%DATADIR%%/lib/default/osmosis-areafilter-0.40.1.jar
+%%DATADIR%%/lib/default/osmosis-core-0.40.1.jar
+%%DATADIR%%/lib/default/osmosis-dataset-0.40.1.jar
+%%DATADIR%%/lib/default/osmosis-extract-0.40.1.jar
+%%DATADIR%%/lib/default/osmosis-hstore-0.40.1.jar
+%%DATADIR%%/lib/default/osmosis-pbf-0.40.1.jar
+%%DATADIR%%/lib/default/osmosis-pgsimple-0.40.1.jar
+%%DATADIR%%/lib/default/osmosis-pgsnapshot-0.40.1.jar
+%%DATADIR%%/lib/default/osmosis-replication-0.40.1.jar
+%%DATADIR%%/lib/default/osmosis-set-0.40.1.jar
+%%DATADIR%%/lib/default/osmosis-tagfilter-0.40.1.jar
+%%DATADIR%%/lib/default/osmosis-xml-0.40.1.jar
 %%DATADIR%%/lib/default/osmpbf-1.1.1-754a33af.jar
-%%DATADIR%%/lib/default/plexus-classworlds-2.2.2.jar
+%%DATADIR%%/lib/default/plexus-classworlds-2.4.jar
 %%DATADIR%%/lib/default/postgis-jdbc-1.3.3.jar
-%%DATADIR%%/lib/default/postgresql-8.4-701.jdbc4.jar
-%%DATADIR%%/lib/default/protobuf-java-2.3.0.jar
-%%DATADIR%%/lib/default/spring-aop-3.0.3.RELEASE.jar
-%%DATADIR%%/lib/default/spring-asm-3.0.3.RELEASE.jar
-%%DATADIR%%/lib/default/spring-beans-3.0.3.RELEASE.jar
-%%DATADIR%%/lib/default/spring-context-3.0.3.RELEASE.jar
-%%DATADIR%%/lib/default/spring-core-3.0.3.RELEASE.jar
-%%DATADIR%%/lib/default/spring-expression-3.0.3.RELEASE.jar
-%%DATADIR%%/lib/default/spring-jdbc-3.0.3.RELEASE.jar
-%%DATADIR%%/lib/default/spring-tx-3.0.3.RELEASE.jar
-%%DATADIR%%/lib/default/stax2-api-3.0.2.jar
-%%DATADIR%%/lib/default/woodstox-core-lgpl-4.0.3.jar
+%%DATADIR%%/lib/default/postgresql-9.0-801.jdbc4.jar
+%%DATADIR%%/lib/default/protobuf-java-2.4.1.jar
+%%DATADIR%%/lib/default/spring-aop-3.0.6.RELEASE.jar
+%%DATADIR%%/lib/default/spring-asm-3.0.6.RELEASE.jar
+%%DATADIR%%/lib/default/spring-beans-3.0.6.RELEASE.jar
+%%DATADIR%%/lib/default/spring-context-3.0.6.RELEASE.jar
+%%DATADIR%%/lib/default/spring-core-3.0.6.RELEASE.jar
+%%DATADIR%%/lib/default/spring-expression-3.0.6.RELEASE.jar
+%%DATADIR%%/lib/default/spring-jdbc-3.0.6.RELEASE.jar
+%%DATADIR%%/lib/default/spring-tx-3.0.6.RELEASE.jar
+%%DATADIR%%/lib/default/stax2-api-3.1.1.jar
+%%DATADIR%%/lib/default/woodstox-core-lgpl-4.1.2.jar
 %%DATADIR%%/lib/default/xercesImpl-2.9.1.jar
 @dirrm %%DATADIR%%/lib/default
 @dirrm %%DATADIR%%/lib