Merge branch 'jenkins-infra:master' into master

lakshmishreea122003 · Mar 8, 2025 · 119e654 · 119e654
2 parents 45e89c3 + 3d71d7b
commit 119e654
Show file tree

Hide file tree

Showing 83 changed files with 1,257 additions and 324 deletions.
diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-20.18.1
+20.18.3
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.18.1 as node
+FROM node:20.18.3 as node
 ENV USE_LOCAL_NODE=true
 
 WORKDIR /usr/src/jenkinsio/build/_site/

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -27,7 +27,7 @@ GEM
     base64 (0.2.0)
     coderay (1.1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.3.4)
+    concurrent-ruby (1.3.5)
     csv (3.3.2)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
@@ -132,7 +132,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    uri (0.13.1)
+    uri (0.13.2)
     webrick (1.8.2)
 
 PLATFORMS

diff --git a/content/_data/changelogs/lts.yml b/content/_data/changelogs/lts.yml
@@ -12550,6 +12550,11 @@
 - version: "2.492.2"
   date: 2025-03-05
   changes:
+  - type: security
+    message: Security fixes.
+    references:
+      - url: /security/advisory/2025-03-05/
+        title: security advisory
   - type: bug
     category: bug
     pull: 10177

diff --git a/content/_data/changelogs/weekly.yml b/content/_data/changelogs/weekly.yml
@@ -26068,6 +26068,15 @@
   # pull: 10335 (PR title: Update eslint monorepo to v9.21.0)
   # pull: 10338 (PR title: Fix checkstyle errors)
 
+  - version: '2.500'
+    date: 2025-03-05
+    changes:
+    - type: security
+      message: Security fixes.
+      references:
+        - url: /security/advisory/2025-03-05/
+          title: security advisory
+
 # DO NOT EDIT THIS FILE DIRECTLY ON GITHUB IF YOU HAVE COMMIT ACCESS
 # ALL CHANGES MUST GO THROUGH PULL REQUESTS
 # MALFORMED FILE CONTENTS WILL BREAK THE SITE BUILD
diff --git a/content/_data/indexpage/carousel.yml b/content/_data/indexpage/carousel.yml
@@ -1,3 +1,4 @@
+# Alpha Omega Grant
 - :href: /blog/2024/10/04/content-security-policy-grant/
   :title: Alpha Omega Foundation Content Security Policy Grant
   :intro: Alpha Omega Foundation has provided a grant to Jenkins to improve the implementation of Content Security Policy.
@@ -9,19 +10,19 @@
     :text: More info
     :href: /blog/2024/10/04/content-security-policy-grant/
 
-# Jenkins 2024 board and officer results
-- :href: /blog/2024/12/03/election-results/
-  :title: Jenkins Elections 2024 results are announced!
-  :intro: The 2024 Jenkins governance board elections have finished and the results have been published.
-    Thanks to everyone who participated and welcome to those elected.
+# Jenkins in GSoC 2025
+- :href: /blog/2025/03/05/Jenkins-in-Google-Summer-of-Code-2025/
+  :title: Jenkins accepted into Google Summer of Code 2025
+  :intro: We are excited to announce that Jenkins 
+    has been accepted into Google Summer of Code 2025 as a mentor organization!
   :image:
-    :src: /images/governance/elections/2024/opengraph.png
-    :height: 320px
+    :src: /images/post-images/2025/03/GSoC2025_opengraph.png
+    :height: 285px
   :call_to_action:
-    :text: Election results
-    :href: /blog/2024/12/03/election-results/
+    :text: More info
+    :href: /blog/2025/03/05/Jenkins-in-Google-Summer-of-Code-2025/
 
-#
+# Jenkins 2024 DevOps Dozen Award
 - :href: https://devopsdozen.com/devops-dozen-2024-community-award-winners/
   :title: Jenkins wins DevOps Dozen award
   :intro: Jenkins has been awarded the
@@ -33,6 +34,8 @@
   :call_to_action:
     :text: More info
     :href: https://devopsdozen.com/devops-dozen-2024-community-award-winners/
+
+#
 - :href: https://contributors.jenkins.io/
   :title: Meet the driving forces
   :intro: behind Jenkins

diff --git a/content/artwork/index.html.haml b/content/artwork/index.html.haml
@@ -1,48 +1,81 @@
 ---
-layout: default
-title: Jenkins Artwork
+layout: simplepage
+title: Artwork
+tight: true
 ---
 
