Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Apr 2020 10:07:57 +0000 (UTC)
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r532935 - head/graphics/geoserver
Message-ID:  <202004251007.03PA7vsQ062572@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bofh
Date: Sat Apr 25 10:07:57 2020
New Revision: 532935
URL: https://svnweb.freebsd.org/changeset/ports/532935

Log:
  graphics/geoserver: Update version 2.16.2=>2.17.0
  
  - Add LICENSE for all the libraries that is being used in the project
    APACHE20 BSD2CLAUSE EPL GPLv2 GPLv3 MIT
  - All LICENSE involvements are discussed in ${WRKSRC}/NOTICE.md
  
  Relnotes:	http://blog.geoserver.org/2020/04/21/geoserver-2-17-0-released/

Modified:
  head/graphics/geoserver/Makefile
  head/graphics/geoserver/distinfo
  head/graphics/geoserver/pkg-plist

Modified: head/graphics/geoserver/Makefile
==============================================================================
--- head/graphics/geoserver/Makefile	Sat Apr 25 10:02:43 2020	(r532934)
+++ head/graphics/geoserver/Makefile	Sat Apr 25 10:07:57 2020	(r532935)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	geoserver
-PORTVERSION=	2.16.2
+PORTVERSION=	2.17.0
 CATEGORIES=	graphics geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
@@ -10,21 +10,23 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Open Source GIS server
 
-LICENSE=	GPLv2
+LICENSE=	APACHE20 BSD2CLAUSE EPL GPLv2 GPLv3 MIT
+LICENSE_COMB=	multi
+LICENSE_FILE=	${WRKSRC}/NOTICE.md
 
 USES=		zip
 USE_JAVA=	yes
 
 NO_BUILD=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+NO_WRKSUBDIR=	yes
 GEOSERVERDIR=	${PREFIX}/${PORTNAME}
 GEODIRS=	data_dir etc lib logs modules resources webapps
 
 USE_RC_SUBR=	${PORTNAME}
-PLIST_SUB=	G="${GEOSERVERDIR:S,^${PREFIX}/,,}" VER1=22.2 MVER=${PORTVERSION} \
-		VER3=1.1.3 BATIK=1.10 GWC=1.16.2 \
-		JETTY=9.4.18.v20190429 IMAGEIO=1.3.2 JT=1.1.12 SPRINGS=5.1.5
+PLIST_SUB=	G="${GEOSERVERDIR:S,^${PREFIX}/,,}" VER1=23.0 MVER=${PORTVERSION} \
+		VER3=1.1.3 BATIK=1.10 GWC=1.17.0 \
+		JETTY=9.4.18.v20190429 IMAGEIO=1.3.2 JT=1.1.14 SPRINGS=5.1.8
 SUB_LIST=	GEOSERVERDIR="${GEOSERVERDIR}" JAVA="${JAVA}"
 SUB_FILES=	pkg-message
 NO_ARCH=	yes
