jenkins-core-weekly: move to openjdk11

components/developer/jenkins-core-lts/Makefile

@@ -29,6 +29,7 @@ JENKINS_RELEASE=			lts
 COMPONENT_MAJOR_VERSION=	2
 COMPONENT_MINOR_VERSION=	332
 COMPONENT_PATCH_VERSION=	3
+COMPONENT_REVISION=		1
 COMPONENT_ARCHIVE_HASH=		sha256:d193f179aadf3a7ceb61adebc3ab51218ac4a7852b88932ff33b44fd7be6010f
 # See $(COMPONENT_ARCHIVE_URL).sha256 e.g. for current weekly release, run
 #   wget -O - http://mirrors.jenkins-ci.org/war/latest/jenkins.war.sha256
@@ -86,4 +87,4 @@ install: $(INSTALL_32)
 test: $(NO_TESTS)
 
 # Auto-generated dependencies
-REQUIRED_PACKAGES += runtime/java/openjdk8
+REQUIRED_PACKAGES += runtime/java/openjdk11

components/developer/jenkins-core-lts/jenkins-core-lts.p5m

@@ -22,8 +22,8 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
 
-# Note: java8+ is required since 2017
-# This may be JRE8 for the server, though JDK8 also suffices :)
+# Note: java11 is required since June 2022
+# This may be JRE11 for the server, though JDK11 also suffices :)
 depend fmri=__TBD pkg.debug.depend.file=usr/bin/java type=require
 
 # Note: as we deliver the new WAR file, we tell the appservers to refresh

components/developer/jenkins-core-lts/pkg5

@@ -1,7 +1,7 @@
 {
     "dependencies": [
         "SUNWcs",
-        "runtime/java/openjdk8",
+        "runtime/java/openjdk11",
         "shell/ksh93",
         "system/library"
     ],

components/developer/jenkins-core-weekly/Makefile

@@ -29,6 +29,7 @@ JENKINS_RELEASE=			weekly
 COMPONENT_MAJOR_VERSION=	2
 COMPONENT_MINOR_VERSION=	349
 COMPONENT_ARCHIVE_HASH=		sha256:577af2f74652065db805f4dfbe70658cfe0270d49e6258d74101493de8b13a1b
+COMPONENT_REVISION=		1
 # See $(COMPONENT_ARCHIVE_URL).sha256 e.g. for current weekly release, run
 #   wget -O - http://mirrors.jenkins-ci.org/war/latest/jenkins.war.sha256
 # or for LTS
@@ -85,4 +86,4 @@ install: $(INSTALL_32)
 test: $(NO_TESTS)
 
 # Auto-generated dependencies
-REQUIRED_PACKAGES += runtime/java/openjdk8
+REQUIRED_PACKAGES += runtime/java/openjdk11

components/developer/jenkins-core-weekly/pkg5

@@ -1,7 +1,7 @@
 {
     "dependencies": [
         "SUNWcs",
-        "runtime/java/openjdk8",
+        "runtime/java/openjdk11",
         "shell/ksh93",
         "system/library"
     ],

components/developer/jenkins/Makefile

@@ -19,8 +19,8 @@ include ../../../make-rules/shared-macros.mk
 # Due to this, initial version for helper packages starts from that.
 
 COMPONENT_NAME=		jenkins
-COMPONENT_VERSION=	2.65
-COMPONENT_REVISION=	3
+COMPONENT_VERSION=	2.66
+COMPONENT_REVISION=     1	
 COMPONENT_FMRI=		developer/jenkins
 COMPONENT_CLASSIFICATION=	Web Services/Application and Web Servers
 COMPONENT_PROJECT_URL=	http://jenkins-ci.org/
@@ -48,5 +48,5 @@ install:
 test: $(NO_TESTS)
 
 # Auto-generated dependencies
+REQUIRED_PACKAGES += runtime/java/openjdk11
 REQUIRED_PACKAGES += SUNWcs
-REQUIRED_PACKAGES += runtime/java/openjdk8

components/developer/jenkins/jenkins-standalone.p5m

@@ -33,7 +33,7 @@ depend type=require-any \
     fmri=pkg:/developer/jenkins-core-weekly \
     fmri=pkg:/developer/jenkins-core-lts
 depend type=require \
-    fmri=pkg:/runtime/java/openjdk8
+    fmri=pkg:/runtime/java/openjdk11
 # The font is required by Jenkins Web-GUI to start up, see
 #   https://wiki.jenkins.io/display/JENKINS/Jenkins+got+java.awt.headless+problem
 depend type=require \

components/developer/jenkins/jenkins.p5m

@@ -31,7 +31,7 @@ depend type=require-any \
     fmri=pkg:/developer/jenkins-core-weekly \
     fmri=pkg:/developer/jenkins-core-lts
 depend type=require \
-    fmri=pkg:/runtime/java/openjdk8
+    fmri=pkg:/runtime/java/openjdk11
 
 # Note: eventually we expect further packages for other webapp-server
 # integrations (like tomcat, glassfish, etc.) - those would probably put a

components/developer/jenkins/pkg5

@@ -0,0 +1,14 @@
+{
+    "dependencies": [
+        "SUNWcs",
+        "runtime/java/openjdk11",
+        "shell/ksh93",
+        "system/library"
+    ],
+    "fmris": [
+        "developer/jenkins",
+        "developer/jenkins-common",
+        "developer/jenkins-standalone"
+    ],
+    "name": "jenkins"
+}

components/image/rrdtool/Makefile

@@ -20,7 +20,7 @@ include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		rrdtool
 
-COMPONENT_VERSION=	1.7.2
+COMPONENT_VERSION=	1.8.0
 COMPONENT_FMRI=		image/rrdtool
 COMPONENT_CLASSIFICATION=Applications/System Utilities
 COMPONENT_SUMMARY=	Data analysis tool generating graphical representations
@@ -30,9 +30,9 @@ COMPONENT_DESCRIPTION=	RRDtool is the OpenSource industry standard, high perform
 			applications.
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH= sha256:a199faeb7eff7cafc46fac253e682d833d08932f3db93a550a4a5af180ca58db
-COMPONENT_ARCHIVE_URL=	http://oss.oetiker.ch/rrdtool/pub/$(COMPONENT_ARCHIVE)
-COMPONENT_PROJECT_URL=	http://oss.oetiker.ch/rrdtool/
+COMPONENT_ARCHIVE_HASH= sha256:bd37614137d7a8dc523359648eb2a81631a34fd91a82ed5581916a52c08433f4
+COMPONENT_ARCHIVE_URL=	https://github.com/oetiker/rrdtool-1.x/releases/download/v$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+COMPONENT_PROJECT_URL=	https://github.com/oetiker/rrdtool-1.x
 COMPONENT_LICENSE=	GPLv2
 COMPONENT_LICENSE_FILE=	LICENSE
 

components/library/babl/Makefile

@@ -25,7 +25,7 @@ COMPONENT_SUMMARY=	Babl is a dynamic, any to any, pixel format conversion librar
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH= 
-COMPONENT_ARCHIVE_URL=	https://ftp.gimp.org/pub/babl/0.1/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	https://download.gimp.org/pub/babl/0.1/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL=	https://gegl.org/babl/
 COMPONENT_FMRI=	image/library/babl
 COMPONENT_CLASSIFICATION=	System/Multimedia Libraries