Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 29 Feb 2020 14:48:12 +0000 (UTC)
From:      Matthias Fechner <mfechner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r527422 - in branches/2020Q1: . textproc/apache-solr
Message-ID:  <202002291448.01TEmCSZ001795@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mfechner
Date: Sat Feb 29 14:48:12 2020
New Revision: 527422
URL: https://svnweb.freebsd.org/changeset/ports/527422

Log:
  MFH: r527417
  
  textproc/apache-solr: security related update to 8.4.1
  Switch java version to current LTS version.
  
  Security:	e59cb761-5ad8-11ea-abb7-001b217b3468
  
  Approved by:	ports-secteam (joneum)

Modified:
  branches/2020Q1/UPDATING
  branches/2020Q1/textproc/apache-solr/Makefile
  branches/2020Q1/textproc/apache-solr/distinfo
  branches/2020Q1/textproc/apache-solr/pkg-plist
Directory Properties:
  branches/2020Q1/   (props changed)

Modified: branches/2020Q1/UPDATING
==============================================================================
--- branches/2020Q1/UPDATING	Sat Feb 29 14:39:35 2020	(r527421)
+++ branches/2020Q1/UPDATING	Sat Feb 29 14:48:12 2020	(r527422)
@@ -5,6 +5,15 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20200229:
+  AFFECTS: users of textproc/apache-solr
+  AUTHOR: mfechner@FreeBSD.org
+
+  Apache-solr switched to the supported java LTS version 11.
+  Make sure you update the following files accordingly:
+  /usr/local/etc/solr.in.sh (see /usr/local/etc/solr.in.sh.sample)
+  /usr/local/etc/javavm_opts.conf (JAVA_HOME=/usr/local/openjdk11/)
+
 20191226:
   AFFECTS: users of sysutils/dsbmd
   AUTHOR: mk@freeshell.de

Modified: branches/2020Q1/textproc/apache-solr/Makefile
==============================================================================
--- branches/2020Q1/textproc/apache-solr/Makefile	Sat Feb 29 14:39:35 2020	(r527421)
+++ branches/2020Q1/textproc/apache-solr/Makefile	Sat Feb 29 14:48:12 2020	(r527422)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	apache-solr
-PORTVERSION=	8.2.0
+PORTVERSION=	8.4.1
 CATEGORIES=	textproc java
 MASTER_SITES=	APACHE/lucene/solr/${PORTVERSION}
 DISTNAME=	solr-${PORTVERSION}
@@ -14,11 +14,9 @@ LICENSE=	APACHE20
 
 RUN_DEPENDS=	bash:shells/bash
 
-CONFLICTS_INSTALL=	apache-solr3-* apache-solr-4* apache-solr-5*
-
 USES=		cpe tar:tgz
 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	11+
 JAVA_RUN=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes

Modified: branches/2020Q1/textproc/apache-solr/distinfo
==============================================================================
--- branches/2020Q1/textproc/apache-solr/distinfo	Sat Feb 29 14:39:35 2020	(r527421)
+++ branches/2020Q1/textproc/apache-solr/distinfo	Sat Feb 29 14:48:12 2020	(r527422)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564946341
-SHA256 (solr-8.2.0.tgz) = bfa4b39b236e5d714f4233138b8b5cb7e1996ddc0aad60052ce83c4b7bf33449
-SIZE (solr-8.2.0.tgz) = 181899182
+TIMESTAMP = 1582969026
+SHA256 (solr-8.4.1.tgz) = ec39e1e024b2e37405149de41e39e875a39bf11a53f506d07d96b47b8d2a4301
+SIZE (solr-8.4.1.tgz) = 186857366

Modified: branches/2020Q1/textproc/apache-solr/pkg-plist
==============================================================================
--- branches/2020Q1/textproc/apache-solr/pkg-plist	Sat Feb 29 14:39:35 2020	(r527421)
+++ branches/2020Q1/textproc/apache-solr/pkg-plist	Sat Feb 29 14:48:12 2020	(r527422)
@@ -29,9 +29,9 @@ solr/contrib/clustering/README.txt
 solr/contrib/clustering/lib/attributes-binder-1.3.3.jar
 solr/contrib/clustering/lib/carrot2-guava-18.0.jar
 solr/contrib/clustering/lib/carrot2-mini-3.16.0.jar
