[pull] master from Netflix:master

.github/CODEOWNERS

@@ -0,0 +1,6 @@
+# Default reviewers for Zuul OSS
+* @argha-c @jguerra @gavinbunney @lalernehl @lindseyreynolds @connorworley @AlexanderEllis @spethani
+
+# Note: exclusions aren't well supported atm.
+# If needed, use workflows to exclude specific files from review.
+

.github/workflows/benchmark.yml

@@ -0,0 +1,25 @@
+name: benchmark
+
+on:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+env:
+  JDK: '21'
+  DISTRIBUTION: 'zulu'
+  GRADLE_COMMAND: './gradlew --no-daemon'
+
+jobs:
+  benchmark:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - name: Set up JDK ${{ env.JDK }}
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ env.JDK }}
+          distribution: ${{ env.DISTRIBUTION }}
+      - name: JMH
+        run: ${{ env.GRADLE_COMMAND }} clean :zuul-core:jmh

.github/workflows/branch_snapshot.yml

@@ -0,0 +1,44 @@
+name: Branch Snapshot
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch to publish snapshot of'
+        required: true
+        default: 'master'
+      repository:
+        description: 'Repository name (override for forks)'
+        required: false
+        default: Netflix/zuul
+      version:
+        description: 'The version number to use'
+        required: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup Git
+        run: |
+          git config --global user.name 'Zuul Build'
+          git config --global user.email '[email protected]'
+      - uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+          ref: ${{ github.event.inputs.branch }}
+          repository: ${{ github.event.inputs.repository }}
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 21
+          cache: 'gradle'
+      - name: Build snapshot
+        run: ./gradlew build snapshot -Prelease.version="$BUILD_VERSION"
+        env:
+          BUILD_VERSION: ${{ github.event.inputs.version }}
+          NETFLIX_OSS_SIGNING_KEY: ${{ secrets.ORG_SIGNING_KEY }}
+          NETFLIX_OSS_SIGNING_PASSWORD: ${{ secrets.ORG_SIGNING_PASSWORD }}
+          NETFLIX_OSS_REPO_USERNAME: ${{ secrets.ORG_NETFLIXOSS_USERNAME }}
+          NETFLIX_OSS_REPO_PASSWORD: ${{ secrets.ORG_NETFLIXOSS_PASSWORD }}

.github/workflows/gradle-wrapper-validation.yml

@@ -6,5 +6,5 @@ jobs:
     name: "Gradle wrapper validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: gradle/wrapper-validation[email protected]
+      - uses: actions/checkout@v5
+      - uses: gradle/actions/wrapper-validation@v4

.github/workflows/pr.yml

@@ -7,33 +7,24 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11, 15]
+        java: [21]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
-      - uses: actions/[email protected]
-        id: gradle-cache
-        with:
-          path: |
-            ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-      - uses: actions/[email protected]
-        id: gradle-wrapper-cache
-        with:
-          path: |
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradlewrapper-${{ hashFiles('gradle/wrapper/*') }}
+          cache: 'gradle'
       - name: Build
-        run: ./gradlew build
+        run: |
+          sudo env "PATH=$PATH" bash -c "ulimit -l 65536 && ulimit -a && ./gradlew --no-daemon build"
+          echo "Status of build: $?"
   validation:
     name: "Gradle Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: gradle/wrapper-validation[email protected]
+      - uses: actions/checkout@v5
+      - uses: gradle/actions/wrapper-validation@v4

.github/workflows/release.yml

@@ -10,25 +10,18 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: gradle/[email protected]
+      - name: Setup Git
+        run: |
+          git config --global user.name 'Zuul Build'
+          git config --global user.email '[email protected]'
+      - uses: actions/checkout@v5
+      - uses: gradle/actions/wrapper-validation@v4
       - name: Set up JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: 8
-      - uses: actions/[email protected]
-        id: gradle-cache
-        with:
-          path: |
-            ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-      - uses: actions/[email protected]
-        id: gradle-wrapper-cache
-        with:
-          path: |
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradlewrapper-${{ hashFiles('gradle/wrapper/*') }}
+          distribution: 'temurin'
+          java-version: 21
+          cache: 'gradle'
       - name: Build candidate
         if: contains(github.ref, '-rc.')
         run: ./gradlew --info --stacktrace -Prelease.useLastTag=true candidate

.github/workflows/snapshot.yml

@@ -9,27 +9,20 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Setup Git
+        run: |
+          git config --global user.name 'Zuul Build'
+          git config --global user.email '[email protected]'
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Set up JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: 8
-      - uses: actions/[email protected]
-        id: gradle-cache
-        with:
-          path: |
-            ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-      - uses: actions/[email protected]
-        id: gradle-wrapper-cache
-        with:
-          path: |
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradlewrapper-${{ hashFiles('gradle/wrapper/*') }}
-      - name: Build
+          distribution: 'temurin'
+          java-version: 21
+          cache: 'gradle'
+      - name: Build snapshot
         run: ./gradlew build snapshot
         env:
           NETFLIX_OSS_SIGNING_KEY: ${{ secrets.ORG_SIGNING_KEY }}

.github/workflows/stale.yml

@@ -0,0 +1,18 @@
+name: 'Close stale issues and PRs'
+on:
+  schedule:
+    - cron: "*/10 5 * * *"
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v9
+        with:
+          stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
+          stale-pr-message: 'This PR is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
+          close-issue-message: 'This issue was closed because it has been stalled for 7 days with no activity.'
+          close-pr-message: 'This PR was closed because it has been stalled for 7 days with no activity.'

.gitignore

@@ -55,6 +55,12 @@ out
 *.iml
 atlassian-ide-plugin.xml
 
+# Visual Studio Code
+.vscode
+
+# Java heap profile
+*.hprof
+
 # Eclipse specific files/directories
 .classpath
 .project

README.md

@@ -1,8 +1,9 @@
+[![Snapshot](https://github.com/Netflix/zuul/actions/workflows/snapshot.yml/badge.svg)](https://github.com/Netflix/zuul/actions/workflows/snapshot.yml)
+
 # Zuul
 
 <img src="https://i.imgur.com/mRSosEp.png" width=500/>
 
-[![Build Status](https://travis-ci.org/Netflix/zuul.svg)](https://travis-ci.org/Netflix/zuul/builds)
 
 Zuul is an L7 application gateway that provides capabilities for dynamic routing, monitoring, resiliency, security, and more.
 Please view the wiki for usage, information, HOWTO, etc https://github.com/Netflix/zuul/wiki
@@ -55,7 +56,7 @@ https://jhipster.github.io/
 
 Info and examples from various projects:
 
-https://spring.io/guides/gs/routing-and-filtering/
+https://cloud.spring.io/spring-cloud-netflix/multi/multi__router_and_filter_zuul
 
 http://www.baeldung.com/spring-rest-with-zuul-proxy
 
@@ -74,3 +75,16 @@ https://engineering.riotgames.com/news/riot-games-api-deep-dive
 http://instea.sk/2015/04/netflix-zuul-vs-nginx-performance/
 
 ---
+
+
+# How to release Zuul
+
+This project uses a GitHub Action workflow for publishing a new release.
+The workflow is triggered by a Git tag.
+
+```
+git checkout master
+git tag vX.Y.Z
+git push --tags
+```
+