Merge remote-tracking branch 'origin/jruby-10.0'

Author: headius

.github/workflows/ci.yml

@@ -22,23 +22,23 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: set up java 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 21
           cache: 'maven'
       - name: build dist archive
         run: |
-          mvn -ntp clean package -Pdist
+          ./mvnw -ntp clean package -Pdist
           mv maven/jruby-dist/target/jruby-dist*-bin.tar.gz jruby-dist-bin.tar.gz
       - name: cache dist
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
-          name: jruby-dist
           path: jruby-dist-bin.tar.gz
           retention-days: 1
+          archive: false
 
   rails-verification:
 
@@ -56,18 +56,18 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           path: jruby-src
       - name: set up java ${{ matrix.java-version }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
       - name: download cached dist
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v8
         with:
-          name: jruby-dist
+          name: jruby-dist-bin.tar.gz
       - name: unpack dist
         run: tar xzf jruby-dist-bin.tar.gz --strip-components=1
       - name: dist verification (Windows)

.github/workflows/dist-verification-ci.yml

@@ -8,7 +8,7 @@ jobs:
   publish:
     permissions:
       contents: read
-    uses: jruby/jruby/.github/workflows/snapshot-publish.yml@659a649a802bafb69c5d216f6fbc4160c749d454
+    uses: ./.github/workflows/snapshot-publish.yml
     with:
       javaLevel: 21
     secrets:

.github/workflows/manual-snapshot-publish-21.yml

@@ -8,7 +8,7 @@ jobs:
   publish:
     permissions:
       contents: read
-    uses: jruby/jruby/.github/workflows/snapshot-publish.yml@659a649a802bafb69c5d216f6fbc4160c749d454
+    uses: ./.github/workflows/snapshot-publish.yml
     with:
       javaLevel: 8
     secrets:

.github/workflows/manual-snapshot-publish.yml

@@ -15,7 +15,7 @@ jobs:
     permissions:
       contents: read
     if: ${{ github.ref == 'refs/heads/master' && github.repository == 'jruby/jruby' }}
-    uses: jruby/jruby/.github/workflows/snapshot-publish.yml@659a649a802bafb69c5d216f6fbc4160c749d454
+    uses: ./.github/workflows/snapshot-publish.yml
     with:
       javaLevel: 21
     secrets:

.github/workflows/nightly-snapshot-publish-21.yml

@@ -15,7 +15,7 @@ jobs:
     permissions:
       contents: read
     if: ${{ github.ref == 'refs/heads/jruby-9.4' && github.repository == 'jruby/jruby' }}
-    uses: jruby/jruby/.github/workflows/snapshot-publish.yml@659a649a802bafb69c5d216f6fbc4160c749d454
+    uses: ./.github/workflows/snapshot-publish.yml
     with:
       javaLevel: 8
     secrets:

.github/workflows/nightly-snapshot-publish.yml

@@ -23,24 +23,23 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: set up Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: ${{ inputs.javaLevel }}
           server-id: central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
       - name: Publish package
-        run: ./mvnw -B clean deploy -Psnapshots
+        run: ./mvnw -ntp clean deploy -Psnapshots
         env:
           MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
       - name: Archive non-Maven artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
-          name: jruby-jars gem
-          path: |
-            maven/jruby-jars/pkg/jruby-jars-*.SNAPSHOT.gem
+          path: maven/jruby-jars/pkg/jruby-jars-*.SNAPSHOT.gem
+          archive: false
 

.github/workflows/snapshot-publish.yml

@@ -1,18 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar
+wrapperVersion=3.3.4
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.14/apache-maven-3.9.14-bin.zip

.mvn/wrapper/maven-wrapper.jar

@@ -5,7 +5,6 @@ Prerequisites:
 
 * A [Java 21-compatible (or higher) Java development kit (JDK)](http://www.oracle.com/technetwork/java/javase/downloads/index.html).
   * If `JAVA_HOME` is not set on Mac OS X: `export JAVA_HOME=$(/usr/libexec/java_home)`
-* [Maven](https://maven.apache.org/download.cgi) 3.3.0+ (Maven Wrapper provided with `./mvnw`)
 
 For running tests, you will need Ant:
 
@@ -25,21 +24,19 @@ command to execute is:
 ./mvnw
 ```
 
-This will run the default "install" goal (`mvn install`) and will do all of the following:
+This will run the default "install" goal (`./mvnw install`) and will do all of the following:
 
 * Compile JRuby
 * Build `lib/jruby.jar`, needed for running at command line
 * It will install the default gems specifications `lib/pom.rb` and the ruby files of those gems in `lib/ruby/stdlib/`.
 
 The environment is now suitable for running Ruby applications.
 
-If you have Maven installed in your PATH, you can just use `mvn` instead of `./mvnw`.
-
 Incremental Builds
 ------------------
 
 When working on JRuby sources, it is helpful to incrementally rebuild only the `lib/jruby.jar` file rather than also
-re-assembling the standard library. You can add `-Dcore` to the `mvn` command line to speed up incremental builds:
+re-assembling the standard library. You can add `-Dcore` to the `./mvnw` command line to speed up incremental builds:
 
 ```
 ./mvnw -Dcore
@@ -92,7 +89,7 @@ environment. This will do the following:
  needed to run integration tests.
 
 ```
-mvn -Pbootstrap
+./mvnw -Pbootstrap
 ```
 
 In case there is a problem with installing the jruby-launcher (due to missing compiler or so) use
@@ -110,7 +107,7 @@ After changing Java code, you can recompile quickly by running one of the
 jar files by
 
 ```
-mvn -pl core
+./mvnw -pl core
 ```
 
 ### Day to Day Testing
@@ -160,7 +157,7 @@ Most of the specs under the spec/ directory are written for rspec, and can be ru
 
 The notable exception is the "Ruby specs" under spec/ruby, which are run with mspec as described later in this document.
 
-rspec will be installed with `mvn package -Pbootstrap` or you can install it manually.
+rspec will be installed with `./mvnw package -Pbootstrap` or you can install it manually.
 
 ```
 ./bin/jruby -S rspec spec/path/to/spec
@@ -193,17 +190,17 @@ If you are making changes that would affect JRuby's core runtime
 or embedding APIs, you should run JRuby's Java-based unit tests via
 
 ```
-mvn -Ptest
+./mvnw -Ptest
 ```
 
 #### Tests for other ways of deploying and packaging JRuby
 
 There are some maven integration tests (i.e. consistency test if all gems are included, osgi test, etc) for the various distributions of JRuby which can be invoked with
 
 ```
-mvn -Pmain -Dinvoker.skip=false
-mvn -Pcomplete -Dinvoker.skip=false
-mvn -Pdist -Dinvoker.skip=false
+./mvnw -Pmain -Dinvoker.skip=false
+./mvnw -Pcomplete -Dinvoker.skip=false
+./mvnw -Pdist -Dinvoker.skip=false
 ```
 
 #### Just Like CI
@@ -224,18 +221,18 @@ maven/jruby-dist/src/it
 To trigger the tests with the build:
 
 ```
-mvn -Pmain -Dinvoker.skip=false
-mvn -Pcomplete -Dinvoker.skip=false
-mvn -Pdist -Dinvoker.skip=false
-mvn -Pjruby-jars -Dinvoker.skip=false
+./mvnw -Pmain -Dinvoker.skip=false
+./mvnw -Pcomplete -Dinvoker.skip=false
+./mvnw -Pdist -Dinvoker.skip=false
+./mvnw -Pjruby-jars -Dinvoker.skip=false
 ```
 
 To pick a particular test, add the name of the directory inside the respective *src/it* folder, like (wildcards are possible):
 
 ```
-mvn -Pmain -Dinvoker.skip=false -Dinvoker.test=integrity
-mvn -Pmain -Dinvoker.skip=false -Dinvoker.test=j2ee*
-mvn -Pmain -Dinvoker.skip=false -Dinvoker.test=osgi*
+./mvnw -Pmain -Dinvoker.skip=false -Dinvoker.test=integrity
+./mvnw -Pmain -Dinvoker.skip=false -Dinvoker.test=j2ee*
+./mvnw -Pmain -Dinvoker.skip=false -Dinvoker.test=osgi*
 ```
 
 Clean Build
@@ -244,7 +241,7 @@ Clean Build
 To clean the build it is important to use the same profile for the clean as what you want to build. The best way to clean build something is, i.e. jruby-jars
 
 ```
-mvn clean install -Pjruby-jars
+./mvnw clean install -Pjruby-jars
 ```
 
 This first cleans everything and then starts the new build in one go!
@@ -253,12 +250,12 @@ Cleaning the build may be necessary after switching to a different
 version of JRuby (for example, after switching git branches) to ensure
 that everything is rebuilt properly.
 
-NOTE: `mvn clean` just cleans the **jruby-core** artifact and the **./lib/jruby.jar**!
+NOTE: `./mvnw clean` just cleans the **jruby-core** artifact and the **./lib/jruby.jar**!
 
 Clean everything:
 
 ```
-mvn -Pclean
+./mvnw -Pclean
 ```
 
 Distribution Packages