-solr/contrib/clustering/lib/jackson-annotations-2.9.8.jar
-solr/contrib/clustering/lib/jackson-databind-2.9.8.jar
-solr/contrib/clustering/lib/simple-xml-2.7.1.jar
+solr/contrib/clustering/lib/jackson-annotations-2.10.0.jar
+solr/contrib/clustering/lib/jackson-databind-2.10.0.jar
+solr/contrib/clustering/lib/simple-xml-safe-2.7.1.jar
 solr/contrib/dataimporthandler-extras/lib/activation-1.1.1.jar
 solr/contrib/dataimporthandler-extras/lib/gimap-1.5.1.jar
 solr/contrib/dataimporthandler-extras/lib/javax.mail-1.5.1.jar
@@ -94,9 +94,9 @@ solr/contrib/prometheus-exporter/bin/solr-exporter.cmd
 solr/contrib/prometheus-exporter/conf/grafana-solr-dashboard.json
 solr/contrib/prometheus-exporter/conf/solr-exporter-config.xml
 solr/contrib/prometheus-exporter/lib/argparse4j-0.8.1.jar
-solr/contrib/prometheus-exporter/lib/jackson-annotations-2.9.8.jar
-solr/contrib/prometheus-exporter/lib/jackson-core-2.9.8.jar
-solr/contrib/prometheus-exporter/lib/jackson-databind-2.9.8.jar
+solr/contrib/prometheus-exporter/lib/jackson-annotations-2.10.0.jar
+solr/contrib/prometheus-exporter/lib/jackson-core-2.10.0.jar
+solr/contrib/prometheus-exporter/lib/jackson-databind-2.10.0.jar
 solr/contrib/prometheus-exporter/lib/jackson-jq-0.0.8.jar
 solr/contrib/prometheus-exporter/lib/log4j-api-2.11.2.jar
 solr/contrib/prometheus-exporter/lib/log4j-core-2.11.2.jar
@@ -141,6 +141,14 @@ solr/dist/solrj-lib/jetty-client-9.4.19.v20190610.jar
 solr/dist/solrj-lib/jetty-http-9.4.19.v20190610.jar
 solr/dist/solrj-lib/jetty-io-9.4.19.v20190610.jar
 solr/dist/solrj-lib/jetty-util-9.4.19.v20190610.jar
+solr/dist/solrj-lib/netty-buffer-4.1.29.Final.jar
+solr/dist/solrj-lib/netty-codec-4.1.29.Final.jar
+solr/dist/solrj-lib/netty-common-4.1.29.Final.jar
+solr/dist/solrj-lib/netty-handler-4.1.29.Final.jar
+solr/dist/solrj-lib/netty-resolver-4.1.29.Final.jar
+solr/dist/solrj-lib/netty-transport-4.1.29.Final.jar
+solr/dist/solrj-lib/netty-transport-native-epoll-4.1.29.Final.jar
+solr/dist/solrj-lib/netty-transport-native-unix-common-4.1.29.Final.jar
 solr/dist/solrj-lib/slf4j-api-1.7.24.jar
 solr/dist/solrj-lib/stax2-api-3.1.4.jar
 solr/dist/solrj-lib/woodstox-core-asl-4.4.1.jar
@@ -474,7 +482,7 @@ solr/licenses/apache-mime4j-dom-NOTICE.txt
 solr/licenses/argparse4j-0.8.1.jar.sha1
 solr/licenses/argparse4j-LICENSE-MIT.txt
 solr/licenses/argparse4j-NOTICE.txt
-solr/licenses/asciidoctor-ant-1.6.0-alpha.5.jar.sha1
+solr/licenses/asciidoctor-ant-1.6.2.jar.sha1
 solr/licenses/asciidoctor-ant-LICENSE-ASL.txt
 solr/licenses/asciidoctor-ant-NOTICE.txt
 solr/licenses/asm-5.1.jar.sha1
