From nobody Thu Mar 9 00:04:31 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PX8Yq5QHbz3x3vn; Thu, 9 Mar 2023 00:04:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PX8Yq4q1Bz3Js3; Thu, 9 Mar 2023 00:04:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678320271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OYFOgwPdAX4TY3N7YJtlk4qbCTSrNgVi2O7rwnZ+3Bg=; b=WHWgq2HfEQqrPcxepaJ2jt+ry5cptjtBR4+wghL9kJIOtL4E6oZu0iv5lojo3l38zFDKDu TUzud2594RF80Vy67SuprMtigt/W37BjjZ6WqPkRVbPByOzjbX1T9aPJNYoXVhY7orWdrB GEqlZ/v2Lq3eZetKGDE4xSV8M2Bu+431Kn0hW9cE2BAmd+pX9Dvhptwl2v1kAvugqEhTTl 87qAlmelmssT7LLKJJHem0MkHhuh5GJtEauOsUHys5UanLH1G3+NN9CFIPql67d/ns0Ztk KgcPlt0VLyWl7lMJpu2DPrqx2ARni0tIPAj58aOeQDz+vhNbr6KCtB0usMb+kA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678320271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OYFOgwPdAX4TY3N7YJtlk4qbCTSrNgVi2O7rwnZ+3Bg=; b=OqD2MtjvF2LVunkifZyaEaMlOOlv+82ayPJuAxVUOZ+8U8eEX0Vt9pMK76yZ7WxtHPiTWk SPbF0hr006ZbH4O7vSbs6iZIxbC2SNWj6CDBXM+Ee3ZB0UaH3B6ObLGLLrTMWMa2cRksef nXOSc4O9Oufew08SoN1ICvogKWdwDzVPPR6YuaChnRal64HzEAFMbrEhEXmwP85/NThEBx 8EsBhZnaHqE0MhKqSxmb8xNJLKvrl1hdpFnpxuW/r8jwYBK3q+T8eJYBntJrMJb7c6049K NXFm3pfa2HSapSUKbE92jPZI4t4CGaZ/wFu0wSadLtHg14Hr9Bi7IMByeEHQqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678320271; a=rsa-sha256; cv=none; b=G/tXDY6a813e9j1mR4Y8SKgfS2KCAk6oe93Gs6RXEAiqcNeckTL1F7V4wdIf7eNo40Iu8r hDaSGBqwOLcdkPfUjlJtQGG38bkGtSFCNShB9I/ThY34rzGiJ2rJrTN3TUJa5ZfPOqCNSa ieurZ5EgaPqdNQm+aMDPEHp4Y/xYLTt8EcnIz6UmChVjnf4vplGC1EwTB/MAoGv4Q0rBiT DjmRsjfLupf5yjRtqZ2aQHWYONdOsDiGa4N0QRDfgK/h+cFEJ4cpUE6XWAeQ/HMKebaNfY zqsJxE5GAQohor3Lx+0hZ9YxHCu6FBR1m7vYOfDMy0jWGWPcMhnQe9Yv4UgjSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PX8Yq3m2qzm6D; Thu, 9 Mar 2023 00:04:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32904VYc001077; Thu, 9 Mar 2023 00:04:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32904Vg2001076; Thu, 9 Mar 2023 00:04:31 GMT (envelope-from git) Date: Thu, 9 Mar 2023 00:04:31 GMT Message-Id: <202303090004.32904Vg2001076@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Don Lewis Subject: git: ea1f6587bdd9 - main - devel/opengrok: update to 1.7.42, with tomcat101 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: truckman X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea1f6587bdd9449a4698f2c01f53f6607e22d568 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=ea1f6587bdd9449a4698f2c01f53f6607e22d568 commit ea1f6587bdd9449a4698f2c01f53f6607e22d568 Author: Yuri AuthorDate: 2023-03-08 23:55:54 +0000 Commit: Don Lewis CommitDate: 2023-03-09 00:03:06 +0000 devel/opengrok: update to 1.7.42, with tomcat101 www/tomcat10 is deprecated, so switch to www/tomcat101. This changes the /api requests, which requires opengrok 1.7.40. Upgrade to the latest 1.7.x version of opengrok, which is currently 1.7.42. PR: 269991 --- devel/opengrok/Makefile | 9 +++---- devel/opengrok/distinfo | 6 ++--- devel/opengrok/pkg-plist | 62 ++++++++++++++++++++++++------------------------ 3 files changed, 39 insertions(+), 38 deletions(-) diff --git a/devel/opengrok/Makefile b/devel/opengrok/Makefile index 6a8e09525ab3..105e64ed9ae3 100644 --- a/devel/opengrok/Makefile +++ b/devel/opengrok/Makefile @@ -1,5 +1,5 @@ PORTNAME= opengrok -PORTVERSION= 1.7.31 +PORTVERSION= 1.7.42 CATEGORIES= devel java MASTER_SITES= https://github.com/oracle/opengrok/releases/download/${PORTVERSION}/ @@ -45,12 +45,12 @@ OPTIONS_DEFAULT= TOMCAT10 GLASSFISH_DESC?= Glassfish support GLASSFISH_VARS= WEBAPP_HOME=${LOCALBASE}/glassfish-5.1.0/glassfish -TOMCAT10_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-10.0 +TOMCAT10_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-10.1 GLASSFISH_BUILD_DEPENDS=${WEBAPP_HOME}/modules/glassfish.jar:www/glassfish GLASSFISH_RUN_DEPENDS= ${WEBAPP_HOME}/modules/glassfish.jar:www/glassfish -TOMCAT10_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat10 -TOMCAT10_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat10 +TOMCAT10_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat101 +TOMCAT10_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat101 WEBAPPS_DIR= ${WEBAPP_HOME:S|^${LOCALBASE}/||}/webapps JARFILE= ${LOCALBASE}/${WEBAPPS_DIR}/opengrok/WEB-INF/lib/opengrok-${PORTVERSION}.jar @@ -58,6 +58,7 @@ JARFILE= ${LOCALBASE}/${WEBAPPS_DIR}/opengrok/WEB-INF/lib/opengrok-${PORTVERSION post-extract: @${MKDIR} ${WRKSRC}/lib/opengrok @${TAR} -xf ${WRKSRC}/lib/source.war -C ${WRKSRC}/lib/opengrok + @${RM} ${WRKSRC}/lib/opengrok/WEB-INF/classes/sample.c # clean cruft do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/etc \ diff --git a/devel/opengrok/distinfo b/devel/opengrok/distinfo index 917a409bbfec..dd541aed4244 100644 --- a/devel/opengrok/distinfo +++ b/devel/opengrok/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1650873302 -SHA256 (opengrok-1.7.31.tar.gz) = dba38e9cf08a3a53bff12d8f5491959e60fedfc2fc3374c335ce352a0b139ae9 -SIZE (opengrok-1.7.31.tar.gz) = 77733534 +TIMESTAMP = 1678190759 +SHA256 (opengrok-1.7.42.tar.gz) = e6558f411a8827f6107d8e2c82f915efd4badf0685a98fedacafe57cfdc50071 +SIZE (opengrok-1.7.42.tar.gz) = 78324943 diff --git a/devel/opengrok/pkg-plist b/devel/opengrok/pkg-plist index e7d2bfa96e8d..20cc6d9451ad 100644 --- a/devel/opengrok/pkg-plist +++ b/devel/opengrok/pkg-plist @@ -37,6 +37,7 @@ bin/opengrok %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/controller/AnnotationController.class %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/controller/ConfigurationController.class %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/controller/FileController.class +%%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/controller/GroupsController.class %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/controller/HistoryController$HistoryDTO.class %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/controller/HistoryController$HistoryEntryDTO.class %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/controller/HistoryController.class @@ -82,7 +83,7 @@ bin/opengrok %%T%%/webapps/opengrok/WEB-INF/lib/affinity-3.21ea5.jar %%T%%/webapps/opengrok/WEB-INF/lib/ant-1.10.11.jar %%T%%/webapps/opengrok/WEB-INF/lib/ant-launcher-1.10.11.jar -%%T%%/webapps/opengrok/WEB-INF/lib/aopalliance-repackaged-3.0.1.jar +%%T%%/webapps/opengrok/WEB-INF/lib/aopalliance-repackaged-3.0.3.jar %%T%%/webapps/opengrok/WEB-INF/lib/asm-7.1.jar %%T%%/webapps/opengrok/WEB-INF/lib/backport-util-concurrent-3.1.jar %%T%%/webapps/opengrok/WEB-INF/lib/bcel-6.5.0.jar @@ -102,43 +103,42 @@ bin/opengrok %%T%%/webapps/opengrok/WEB-INF/lib/commons-lang3-3.12.0.jar %%T%%/webapps/opengrok/WEB-INF/lib/compiler-2.21ea1.jar %%T%%/webapps/opengrok/WEB-INF/lib/cron-utils-9.1.6.jar -%%T%%/webapps/opengrok/WEB-INF/lib/hibernate-validator-7.0.0.Final.jar -%%T%%/webapps/opengrok/WEB-INF/lib/hk2-api-3.0.1.jar -%%T%%/webapps/opengrok/WEB-INF/lib/hk2-locator-3.0.1.jar -%%T%%/webapps/opengrok/WEB-INF/lib/hk2-utils-3.0.1.jar +%%T%%/webapps/opengrok/WEB-INF/lib/hibernate-validator-8.0.0.Final.jar +%%T%%/webapps/opengrok/WEB-INF/lib/hk2-api-3.0.3.jar +%%T%%/webapps/opengrok/WEB-INF/lib/hk2-locator-3.0.3.jar +%%T%%/webapps/opengrok/WEB-INF/lib/hk2-utils-3.0.3.jar %%T%%/webapps/opengrok/WEB-INF/lib/istack-commons-runtime-4.0.1.jar -%%T%%/webapps/opengrok/WEB-INF/lib/jackson-annotations-2.12.2.jar -%%T%%/webapps/opengrok/WEB-INF/lib/jackson-core-2.12.3.jar -%%T%%/webapps/opengrok/WEB-INF/lib/jackson-databind-2.12.2.jar -%%T%%/webapps/opengrok/WEB-INF/lib/jackson-module-jaxb-annotations-2.12.2.jar +%%T%%/webapps/opengrok/WEB-INF/lib/jackson-annotations-2.14.1.jar +%%T%%/webapps/opengrok/WEB-INF/lib/jackson-core-2.14.1.jar +%%T%%/webapps/opengrok/WEB-INF/lib/jackson-databind-2.14.1.jar +%%T%%/webapps/opengrok/WEB-INF/lib/jackson-dataformat-smile-2.14.1.jar +%%T%%/webapps/opengrok/WEB-INF/lib/jackson-module-jakarta-xmlbind-annotations-2.13.3.jar %%T%%/webapps/opengrok/WEB-INF/lib/jakarta.activation-2.0.1.jar %%T%%/webapps/opengrok/WEB-INF/lib/jakarta.activation-api-2.0.1.jar -%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.annotation-api-2.0.0.jar -%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.el-4.0.0.jar -%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.el-api-4.0.0.jar -%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.inject-api-2.0.0.jar +%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.annotation-api-2.1.1.jar +%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.el-5.0.0-M1.jar +%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.el-api-5.0.1.jar +%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.inject-api-2.0.1.jar %%T%%/webapps/opengrok/WEB-INF/lib/jakarta.servlet.jsp.jstl-2.0.0.jar %%T%%/webapps/opengrok/WEB-INF/lib/jakarta.servlet.jsp.jstl-api-2.0.0.jar -%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.validation-api-3.0.0.jar -%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.ws.rs-api-3.0.0.jar -%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.xml.bind-api-3.0.0.jar +%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.validation-api-3.0.2.jar +%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.ws.rs-api-3.1.0.jar +%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.xml.bind-api-4.0.0.jar %%T%%/webapps/opengrok/WEB-INF/lib/javapoet-1.13.0.jar -%%T%%/webapps/opengrok/WEB-INF/lib/javassist-3.25.0-GA.jar -%%T%%/webapps/opengrok/WEB-INF/lib/javax.activation-api-1.2.0.jar -%%T%%/webapps/opengrok/WEB-INF/lib/jaxb-api-2.3.1.jar +%%T%%/webapps/opengrok/WEB-INF/lib/javassist-3.28.0-GA.jar %%T%%/webapps/opengrok/WEB-INF/lib/jaxb-core-3.0.2.jar %%T%%/webapps/opengrok/WEB-INF/lib/jaxb-runtime-3.0.2.jar %%T%%/webapps/opengrok/WEB-INF/lib/jboss-logging-3.4.1.Final.jar -%%T%%/webapps/opengrok/WEB-INF/lib/jersey-bean-validation-3.0.2.jar -%%T%%/webapps/opengrok/WEB-INF/lib/jersey-client-3.0.2.jar -%%T%%/webapps/opengrok/WEB-INF/lib/jersey-common-3.0.2.jar -%%T%%/webapps/opengrok/WEB-INF/lib/jersey-container-servlet-3.0.2.jar -%%T%%/webapps/opengrok/WEB-INF/lib/jersey-container-servlet-core-3.0.2.jar -%%T%%/webapps/opengrok/WEB-INF/lib/jersey-entity-filtering-3.0.2.jar -%%T%%/webapps/opengrok/WEB-INF/lib/jersey-hk2-3.0.2.jar -%%T%%/webapps/opengrok/WEB-INF/lib/jersey-media-json-jackson-3.0.2.jar -%%T%%/webapps/opengrok/WEB-INF/lib/jersey-server-3.0.2.jar -%%T%%/webapps/opengrok/WEB-INF/lib/jettison-1.4.1.jar +%%T%%/webapps/opengrok/WEB-INF/lib/jersey-bean-validation-3.1.0.jar +%%T%%/webapps/opengrok/WEB-INF/lib/jersey-client-3.1.0.jar +%%T%%/webapps/opengrok/WEB-INF/lib/jersey-common-3.1.0.jar +%%T%%/webapps/opengrok/WEB-INF/lib/jersey-container-servlet-3.1.0.jar +%%T%%/webapps/opengrok/WEB-INF/lib/jersey-container-servlet-core-3.1.0.jar +%%T%%/webapps/opengrok/WEB-INF/lib/jersey-entity-filtering-3.1.0.jar +%%T%%/webapps/opengrok/WEB-INF/lib/jersey-hk2-3.1.0.jar +%%T%%/webapps/opengrok/WEB-INF/lib/jersey-media-json-jackson-3.1.0.jar +%%T%%/webapps/opengrok/WEB-INF/lib/jersey-server-3.1.0.jar +%%T%%/webapps/opengrok/WEB-INF/lib/jettison-1.5.2.jar %%T%%/webapps/opengrok/WEB-INF/lib/jna-5.5.0.jar %%T%%/webapps/opengrok/WEB-INF/lib/jna-platform-5.5.0.jar %%T%%/webapps/opengrok/WEB-INF/lib/jquery-3.6.0.jar @@ -157,7 +157,7 @@ bin/opengrok %%T%%/webapps/opengrok/WEB-INF/lib/micrometer-registry-statsd-1.8.2.jar %%T%%/webapps/opengrok/WEB-INF/lib/modelmapper-2.4.4.jar %%T%%/webapps/opengrok/WEB-INF/lib/mxparser-1.2.2.jar -%%T%%/webapps/opengrok/WEB-INF/lib/opengrok-1.7.31.jar +%%T%%/webapps/opengrok/WEB-INF/lib/opengrok-1.7.42.jar %%T%%/webapps/opengrok/WEB-INF/lib/org.eclipse.jgit-5.12.0.202106070339-r.jar %%T%%/webapps/opengrok/WEB-INF/lib/org.suigeneris.jrcs.diff-0.4.2.jar %%T%%/webapps/opengrok/WEB-INF/lib/org.suigeneris.jrcs.rcs-0.4.2.jar @@ -170,7 +170,7 @@ bin/opengrok %%T%%/webapps/opengrok/WEB-INF/lib/simpleclient_tracer_otel_agent-0.12.0.jar %%T%%/webapps/opengrok/WEB-INF/lib/slf4j-api-1.7.30.jar %%T%%/webapps/opengrok/WEB-INF/lib/slf4j-nop-1.7.30.jar -%%T%%/webapps/opengrok/WEB-INF/lib/suggester-1.7.31.jar +%%T%%/webapps/opengrok/WEB-INF/lib/suggester-1.7.42.jar %%T%%/webapps/opengrok/WEB-INF/lib/tablesorter-2.31.3.jar %%T%%/webapps/opengrok/WEB-INF/lib/txw2-3.0.2.jar %%T%%/webapps/opengrok/WEB-INF/lib/versioncompare-1.5.0.jar