From e37526e5127ed05489715fa73460d3899ccf188b Mon Sep 17 00:00:00 2001
From: Till Wegmüller <toasterson@gmail.com>
Date: Mon, 22 Aug 2022 17:04:04 +0200
Subject: [PATCH] Update jenkins openjdk dependencies to 17
---
components/developer/jenkins-core-weekly/Makefile | 7 ++++---
components/developer/jenkins-core-lts/Makefile | 3 ++-
components/developer/jenkins-core-lts/pkg5 | 2 +-
components/developer/jenkins-core-lts/manifests/sample-manifest.p5m | 3 ++-
components/developer/jenkins-core-weekly/manifests/sample-manifest.p5m | 3 ++-
components/developer/jenkins-core-weekly/jenkins-core-weekly.p5m | 4 ++--
components/developer/jenkins/jenkins.p5m | 2 +-
components/developer/jenkins/files/jenkins-standalone.xml | 4 ++--
components/developer/jenkins-core-lts/jenkins-core-lts.p5m | 4 ++--
components/developer/jenkins/Makefile | 6 +++---
components/developer/jenkins-core-weekly/pkg5 | 2 +-
components/developer/jenkins/pkg5 | 14 ++++++++++++++
transforms/defaults | 2 +-
13 files changed, 37 insertions(+), 19 deletions(-)
diff --git a/components/developer/jenkins-core-lts/Makefile b/components/developer/jenkins-core-lts/Makefile
index 26d3855..1898fed 100644
--- a/components/developer/jenkins-core-lts/Makefile
+++ b/components/developer/jenkins-core-lts/Makefile
@@ -11,6 +11,7 @@
#
# Copyright 2016-2021 Jim Klimov
+# Copyright 2022 Till Wegmueller
#
include ../../../make-rules/shared-macros.mk
@@ -86,4 +87,4 @@
test: $(NO_TESTS)
# Auto-generated dependencies
-REQUIRED_PACKAGES += runtime/java/openjdk8
+REQUIRED_PACKAGES += runtime/java/openjdk17
diff --git a/components/developer/jenkins-core-lts/jenkins-core-lts.p5m b/components/developer/jenkins-core-lts/jenkins-core-lts.p5m
index 8fe994b..7883cc4 100644
--- a/components/developer/jenkins-core-lts/jenkins-core-lts.p5m
+++ b/components/developer/jenkins-core-lts/jenkins-core-lts.p5m
@@ -22,8 +22,8 @@
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 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
diff --git a/components/developer/jenkins-core-lts/manifests/sample-manifest.p5m b/components/developer/jenkins-core-lts/manifests/sample-manifest.p5m
index d3ebed9..c96f3a0 100644
--- a/components/developer/jenkins-core-lts/manifests/sample-manifest.p5m
+++ b/components/developer/jenkins-core-lts/manifests/sample-manifest.p5m
@@ -10,10 +10,11 @@
#
#
-# Copyright 2017 <contributor>
+# Copyright 2022 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
diff --git a/components/developer/jenkins-core-lts/pkg5 b/components/developer/jenkins-core-lts/pkg5
index ade90ff..a418896 100644
--- a/components/developer/jenkins-core-lts/pkg5
+++ b/components/developer/jenkins-core-lts/pkg5
@@ -1,7 +1,7 @@
{
"dependencies": [
"SUNWcs",
- "runtime/java/openjdk8",
+ "runtime/java/openjdk17",
"shell/ksh93",
"system/library"
],
diff --git a/components/developer/jenkins-core-weekly/Makefile b/components/developer/jenkins-core-weekly/Makefile
index 292c855..f0dbb3b 100644
--- a/components/developer/jenkins-core-weekly/Makefile
+++ b/components/developer/jenkins-core-weekly/Makefile
@@ -11,6 +11,7 @@
#
# Copyright 2016-2021 Jim Klimov
+# Copyright 2022 Till Wegmueller
#
include ../../../make-rules/shared-macros.mk
@@ -27,8 +28,8 @@
COMPONENT_NAME= jenkins
JENKINS_RELEASE= weekly
COMPONENT_MAJOR_VERSION= 2
-COMPONENT_MINOR_VERSION= 358
-COMPONENT_ARCHIVE_HASH= sha256:067c057087f751e259adb75b07c7533b3a803feb95f554be9f4fd7623ffaaba1
+COMPONENT_MINOR_VERSION= 364
+COMPONENT_ARCHIVE_HASH= sha256:9b4f1a33b211591f136af02aee611aa6ad4ed92b7b682587a242c1c5a27bb765
# 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 @@
test: $(NO_TESTS)
# Auto-generated dependencies
-REQUIRED_PACKAGES += runtime/java/openjdk8
+REQUIRED_PACKAGES += runtime/java/openjdk17
diff --git a/components/developer/jenkins-core-weekly/jenkins-core-weekly.p5m b/components/developer/jenkins-core-weekly/jenkins-core-weekly.p5m
index 2d3c223..e9147c3 100644
--- a/components/developer/jenkins-core-weekly/jenkins-core-weekly.p5m
+++ b/components/developer/jenkins-core-weekly/jenkins-core-weekly.p5m
@@ -22,8 +22,8 @@
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 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
diff --git a/components/developer/jenkins-core-weekly/manifests/sample-manifest.p5m b/components/developer/jenkins-core-weekly/manifests/sample-manifest.p5m
index 0d77f10..0ffa620 100644
--- a/components/developer/jenkins-core-weekly/manifests/sample-manifest.p5m
+++ b/components/developer/jenkins-core-weekly/manifests/sample-manifest.p5m
@@ -10,10 +10,11 @@
#
#
-# Copyright 2017 <contributor>
+# Copyright 2022 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
diff --git a/components/developer/jenkins-core-weekly/pkg5 b/components/developer/jenkins-core-weekly/pkg5
index 9f9db66..8513613 100644
--- a/components/developer/jenkins-core-weekly/pkg5
+++ b/components/developer/jenkins-core-weekly/pkg5
@@ -1,7 +1,7 @@
{
"dependencies": [
"SUNWcs",
- "runtime/java/openjdk8",
+ "runtime/java/openjdk17",
"shell/ksh93",
"system/library"
],
diff --git a/components/developer/jenkins/Makefile b/components/developer/jenkins/Makefile
index cf2d006..1976f20 100644
--- a/components/developer/jenkins/Makefile
+++ b/components/developer/jenkins/Makefile
@@ -11,6 +11,7 @@
#
# Copyright 2016-2018 Jim Klimov
+# Copyright 2022 Till Wegmueller
#
include ../../../make-rules/shared-macros.mk
@@ -19,8 +20,7 @@
# Due to this, initial version for helper packages starts from that.
COMPONENT_NAME= jenkins
-COMPONENT_VERSION= 2.65
-COMPONENT_REVISION= 3
+COMPONENT_VERSION= 2.364
COMPONENT_FMRI= developer/jenkins
COMPONENT_CLASSIFICATION= Web Services/Application and Web Servers
COMPONENT_PROJECT_URL= http://jenkins-ci.org/
@@ -49,4 +49,4 @@
# Auto-generated dependencies
REQUIRED_PACKAGES += SUNWcs
-REQUIRED_PACKAGES += runtime/java/openjdk8
+REQUIRED_PACKAGES += runtime/java/openjdk17
diff --git a/components/developer/jenkins/files/jenkins-standalone.xml b/components/developer/jenkins/files/jenkins-standalone.xml
index 20f18b1..23ce7bb 100644
--- a/components/developer/jenkins/files/jenkins-standalone.xml
+++ b/components/developer/jenkins/files/jenkins-standalone.xml
@@ -74,7 +74,7 @@
both for JAVA and the JAR itself... Or keep it simple? -->
<exec_method type='method'
name='start'
- exec='/usr/bin/java -DsessionTimeout=%{httpd/sessionTimeout} -DsessionEviction=%{httpd/sessionEviction} -jar %{httpd/jenkins_war_file} --httpPort=%{httpd/httpPort} --httpListenAddress=%{httpd/httpHost} --webroot=%{httpd/jenkins_war_dir}'
+ exec='/usr/bin/java -DsessionTimeout=%{httpd/sessionTimeout} -DsessionEviction=%{httpd/sessionEviction} -jar %{httpd/jenkins_war_file} --httpPort=%{httpd/httpPort} --httpListenAddress=%{httpd/httpHost} --webroot=%{httpd/jenkins_war_dir} &'
timeout_seconds='240'>
<method_context>
<method_credential user='jenkins' group='jenkins' privileges='basic,net_privaddr'/>
@@ -143,7 +143,7 @@
session -->
<propval name='ignore_error' type='astring'
value='core,signal' />
- <propval name='duration' type='astring' value='child' />
+ <propval name='duration' type='astring' value='contract' />
</property_group>
<template>
diff --git a/components/developer/jenkins/jenkins.p5m b/components/developer/jenkins/jenkins.p5m
index b15862f..d87483a 100644
--- a/components/developer/jenkins/jenkins.p5m
+++ b/components/developer/jenkins/jenkins.p5m
@@ -31,7 +31,7 @@
fmri=pkg:/developer/jenkins-core-weekly \
fmri=pkg:/developer/jenkins-core-lts
depend type=require \
- fmri=pkg:/runtime/java/openjdk8
+ fmri=pkg:/runtime/java/openjdk17
# Note: eventually we expect further packages for other webapp-server
# integrations (like tomcat, glassfish, etc.) - those would probably put a
diff --git a/components/developer/jenkins/pkg5 b/components/developer/jenkins/pkg5
new file mode 100644
index 0000000..5a29ecb
--- /dev/null
+++ b/components/developer/jenkins/pkg5
@@ -0,0 +1,14 @@
+{
+ "dependencies": [
+ "SUNWcs",
+ "runtime/java/openjdk17",
+ "shell/ksh93",
+ "system/library"
+ ],
+ "fmris": [
+ "developer/jenkins",
+ "developer/jenkins-common",
+ "developer/jenkins-standalone"
+ ],
+ "name": "jenkins"
+}
\ No newline at end of file
diff --git a/transforms/defaults b/transforms/defaults
index 89b61a5..1a66d0b 100644
--- a/transforms/defaults
+++ b/transforms/defaults
@@ -169,7 +169,7 @@
#
# Set the default Java for mediated links
#
-<transform link mediator=java mediator-version=8 -> default mediator-priority vendor>
+<transform link mediator=java mediator-version=17 -> default mediator-priority vendor>
#
# Set the default MySQL for mediated links
--
Gitblit v1.9.3