@@ -507,7 +515,7 @@ solr/licenses/boilerpipe-NOTICE.txt
 solr/licenses/byte-buddy-1.9.3.jar.sha1
 solr/licenses/byte-buddy-LICENSE-ASL.txt
 solr/licenses/byte-buddy-NOTICE.txt
-solr/licenses/caffeine-2.4.0.jar.sha1
+solr/licenses/caffeine-2.8.0.jar.sha1
 solr/licenses/caffeine-LICENSE-ASL.txt
 solr/licenses/caffeine-NOTICE.txt
 solr/licenses/calcite-core-1.18.0.jar.sha1
@@ -522,9 +530,6 @@ solr/licenses/carrot2-guava-NOTICE.txt
 solr/licenses/carrot2-mini-3.16.0.jar.sha1
 solr/licenses/carrot2-mini-LICENSE-BSD_LIKE.txt
 solr/licenses/carrot2-mini-NOTICE.txt
-solr/licenses/commons-beanutils-1.9.3.jar.sha1
-solr/licenses/commons-beanutils-LICENSE-ASL.txt
-solr/licenses/commons-beanutils-NOTICE.txt
 solr/licenses/commons-cli-1.2.jar.sha1
 solr/licenses/commons-cli-LICENSE-ASL.txt
 solr/licenses/commons-cli-NOTICE.txt
@@ -678,18 +683,18 @@ solr/licenses/jackcess-NOTICE.txt
 solr/licenses/jackcess-encrypt-2.1.4.jar.sha1
 solr/licenses/jackcess-encrypt-LICENSE-ASL.txt
 solr/licenses/jackcess-encrypt-NOTICE.txt
-solr/licenses/jackson-annotations-2.9.8.jar.sha1
+solr/licenses/jackson-annotations-2.10.0.jar.sha1
 solr/licenses/jackson-annotations-LICENSE-ASL.txt
 solr/licenses/jackson-annotations-NOTICE.txt
-solr/licenses/jackson-core-2.9.8.jar.sha1
+solr/licenses/jackson-core-2.10.0.jar.sha1
 solr/licenses/jackson-core-LICENSE-ASL.txt
 solr/licenses/jackson-core-NOTICE.txt
 solr/licenses/jackson-core-asl-LICENSE-ASL.txt
 solr/licenses/jackson-core-asl-NOTICE.txt
-solr/licenses/jackson-databind-2.9.8.jar.sha1
+solr/licenses/jackson-databind-2.10.0.jar.sha1
 solr/licenses/jackson-databind-LICENSE-ASL.txt
 solr/licenses/jackson-databind-NOTICE.txt
-solr/licenses/jackson-dataformat-smile-2.9.8.jar.sha1
+solr/licenses/jackson-dataformat-smile-2.10.0.jar.sha1
 solr/licenses/jackson-dataformat-smile-LICENSE-ASL.txt
 solr/licenses/jackson-dataformat-smile-NOTICE.txt
 solr/licenses/jackson-jq-0.0.8.jar.sha1
@@ -709,6 +714,8 @@ solr/licenses/janino-NOTICE.txt
 solr/licenses/java-libpst-0.8.1.jar.sha1
 solr/licenses/java-libpst-LICENSE-ASL.txt
 solr/licenses/java-libpst-NOTICE.txt
+solr/licenses/java-semver-0.9.0.jar.sha1
+solr/licenses/java-semver-LICENSE-MIT.txt
 solr/licenses/javax.mail-1.5.1.jar.sha1
 solr/licenses/javax.mail-LICENSE-CDDL.txt
 solr/licenses/javax.servlet-api-3.1.0.jar.sha1
@@ -875,9 +882,33 @@ solr/licenses/morfologik-stemming-NOTICE.txt
 solr/licenses/morfologik-ukrainian-search-3.9.0.jar.sha1
 solr/licenses/morfologik-ukrainian-search-LICENSE-ASL.txt
 solr/licenses/morfologik-ukrainian-search-NOTICE.txt
