diff --git a/asf-site-src/Gemfile.lock b/asf-site-src/Gemfile.lock index 9d7fe8f2..d33dc364 100644 --- a/asf-site-src/Gemfile.lock +++ b/asf-site-src/Gemfile.lock @@ -1,38 +1,38 @@ GIT remote: https://github.com/middleman/middleman-syntax.git - revision: d1b3edd4d2a5ad1028621f6c03ab709a1d94d4e2 + revision: 888e1a6590830ef7e6163301d3bd53afa39614c0 specs: - middleman-syntax (3.3.0) + middleman-syntax (3.4.0) middleman-core (>= 3.2) rouge (~> 3.2) GEM remote: https://rubygems.org/ specs: - activesupport (7.0.7.2) + activesupport (7.0.8.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.5) - public_suffix (>= 2.0.2, < 6.0) - backports (3.24.1) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + backports (3.25.0) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.2.2) - contracts (0.17) - dotenv (2.8.1) + concurrent-ruby (1.3.4) + contracts (0.16.1) + dotenv (3.1.4) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) erubis (2.7.0) eventmachine (1.2.7) - execjs (2.8.1) + execjs (2.9.1) fast_blank (1.0.1) - fastimage (2.2.7) - ffi (1.15.5) + fastimage (2.3.1) + ffi (1.17.0) haml (5.2.2) temple (>= 0.8.0) tilt @@ -46,27 +46,28 @@ GEM rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - libv8-node (18.16.0.0) - libv8-node (18.16.0.0-aarch64-linux) - libv8-node (18.16.0.0-x86_64-linux) - listen (3.8.0) + libv8-node (21.7.2.0-aarch64-linux) + libv8-node (21.7.2.0-arm64-darwin) + libv8-node (21.7.2.0-x86_64-darwin) + libv8-node (21.7.2.0-x86_64-linux) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) memoist (0.16.2) - middleman (4.5.0) + middleman (4.5.1) coffee-script (~> 2.2) haml (>= 4.0.5) kramdown (>= 2.3.0) - middleman-cli (= 4.5.0) - middleman-core (= 4.5.0) - middleman-cli (4.5.0) - thor (>= 0.17.0, < 2.0) - middleman-core (4.5.0) + middleman-cli (= 4.5.1) + middleman-core (= 4.5.1) + middleman-cli (4.5.1) + thor (>= 0.17.0, < 1.3.0) + middleman-core (4.5.1) activesupport (>= 6.1, < 7.1) addressable (~> 2.4) backports (~> 3.6) bundler (~> 2.0) - contracts (~> 0.13) + contracts (~> 0.13, < 0.17) dotenv erubis execjs (~> 2.0) @@ -90,29 +91,29 @@ GEM em-websocket (~> 0.5.1) middleman-core (>= 3.3) rack-livereload (~> 0.3.15) - mini_racer (0.8.0) - libv8-node (~> 18.16.0.0) - minitest (5.19.0) + mini_racer (0.12.0) + libv8-node (~> 21.7.2.0) + minitest (5.25.1) padrino-helpers (0.15.3) i18n (>= 0.6.7, < 2) padrino-support (= 0.15.3) tilt (>= 1.4.1, < 3) padrino-support (0.15.3) - parallel (1.23.0) + parallel (1.26.3) parslet (2.0.0) - public_suffix (5.0.3) - rack (2.2.8) + public_suffix (6.0.1) + rack (2.2.9) rack-livereload (0.3.17) rack rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.2.6) + rexml (3.3.8) rouge (3.30.0) sassc (2.4.0) ffi (~> 1.9) servolux (0.13.0) - temple (0.10.2) + temple (0.10.3) thor (1.2.2) tilt (2.0.11) toml (0.3.0) @@ -121,11 +122,12 @@ GEM concurrent-ruby (~> 1.0) uglifier (3.2.0) execjs (>= 0.3.0, < 3) - webrick (1.8.1) + webrick (1.8.2) PLATFORMS aarch64-linux - aarh64-linux + arm64-darwin + x86_64-darwin x86_64-linux DEPENDENCIES @@ -139,4 +141,4 @@ DEPENDENCIES wdm (~> 0.1.0) BUNDLED WITH - 2.4.19 + 2.5.20 diff --git a/asf-site-src/source/documentation/in-progress/interface-classification.html.md b/asf-site-src/source/documentation/in-progress/interface-classification.html.md index 28a12fc0..d6f1e389 100644 --- a/asf-site-src/source/documentation/in-progress/interface-classification.html.md +++ b/asf-site-src/source/documentation/in-progress/interface-classification.html.md @@ -188,7 +188,7 @@ How should the classification be recorded for the annotated APIs? providing an implementation of a standards-body based interface that is still under development. For example, many companies, in an attempt to be first to market, have provided implementations of a new NFS protocol even - when the protocol was not fully completed by IETF. The implementor cannot + when the protocol was not fully completed by IETF. The implementer cannot evolve the interface in a fashion that causes least disruption because the stability is controlled by the standards body. Hence it is appropriate to label the interface as unstable. diff --git a/asf-site-src/source/documentation/in-progress/precommit/plugins/junit-bugsystem.html.md b/asf-site-src/source/documentation/in-progress/precommit/plugins/junit-bugsystem.html.md index f8512a4c..f19d5335 100644 --- a/asf-site-src/source/documentation/in-progress/precommit/plugins/junit-bugsystem.html.md +++ b/asf-site-src/source/documentation/in-progress/precommit/plugins/junit-bugsystem.html.md @@ -41,7 +41,7 @@ None | Option | Notes | |:---------|:------| -| `--junit-report-style=[full|line]` | Style of the junit report | +| `--junit-report-style=[full\|line]` | Style of the junit report | | `--junit-report-xml=` | Name of the output file | ## JUnit Style diff --git a/asf-site-src/source/documentation/in-progress/precommit/plugins/make.html.md b/asf-site-src/source/documentation/in-progress/precommit/plugins/make.html.md index 1a7b7f82..16e19ad7 100644 --- a/asf-site-src/source/documentation/in-progress/precommit/plugins/make.html.md +++ b/asf-site-src/source/documentation/in-progress/precommit/plugins/make.html.md @@ -46,7 +46,8 @@ None | Option | Notes | |:---------|:------| | `--make-cmd=` | Executable location | -| `--make-file=` | Filename to use instead of the default `Makefile` | `--make-use-git-clean` | Instead of `make clean`, use `git clean` to wipe the repository | +| `--make-file=` | Filename to use instead of the default `Makefile` | +| `--make-use-git-clean` | Instead of `make clean`, use `git clean` to wipe the repository | # Docker Notes diff --git a/pom.xml b/pom.xml index d1f1bfc7..c8944870 100644 --- a/pom.xml +++ b/pom.xml @@ -65,17 +65,17 @@ 11 11 - 10.11.0 - 2.12.0 - 3.1.0 - 1.5.0 - 5.9.3 - 3.2.2 - 3.5.0 - 3.1.2 - 0.15 - 5.3.1 - 4.7.3.5 + 10.18.1 + 2.17.0 + 3.4.1 + 1.6.0 + 5.11.1 + 3.5.0 + 3.7.0 + 3.9.0 + 0.16.1 + 5.14.0 + 4.8.6.0 source-release-tar n @@ -250,7 +250,6 @@ apache-rat-plugin ${maven-rat-plugin.version} - false .mvn/maven.config .gitattributes diff --git a/precommit/src/main/shell/github-status-recovery.sh b/precommit/src/main/shell/github-status-recovery.sh index b03732be..acdca374 100755 --- a/precommit/src/main/shell/github-status-recovery.sh +++ b/precommit/src/main/shell/github-status-recovery.sh @@ -118,7 +118,7 @@ function yetus_usage echo "${BINNAME} [OPTIONS]" - yetus_add_option "--github-annotations=" "Enable GitHub Checks Annoations [default: ${GITHUB_CHECK_ANNOTATIONS}]" + yetus_add_option "--github-annotations=" "Enable GitHub Checks Annotations [default: ${GITHUB_CHECK_ANNOTATIONS}]" yetus_add_option "--curl-cmd=" "The 'curl' command to use (default 'curl')" yetus_add_option "--debug" "If set, then output some extra stuff to stderr" yetus_add_option "--grep-cmd=" "The 'grep' command to use (default 'grep')" diff --git a/precommit/src/main/shell/plugins.d/codespell.sh b/precommit/src/main/shell/plugins.d/codespell.sh index f4f75a3e..68ffb745 100755 --- a/precommit/src/main/shell/plugins.d/codespell.sh +++ b/precommit/src/main/shell/plugins.d/codespell.sh @@ -83,7 +83,7 @@ function codespell_logic "${CODESPELL}" \ --disable-colors \ --interactive 0 \ - --quiet-level 2 \ + --quiet-level 34 \ "${codespellargs[@]}" \ "." \ | "${SED}" -e 's,^./,,g' \ diff --git a/precommit/src/main/shell/test-patch-docker/Dockerfile b/precommit/src/main/shell/test-patch-docker/Dockerfile index 223a6d6f..8e4547a2 100644 --- a/precommit/src/main/shell/test-patch-docker/Dockerfile +++ b/precommit/src/main/shell/test-patch-docker/Dockerfile @@ -118,7 +118,7 @@ RUN mkdir -p /opt/apache-rat \ # Install SpotBugs ##### FROM yetusbase AS yetusspotbugs -ARG SPOTBUGS_VERSION=4.7.3 +ARG SPOTBUGS_VERSION=4.8.6 SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN curl -sSL https://repo.maven.apache.org/maven2/com/github/spotbugs/spotbugs/$SPOTBUGS_VERSION/spotbugs-$SPOTBUGS_VERSION.tgz -o spotbugs.tgz \ && curl -sSL https://repo.maven.apache.org/maven2/com/github/spotbugs/spotbugs/$SPOTBUGS_VERSION/spotbugs-$SPOTBUGS_VERSION.tgz.sha1 -o spotbugs.tgz.sha1 \ @@ -134,7 +134,7 @@ RUN curl -sSL https://repo.maven.apache.org/maven2/com/github/spotbugs/spotbugs/ # Install shellcheck (shell script lint) #### FROM yetusbase AS yetusshellcheck -ARG SHELLCHECK_VERSION=0.9.0 +ARG SHELLCHECK_VERSION=0.10.0 SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN curl -sSL \ https://github.com/koalaman/shellcheck/releases/download/v$SHELLCHECK_VERSION/shellcheck-v$SHELLCHECK_VERSION.linux."$(uname -m)".tar.xz \ @@ -164,7 +164,7 @@ RUN if [[ "$(uname -m)" == "x86_64" ]]; then curl -sSL \ # Install buf (protobuf lint) #### FROM yetusbase AS yetusbuf -ARG BUF_VERSION=1.26.1 +ARG BUF_VERSION=1.42.0 SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN curl -sSL \ https://github.com/bufbuild/buf/releases/download/v$BUF_VERSION/buf-Linux-"$(uname -m)".tar.gz \ @@ -176,7 +176,7 @@ RUN curl -sSL \ # Install bats (TAP-capable unit testing for shell scripts) #### FROM yetusbase AS yetusbats -ARG BATS_VERSION=1.10.0 +ARG BATS_VERSION=1.11.0 SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN git clone --branch v$BATS_VERSION \ https://github.com/bats-core/bats-core.git \ @@ -215,7 +215,7 @@ RUN git clone \ # NOTE: go must be installed prior to executing this block! #### FROM yetusbase as yetusgolangci -ARG GOLANGCILINT_VERSION=1.54.2 +ARG GOLANGCILINT_VERSION=1.61.0 SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN curl -sSL \ https://github.com/golangci/golangci-lint/releases/download/v$GOLANGCILINT_VERSION/golangci-lint-$GOLANGCILINT_VERSION-"$(go env GOOS)"-"$(go env GOARCH)".tar.gz \ @@ -293,7 +293,7 @@ RUN add-apt-repository -y \ # Install maven ###### # hadolint ignore=DL3008,DL3059 -ARG MVN_VERSION=3.9.4 +ARG MVN_VERSION=3.9.9 ARG MVN_TGZ=apache-maven-$MVN_VERSION-bin.tar.gz RUN curl -sSL \ -o $MVN_TGZ \ @@ -327,12 +327,12 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \ # astroid and pylint go hand-in-hand. Upgrade both at the same time. ###### #ARG PY3_ANSIBLE_VERSION=7.5.0 -ARG PY3_ANSIBLELINT_VERSION=6.18.0 +ARG PY3_ANSIBLELINT_VERSION=24.9.2 ARG PY3_ASTROID_VERSION=2.15.6 -ARG PY3_CODESPELL_VERSION=2.2.5 -ARG PY3_DETECT_SECRETS=1.4.0 +ARG PY3_CODESPELL_VERSION=2.3.0 +ARG PY3_DETECT_SECRETS=1.5.0 ARG PY3_PYLINT_VERSION=2.17.5 -ARG PY3_YAMLLINT_VERSION=1.32.0 +ARG PY3_YAMLLINT_VERSION=1.35.1 # hadolint ignore=DL3008 RUN apt-get -q update && apt-get -q install --no-install-recommends -y \ python3 \ @@ -371,9 +371,9 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \ #### # Install ruby and associated bits ### -ARG RUBY_BUNDLER_VERSION=2.4.19 -ARG RUBY_RAKE_VERSION=13.0.6 -ARG RUBY_RUBOCOP_VERSION=1.56.1 +ARG RUBY_BUNDLER_VERSION=2.5.20 +ARG RUBY_RAKE_VERSION=13.2.1 +ARG RUBY_RUBOCOP_VERSION=1.66.1 # hadolint ignore=DL3008 RUN echo 'gem: --no-rdoc --no-ri' >> /root/.gemrc \ && apt-get -q update && apt-get -q install --no-install-recommends -y \ @@ -394,7 +394,7 @@ ENV BUNDLE_PATH /var/tmp/.bundler-gems # Install npm and JSHint ### ARG JSHINT_VERSION=2.13.6 -ARG MARKDOWNLINTCLI_VERSION=0.36.0 +ARG MARKDOWNLINTCLI_VERSION=0.42.0 ARG JSONLINT_VERSION=1.6.3 # hadolint ignore=DL3008 RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \ diff --git a/website-tester.sh b/website-tester.sh index 3cc5e4d2..190e32f6 100755 --- a/website-tester.sh +++ b/website-tester.sh @@ -28,6 +28,11 @@ echo "::endgroup::" echo "::group::tar" tar -C /tmp/website/html --strip-components 1 \ -xpf yetus-dist/target/artifacts/apache-yetus-*-site.tar.gz +find /tmp/website/html/* -type d | sort +if [[ ! -d /tmp/website/html/documentation/in-progress/ ]]; then + echo ::error javadoc is missing from tar file + exit 1 +fi echo "::endgroup::" echo "::group::start apache httpd" @@ -43,7 +48,7 @@ echo "::group::codespell releasenotes" codespell \ --disable-colors \ --interactive 0 \ - --quiet-level 2 \ + --quiet-level 34 \ ./asf-site-src/source/downloads/releasenotes \ | sed -e 's,^./,,g' \ > /tmp/codespell.txt