-/ Please add new logo meta-data to content/images/logos and content/_data/logo
-
-.container
-  .row
-    &nbsp;
-  .row
-    .col-12
-      %h1.text-center
-        Artwork
-
-      %p
-        The original Jenkins logo was created by our friends at
-        %a{:href => 'https://frontside.com'}
-          Frontside.
-        Special thanks to
-        %a{:href => 'https://github.com/cowboyd'}
-          Charles Lowell
-        for his efforts championing the logo's original design. Usage
-        guidelines for the original logo can be found on our
-        %a{:href => '/press'}
-          Press
-        page. This page simply catalogues the many clever variations of Jenkins
-        created by members of the Jenkins community.
-
-      %p
-        These images are also available in various sizes and SVG formats
-        online, or as a zip file.  These are licensed under the
-        %a{:href => 'https://creativecommons.org/licenses/by-sa/3.0/'}
-          Creative Commons Attribution-ShareAlike 3.0 Unported License.
-        Under the terms of this license, you must include an attribution to the
-        Jenkins project, with a link (https://jenkins.io/), if you display
-        these logos or derivates thereof.
+:css
+  .artwork-container {
+    padding: 2rem 0;
+  }
+  .logo-thumb {
+    max-width: 100%;
+    height: auto;
+    border-radius: 8px;
+    margin-bottom: 1rem;
+    &:hover {
+      opacity: 0.80;
+    }
+    &:active {
+      opacity: 0.6;
+      scale: 0.9;
+    }
+  }
+  .logo-card {
+    text-align: center;
+    padding: 1rem;
+    background: var(--background);
+    border: 1px solid var(--border-color);
+    border-radius: 8px;
+    margin-bottom: 1.5rem;
+    transition: 0.2s ease;
+  }
+
+  .logo-card h3 {
+    font-size: 1.25rem;
+    margin-bottom: 0.75rem;
+  }
+  .logo-card p {
+    font-size: 0.95rem;
+    color: var(--text-color);
+    margin: 0.25rem 0;
+  }
+  .logo-card small {
+    font-size: 0.85rem;
+  }
+
+.row
+  .col-12
+    %p
+      The original Jenkins logo was created by our friends at
+      %a{:href => 'https://frontside.com'}
+        Frontside.
+      Special thanks to
+      %a{:href => 'https://github.com/cowboyd'}
+        Charles Lowell
+      for his efforts championing the logo's original design. Usage
+      guidelines for the original logo can be found on our
+      %a{:href => '/press'}
+        Press
+      page. This page simply catalogues the many clever variations of Jenkins
+      created by members of the Jenkins community.
+
+    %p
+      These images are also available in various sizes and SVG formats
+      online, or as a zip file.  These are licensed under the
+      %a{:href => 'https://creativecommons.org/licenses/by-sa/3.0/'}
+        Creative Commons Attribution-ShareAlike 3.0 Unported License.
+      Under the terms of this license, you must include an attribution to the
+      Jenkins project, with a link (https://jenkins.io/), if you display
+      these logos or derivates thereof.
 
 %hr/
 
-.container.artwork-container
+.artwork-container
   .row
     - site.logo.sort.to_h.each_pair do |key, logo|
       .col-12.col-md-6.col-lg-4
-        .text-center
+        .logo-card
           %h3{:id => text_to_id(logo['name'])}
             = logo['name']
           %a{:href => expand_link("images/#{logo['url']}"), :target => '_blank', :rel => 'noreferrer noopener'}
@@ -67,60 +100,57 @@ title: Jenkins Artwork
 
 %hr/
 
-.container
-  .row
-    .col-md-12
-      %h2
-        3D model
-
-      %p
-        3D version of Mr.Jenkins is 
-        %a{:href => 'https://www.shapeways.com/model/2183445/mr-jenkins.html?materialId=26'}
-          available here
-        for order. If you want to print your own, 
-        %a{:href => 'https://drive.google.com/file/d/1tdPch-TKVF6T7w3Et9aVYRnE-fRtm3cR/view?usp=sharing'}
-          the data is here.
-
-      %p
-        As per the license of the original artwork, the 3D data model is under the same 
-        %a{:href => 'http://creativecommons.org/licenses/by-sa/3.0/'}
-          Creative Commons Attribution-ShareAlike 3.0 Unported License. 
-        The 3D logo design is by 
-        %a{:href => 'https://www.fast-d.com/search/engineers/2798'}
-          akiki.
+.row
+  .col-md-12
+    %h2
+      3D model
+
+    %p
+      3D version of Mr.Jenkins is 
+      %a{:href => 'https://www.shapeways.com/model/2183445/mr-jenkins.html?materialId=26'}
+        available here
+      for order. If you want to print your own, 
+      %a{:href => 'https://drive.google.com/file/d/1tdPch-TKVF6T7w3Et9aVYRnE-fRtm3cR/view?usp=sharing'}
+        the data is here.
+
+    %p
+      As per the license of the original artwork, the 3D data model is under the same 
+      %a{:href => 'http://creativecommons.org/licenses/by-sa/3.0/'}
+        Creative Commons Attribution-ShareAlike 3.0 Unported License. 
+      The 3D logo design is by 
+      %a{:href => 'https://www.fast-d.com/search/engineers/2798'}
+        akiki.
 
 %hr/
 
-.container
-  .row
-    .col-md-12
-      %h2
-        HeroForge 3D model
-
-      %p
-        The HeroForge 3D version of Mr.Jenkins is 
-        %a{:href => 'https://www.heroforge.com/load_config%3D13211607/'}
-          available here
-        for order. If you want to print your own, HeroForge provides STL for purchase.
-
-      %p
-        As per the license of the original artwork, the 3D data model is under the same 
-        %a{:href => 'http://creativecommons.org/licenses/by-sa/3.0/'}
-          Creative Commons Attribution-ShareAlike 3.0 Unported License. 
-        The 3D logo design is by 
-        %a{:href => 'https://www.linkedin.com/in/w-douglas-west-0856094/'}
-          D. West.
+.row
+  .col-md-12
+    %h2
+      HeroForge 3D model
+
+    %p
+      The HeroForge 3D version of Mr.Jenkins is 
+      %a{:href => 'https://www.heroforge.com/load_config%3D13211607/'}
+        available here
+      for order. If you want to print your own, HeroForge provides STL for purchase.
+
+    %p
+      As per the license of the original artwork, the 3D data model is under the same 
+      %a{:href => 'http://creativecommons.org/licenses/by-sa/3.0/'}
+        Creative Commons Attribution-ShareAlike 3.0 Unported License. 
+      The 3D logo design is by 
+      %a{:href => 'https://www.linkedin.com/in/w-douglas-west-0856094/'}
+        D. West.
 
 %hr/
 
-.container
-  .row
-    .col-md-12
-      %h3
-        Adding a Logo
-      %p
-        In order to add a new logo, please refer to the 
-        %a{:href => 'https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#adding-a-logo'}
-          CONTRIBUTING guidelines.
+.row
+  .col-md-12
+    %h3
+      Adding a Logo
+    %p
+      In order to add a new logo, please refer to the 
+      %a{:href => 'https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#adding-a-logo'}
+        CONTRIBUTING guidelines.
 
 = partial('anchors.html.haml', :selector => '.artwork-container');
diff --git a/content/blog/2025/03/05/2025-03-05-Jenkins-in-Google-Summer-of-Code-2025.adoc b/content/blog/2025/03/05/2025-03-05-Jenkins-in-Google-Summer-of-Code-2025.adoc
@@ -0,0 +1,32 @@
+---
+layout: post
+title: "Jenkins in Google Summer of Code 2025"
+tags: 
+- gsoc
+- gsoc2025
+- events
+- community
+authors:
+- alyssat
+description: "Announcing Jenkins project selected as Google Summer of Code 2025 mentoring organization."
+opengraph:
+  image: /images/post-images/2025/03/GSoC2025_opengraph.png
+---
+
+image:/images/post-images/2025/03/GSoC2025_opengraph.png[role=center]
+
+We are excited to have been accepted to https://summerofcode.withgoogle.com/[Google Summer of Code (GSoC) 2025]! This marks our ninth year participating as a mentoring organization in the program. Thank you Google!
+
+GSoC is more than just a mentoring program; it is an opportunity to welcome and engage new contributors in open-source development. By dedicating time to mentor and guide GSoC contributors, we help shape the future of both the individuals involved and the broader Jenkins community. The impact of these contributions extends beyond the program, benefiting countless Jenkins users worldwide.
+
+We eagerly welcome new GSoC contributors to the Jenkins family! This journey will provide invaluable hands-on experience, technical skill enhancement, and insight into the workings of an active open-source community. Most importantly, participants will have the chance to learn from passionate mentors dedicated to making a meaningful difference—for both individual contributors and the Jenkins project as a whole.
+
+== What’s on the near horizon for GSoC candidates? 
+
+* Refer to the link:https://www.jenkins.io/projects/gsoc/contributors/[information for contributors] page for full application guidelines.
+* Join these webinars for a walk through of project ideas: link:https://www.meetup.com/jenkins-online-meetup/events/306446006/?eventOrigin=group_upcoming_events[March 5] and link:https://www.meetup.com/jenkins-online-meetup/events/306446080/?eventOrigin=group_upcoming_events[March 6]. Recording will be available after each session.
+* Submit your draft proposal for review/feedback by mentors. Use link:https://forms.gle/i8Gv9AcfgNiB1xAW8[this form] to submit your draft proposal for review. The deadline is April 1.
+* Use link:https://docs.google.com/document/d/1dIlPLXfLbFsvcaHFuwmH9_lSCVm9m6-SgNYTNAnSZpY/edit?tab=t.0[this template] to write your project proposal. 
+
+Refer to the link:https://developers.google.com/open-source/gsoc/timeline[GSoC timeline] for a complete list of important dates.
+