-solr/licenses/netty-all-4.0.52.Final.jar.sha1
+solr/licenses/netty-all-4.1.29.Final.jar.sha1
 solr/licenses/netty-all-LICENSE-ASL.txt
 solr/licenses/netty-all-NOTICE.txt
+solr/licenses/netty-buffer-4.1.29.Final.jar.sha1
+solr/licenses/netty-buffer-LICENSE-ASL.txt
+solr/licenses/netty-buffer-NOTICE.txt
+solr/licenses/netty-codec-4.1.29.Final.jar.sha1
+solr/licenses/netty-codec-LICENSE-ASL.txt
+solr/licenses/netty-codec-NOTICE.txt
+solr/licenses/netty-common-4.1.29.Final.jar.sha1
+solr/licenses/netty-common-LICENSE-ASL.txt
+solr/licenses/netty-common-NOTICE.txt
+solr/licenses/netty-handler-4.1.29.Final.jar.sha1
+solr/licenses/netty-handler-LICENSE-ASL.txt
+solr/licenses/netty-handler-NOTICE.txt
+solr/licenses/netty-resolver-4.1.29.Final.jar.sha1
+solr/licenses/netty-resolver-LICENSE-ASL.txt
+solr/licenses/netty-resolver-NOTICE.txt
+solr/licenses/netty-transport-4.1.29.Final.jar.sha1
+solr/licenses/netty-transport-LICENSE-ASL.txt
+solr/licenses/netty-transport-NOTICE.txt
+solr/licenses/netty-transport-native-epoll-4.1.29.Final.jar.sha1
+solr/licenses/netty-transport-native-epoll-LICENSE-ASL.txt
+solr/licenses/netty-transport-native-epoll-NOTICE.txt
+solr/licenses/netty-transport-native-unix-common-4.1.29.Final.jar.sha1
+solr/licenses/netty-transport-native-unix-common-LICENSE-ASL.txt
+solr/licenses/netty-transport-native-unix-common-NOTICE.txt
 solr/licenses/objenesis-2.6.jar.sha1
 solr/licenses/objenesis-LICENSE-ASL.txt
 solr/licenses/objenesis-NOTICE.txt
@@ -948,9 +979,9 @@ solr/licenses/s2-geometry-library-java-LICENSE-ASL.txt
 solr/licenses/s2-geometry-library-java-NOTICE.txt
 solr/licenses/servlet-api-LICENSE-CDDL.txt
 solr/licenses/servlet-api-NOTICE.txt
-solr/licenses/simple-xml-2.7.1.jar.sha1
-solr/licenses/simple-xml-LICENSE-ASL.txt
-solr/licenses/simple-xml-NOTICE.txt
+solr/licenses/simple-xml-safe-2.7.1.jar.sha1
+solr/licenses/simple-xml-safe-LICENSE-ASL.txt
+solr/licenses/simple-xml-safe-NOTICE.txt
 solr/licenses/simpleclient-0.2.0.jar.sha1
 solr/licenses/simpleclient-LICENSE-ASL.txt
 solr/licenses/simpleclient-NOTICE.txt
@@ -1086,10 +1117,9 @@ solr/server/solr-webapp/webapp/WEB-INF/lib/antlr4-runt
 solr/server/solr-webapp/webapp/WEB-INF/lib/asm-5.1.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/asm-commons-5.1.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/avatica-core-1.13.0.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/caffeine-2.4.0.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/caffeine-2.8.0.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/calcite-core-1.18.0.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/calcite-linq4j-1.18.0.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/commons-beanutils-1.9.3.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/commons-cli-1.2.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/commons-codec-1.11.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/commons-collections-3.2.2.jar
@@ -1120,11 +1150,12 @@ solr/server/solr-webapp/webapp/WEB-INF/lib/http2-http-
 solr/server/solr-webapp/webapp/WEB-INF/lib/httpclient-4.5.6.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/httpcore-4.4.10.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/httpmime-4.5.6.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-annotations-2.9.8.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-core-2.9.8.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-databind-2.9.8.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-dataformat-smile-2.9.8.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-annotations-2.10.0.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-core-2.10.0.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-databind-2.10.0.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-dataformat-smile-2.10.0.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/janino-3.0.9.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/java-semver-0.9.0.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/jetty-alpn-client-9.4.19.v20190610.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/jetty-alpn-java-client-9.4.19.v20190610.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/jetty-client-9.4.19.v20190610.jar