@@ -43,7 +45,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/*.sh ${STAGEDIR}${GEOSERVERDIR}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/start.jar ${STAGEDIR}${GEOSERVERDIR}/
 	${INSTALL_DATA} ${WRKSRC}/start.ini ${STAGEDIR}${GEOSERVERDIR}/
-	(cd ${WRKSRC} && ${INSTALL_DATA} GPL.txt LICENSE.txt README.txt RUNNING.txt \
+	(cd ${WRKSRC} && ${INSTALL_DATA} NOTICE.md README.txt RUNNING.txt license/* \
 		VERSION.txt start.jar ${STAGEDIR}${GEOSERVERDIR})
 .for dir in ${GEODIRS}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${GEOSERVERDIR})

Modified: head/graphics/geoserver/distinfo
==============================================================================
--- head/graphics/geoserver/distinfo	Sat Apr 25 10:02:43 2020	(r532934)
+++ head/graphics/geoserver/distinfo	Sat Apr 25 10:07:57 2020	(r532935)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580577065
-SHA256 (geoserver-2.16.2-bin.zip) = af7ae3e0ed820ce6767431820bbeb622cd304eb1208eb2669ed10092b4f146ea
-SIZE (geoserver-2.16.2-bin.zip) = 106916363
+TIMESTAMP = 1587727827
+SHA256 (geoserver-2.17.0-bin.zip) = f670f79410e23cbc66c54c0359da7bcb8d242d2e16cd9942057f6f5b098b738f
+SIZE (geoserver-2.17.0-bin.zip) = 107371242

Modified: head/graphics/geoserver/pkg-plist
==============================================================================
--- head/graphics/geoserver/pkg-plist	Sat Apr 25 10:02:43 2020	(r532934)
+++ head/graphics/geoserver/pkg-plist	Sat Apr 25 10:07:57 2020	(r532935)
@@ -1,8 +1,11 @@
-%%G%%/GPL.txt
-%%G%%/LICENSE.txt
+%%G%%/GPL.md
+%%G%%/LGPL.md
+%%G%%/NOTICE.md
 %%G%%/README.txt
 %%G%%/RUNNING.txt
 %%G%%/VERSION.txt
+%%G%%/apache-1.1.txt
+%%G%%/apache-2.0.txt
 %%G%%/bin/shutdown.sh
 %%G%%/bin/startup.sh
 %%G%%/data_dir/README.rst
@@ -497,6 +500,7 @@
 %%G%%/data_dir/www/styles/remoteOws.sld
 %%G%%/data_dir/www/styles/remoteTasmania.sld
 %%G%%/data_dir/www/wfs-t.html
+%%G%%/epl-1.0.txt
 @sample %%G%%/etc/jdbcRealm.properties.sample
 @sample %%G%%/etc/jetty-deploy.xml.sample
 @sample %%G%%/etc/jetty-http.xml.sample
@@ -680,8 +684,8 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/gwc-wmts-%%GWC%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/h2-1.1.119.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/hsqldb-2.4.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/httpclient-4.5.5.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/httpclient-cache-4.5.5.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/httpclient-4.5.11.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/httpclient-cache-4.5.11.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/httpcore-4.4.10.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-arcgrid-%%IMAGEIO%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-geocore-%%IMAGEIO%%.jar
@@ -710,8 +714,9 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/jna-5.3.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jna-platform-5.3.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/joda-time-2.8.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/json-20180813.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/json-lib-2.4.2-%%G%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/json-simple-1.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/json-simple-1.1.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jsr305-2.0.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-affine-%%JT%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-algebra-%%JT%%.jar
@@ -770,7 +775,6 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.eclipse.emf.ecore-2.12.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.eclipse.emf.ecore.xmi-2.12.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.eclipse.xsd-2.12.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/org.json-2.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.w3.xlink-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/oshi-core-3.13.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/picocontainer-1.2.jar
@@ -781,23 +785,23 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/si-units-java8-0.7.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/slf4j-api-1.6.4.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/slf4j-log4j12-1.6.4.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-aop-5.1.1.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-beans-5.1.1.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-context-5.1.1.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-context-support-5.1.1.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-core-5.1.1.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-expression-5.1.1.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-jcl-5.1.1.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-jdbc-5.1.1.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-aop-5.1.13.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-beans-5.1.13.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-context-5.1.13.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-context-support-5.1.13.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-core-5.1.13.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-expression-5.1.13.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-jcl-5.1.13.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-jdbc-5.1.13.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-ldap-core-2.3.2.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-config-%%SPRINGS%%.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-core-%%SPRINGS%%.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-ldap-%%SPRINGS%%.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-web-%%SPRINGS%%.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-tx-5.1.1.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-web-5.1.1.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-webmvc-5.1.1.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/sqlite-jdbc-3.27.2.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-tx-5.1.13.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-web-5.1.13.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-webmvc-5.1.13.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/sqlite-jdbc-3.30.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/stax-1.2.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/stax-api-1.0.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/stax-ex-1.8.jar



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004251007.03PA7vsQ062572>