@@ -1157,6 +1188,14 @@ solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-sand
 solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial-extras-%%PORTVERSION%%.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial3d-%%PORTVERSION%%.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-suggest-%%PORTVERSION%%.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/netty-buffer-4.1.29.Final.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/netty-codec-4.1.29.Final.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/netty-common-4.1.29.Final.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/netty-handler-4.1.29.Final.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/netty-resolver-4.1.29.Final.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/netty-transport-4.1.29.Final.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/netty-transport-native-epoll-4.1.29.Final.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/netty-transport-native-unix-common-4.1.29.Final.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/opentracing-api-0.33.0.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/opentracing-noop-0.33.0.jar
 solr/server/solr-webapp/webapp/WEB-INF/lib/opentracing-util-0.33.0.jar
@@ -1176,6 +1215,7 @@ solr/server/solr-webapp/webapp/WEB-INF/lib/zookeeper-3
 solr/server/solr-webapp/webapp/WEB-INF/lib/zookeeper-jute-3.5.5.jar
 solr/server/solr-webapp/webapp/WEB-INF/web.xml
 solr/server/solr-webapp/webapp/css/angular/analysis.css
+solr/server/solr-webapp/webapp/css/angular/angular-csp.css
 solr/server/solr-webapp/webapp/css/angular/chosen.css
 solr/server/solr-webapp/webapp/css/angular/cloud.css
 solr/server/solr-webapp/webapp/css/angular/collections.css
@@ -1192,6 +1232,7 @@ solr/server/solr-webapp/webapp/css/angular/jquery-ui.s
 solr/server/solr-webapp/webapp/css/angular/logging.css
 solr/server/solr-webapp/webapp/css/angular/login.css
 solr/server/solr-webapp/webapp/css/angular/menu.css
+solr/server/solr-webapp/webapp/css/angular/overview.css
 solr/server/solr-webapp/webapp/css/angular/plugins.css
 solr/server/solr-webapp/webapp/css/angular/query.css
 solr/server/solr-webapp/webapp/css/angular/replication.css
@@ -1416,6 +1457,7 @@ solr/server/solr-webapp/webapp/img/solr.svg
 solr/server/solr-webapp/webapp/img/tree.png
 solr/server/solr-webapp/webapp/index.html
 solr/server/solr-webapp/webapp/js/angular/app.js
+solr/server/solr-webapp/webapp/js/angular/controllers/alias-overview.js
 solr/server/solr-webapp/webapp/js/angular/controllers/analysis.js
 solr/server/solr-webapp/webapp/js/angular/controllers/cloud.js
 solr/server/solr-webapp/webapp/js/angular/controllers/cluster-suggestions.js
@@ -1460,6 +1502,7 @@ solr/server/solr-webapp/webapp/libs/jquery-2.1.3.min.j
 solr/server/solr-webapp/webapp/libs/jquery-ui.min.js
 solr/server/solr-webapp/webapp/libs/jquery.jstree.js
 solr/server/solr-webapp/webapp/libs/ngtimeago.js
+solr/server/solr-webapp/webapp/partials/alias_overview.html
 solr/server/solr-webapp/webapp/partials/analysis.html
 solr/server/solr-webapp/webapp/partials/cloud.html
 solr/server/solr-webapp/webapp/partials/cluster_suggestions.html
@@ -1524,7 +1567,6 @@ solr/server/solr/configsets/_default/conf/lang/stopwor
 solr/server/solr/configsets/_default/conf/lang/stopwords_tr.txt
 solr/server/solr/configsets/_default/conf/lang/userdict_ja.txt
 solr/server/solr/configsets/_default/conf/managed-schema
-solr/server/solr/configsets/_default/conf/params.json
 solr/server/solr/configsets/_default/conf/protwords.txt
 solr/server/solr/configsets/_default/conf/solrconfig.xml
 solr/server/solr/configsets/_default/conf/stopwords.txt



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