Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

YETUS-1233. 2023-09 Dependency Updates #311

Merged
merged 10 commits into from
Sep 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/action-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: src
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: src
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linkcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: maven cache
uses: actions/cache@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/yetus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: src
fetch-depth: 0
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ asf-site-src/source/documentation/0*
asf-site-src/source/documentation/in-progress/CHANGELOG.md
asf-site-src/source/documentation/in-progress/RELEASENOTES.md
asf-site-src/source/documentation/in-progress/precommit/apidocs
linkchecker-out.csv
26 changes: 26 additions & 0 deletions .linkcheckerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# 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.

[filtering]
ignore=
http://localhost:8123/documentation/[0-9]+.[0-9]+.[0-9]+
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this ignore line? We don't want to check broken links on built documentation?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is specifically ignoring the references to previous release versions of the documentation which don't get built as part of this process but do sit on the web server.

resources/fonts/dejavu.css
ignorewarnings=http-redirected

[checking]
norobots=1

[output]
fileoutput=csv
15 changes: 4 additions & 11 deletions .yetus/detsecrets-ignored-hashes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.

d2df5f21ba6acb0c2d48b94519e9551d37769900
51de2b835bd35a67eb32dbcd3d77d4b96e5aa39d
827d9fff5a87952085163f1f1d3cb58f51a7909b
f17f2d6f8527bb25a0a1bb7e73f319eaae2a3d78
114678a8310a403fac03b8a9bbd3fa62b4c6a521
d8e18255635efa84e79bb9eaf2ffad3371a95288
50d23ceafd8a071f5f82bd2e13425995279b95ee
301c198f635f0ec01ed5046598bff06f13313a17
5dfd74f05dcaf3b8d23bb351915be66b4d2628a4
1a1ce1ac1c87cc884ba59133f405f0d45b201d1f
3b3c84f10a63cb8e95b93ea5f46e02d885153f5d
# this format is terrible but it is the one that detect-secret secrets uses so...

c267b646441a206d44803d8cb20896c4a166cac2
f4d95a7d14e9c4c69afe28d54743222acbe04b74
8774a670c8c160929c180ed3212ec3e828ed9412
f17f2d6f8527bb25a0a1bb7e73f319eaae2a3d78
66defd532d6875b42111a786d7bf52bb8db61602
4 changes: 2 additions & 2 deletions asf-site-src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ ENV GEM_HOME ${BUNDLE_PATH}
# on re-launches
# hadolint ignore=DL3028
RUN gem install bundler \
middleman:'4.4.3' \
middleman:'4.5.0' \
middleman-livereload \
middleman-syntax \
nokogiri:1.13.9 \
nokogiri:1.15.4 \
sassc:2.4.0 \
tzinfo-data

Expand Down
2 changes: 1 addition & 1 deletion asf-site-src/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# the following line to use 'http://' instead
source 'https://rubygems.org'

gem 'middleman', '~> 4.3'
gem 'middleman', '~> 4.5'

# Live-reloading plugin
gem 'middleman-livereload'
Expand Down
30 changes: 15 additions & 15 deletions asf-site-src/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ GIT
GEM
remote: https://rubygems.org/
specs:
activesupport (7.0.4.3)
activesupport (7.0.7.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.4)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
backports (3.24.1)
coffee-script (2.4.1)
Expand All @@ -31,7 +31,7 @@ GEM
eventmachine (1.2.7)
execjs (2.8.1)
fast_blank (1.0.1)
fastimage (2.2.6)
fastimage (2.2.7)
ffi (1.15.5)
haml (5.2.2)
temple (>= 0.8.0)
Expand All @@ -46,9 +46,9 @@ GEM
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
libv8-node (16.10.0.0)
libv8-node (16.10.0.0-aarch64-linux)
libv8-node (16.10.0.0-x86_64-linux)
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)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
Expand Down Expand Up @@ -90,29 +90,29 @@ GEM
em-websocket (~> 0.5.1)
middleman-core (>= 3.3)
rack-livereload (~> 0.3.15)
mini_racer (0.6.3)
libv8-node (~> 16.10.0.0)
minitest (5.18.0)
mini_racer (0.8.0)
libv8-node (~> 18.16.0.0)
minitest (5.19.0)
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)
parslet (2.0.0)
public_suffix (5.0.1)
rack (2.2.7)
public_suffix (5.0.3)
rack (2.2.8)
rack-livereload (0.3.17)
rack
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.5)
rexml (3.2.6)
rouge (3.30.0)
sassc (2.4.0)
ffi (~> 1.9)
servolux (0.13.0)
temple (0.10.1)
temple (0.10.2)
thor (1.2.2)
tilt (2.0.11)
toml (0.3.0)
Expand All @@ -131,12 +131,12 @@ PLATFORMS
DEPENDENCIES
haml (~> 5.2.2)
kramdown-parser-gfm
middleman (~> 4.3)
middleman (~> 4.5)
middleman-livereload
middleman-syntax!
mini_racer
tzinfo-data
wdm (~> 0.1.0)

BUNDLED WITH
2.4.13
2.4.19
4 changes: 0 additions & 4 deletions asf-site-src/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@
</goals>
<configuration>
<executable>${rdm.bin}</executable>
<requiresOnline>true</requiresOnline>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh why were these here in the first place?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At some point in time, we either used a plugin that was offline/online aware or they removed the functionality from maven. But they were there so that you could tell maven you were offline and it wouldn't try to connect to JIRA to generate the release notes, etc.

<arguments>
<argument>--lint=all</argument>
<argument>--license</argument>
Expand All @@ -109,7 +108,6 @@
</goals>
<configuration>
<executable>${rdm.bin}</executable>
<requiresOnline>true</requiresOnline>
<arguments>
<argument>--dirversions</argument>
<argument>--fileversions</argument>
Expand Down Expand Up @@ -140,7 +138,6 @@
</goals>
<configuration>
<executable>bundle</executable>
<requiresOnline>true</requiresOnline>
<arguments>
<argument>install</argument>
</arguments>
Expand All @@ -154,7 +151,6 @@
</goals>
<configuration>
<executable>bundle</executable>
<requiresOnline>false</requiresOnline>
<arguments>
<argument>exec</argument>
<argument>middleman</argument>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
<!-- markdownlint-disable MD051 -->

# Build Tool Support

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
<!-- markdownlint-disable MD051 -->

# Test Format Support

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<maven-project-info-reports-plugin.version>3.1.2</maven-project-info-reports-plugin.version>
<maven-rat-plugin.version>0.15</maven-rat-plugin.version>
<mockito.version>5.3.1</mockito.version>
<spotbugs-maven-plugin.version>4.7.3.4</spotbugs-maven-plugin.version>
<spotbugs-maven-plugin.version>4.7.3.5</spotbugs-maven-plugin.version>

<sourceReleaseAssemblyDescriptor>source-release-tar</sourceReleaseAssemblyDescriptor>
<project.build.outputTimestamp>n</project.build.outputTimestamp>
Expand Down
42 changes: 26 additions & 16 deletions precommit/src/main/shell/test-patch-docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -149,16 +149,22 @@ FROM yetusbase AS yetushadolint
ARG HADOLINT_VERSION=2.12.0
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN if [[ "$(uname -m)" == "x86_64" ]]; then curl -sSL \
https://github.com/hadolint/hadolint/releases/download/v$HADOLINT_VERSION/hadolint-Linux-"$(uname -m)" \
https://github.com/hadolint/hadolint/releases/download/v$HADOLINT_VERSION/hadolint-Linux-x86_64 \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still prefer the style I proposed in my patch because docker can cache the downloaded artifacts between runs. The layer caching speeds up rebuild cycles drastically.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm seeing it being cached here. 🤷

-o /bin/hadolint \
&& chmod a+rx /bin/hadolint; \
else touch /bin/hadolint; fi
&& chmod a+rx /bin/hadolint; \
elif [[ "$(uname -m)" == "aarch64" ]]; then curl -sSL \
https://github.com/hadolint/hadolint/releases/download/v$HADOLINT_VERSION/hadolint-Linux-arm64 \
-o /bin/hadolint \
&& chmod a+rx /bin/hadolint; \
else \
touch /bin/hadolint; \
fi

####
# Install buf (protobuf lint)
####
FROM yetusbase AS yetusbuf
ARG BUF_VERSION=1.19.0
ARG BUF_VERSION=1.26.1
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 \
Expand All @@ -170,7 +176,7 @@ RUN curl -sSL \
# Install bats (TAP-capable unit testing for shell scripts)
####
FROM yetusbase AS yetusbats
ARG BATS_VERSION=1.9.0
ARG BATS_VERSION=1.10.0
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN git clone --branch v$BATS_VERSION \
https://github.com/bats-core/bats-core.git \
Expand Down Expand Up @@ -209,7 +215,7 @@ RUN git clone \
# NOTE: go must be installed prior to executing this block!
####
FROM yetusbase as yetusgolangci
ARG GOLANGCILINT_VERSION=1.52.2
ARG GOLANGCILINT_VERSION=1.54.2
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 \
Expand Down Expand Up @@ -287,7 +293,7 @@ RUN add-apt-repository -y \
# Install maven
######
# hadolint ignore=DL3008,DL3059
ARG MVN_VERSION=3.9.2
ARG MVN_VERSION=3.9.4
ARG MVN_TGZ=apache-maven-$MVN_VERSION-bin.tar.gz
RUN curl -sSL \
-o $MVN_TGZ \
Expand Down Expand Up @@ -321,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.16.1
ARG PY3_ASTROID_VERSION=2.15.5
ARG PY3_CODESPELL_VERSION=2.2.4
ARG PY3_ANSIBLELINT_VERSION=6.18.0
ARG PY3_ASTROID_VERSION=2.15.6
ARG PY3_CODESPELL_VERSION=2.2.5
ARG PY3_DETECT_SECRETS=1.4.0
ARG PY3_PYLINT_VERSION=2.17.4
ARG PY3_YAMLLINT_VERSION=1.31.0
ARG PY3_PYLINT_VERSION=2.17.5
ARG PY3_YAMLLINT_VERSION=1.32.0
# hadolint ignore=DL3008
RUN apt-get -q update && apt-get -q install --no-install-recommends -y \
python3 \
Expand Down Expand Up @@ -365,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.13
ARG RUBY_BUNDLER_VERSION=2.4.19
ARG RUBY_RAKE_VERSION=13.0.6
ARG RUBY_RUBOCOP_VERSION=1.51
ARG RUBY_RUBOCOP_VERSION=1.56.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 \
Expand All @@ -388,10 +394,14 @@ ENV BUNDLE_PATH /var/tmp/.bundler-gems
# Install npm and JSHint
###
ARG JSHINT_VERSION=2.13.6
ARG MARKDOWNLINTCLI_VERSION=0.34.0
ARG MARKDOWNLINTCLI_VERSION=0.36.0
ARG JSONLINT_VERSION=1.6.3
# hadolint ignore=DL3008
RUN curl -sSL https://deb.nodesource.com/setup_lts.x | bash - \
RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \
| gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" \
> /etc/apt/sources.list.d/nodesource.list \
&& apt-get -q update \
&& apt-get -q install --no-install-recommends -y nodejs \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
Expand Down
6 changes: 1 addition & 5 deletions website-tester.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,7 @@ apache2
echo "::endgroup::"

echo "::group::linkchecker"
linkchecker \
--ignore-url 'http://localhost:8123/documentation/[0-9]+.[0-9]+.[0-9]+' \
--ignore-url 'resources/fonts/dejavu.css' \
--no-robots --file-output=csv \
http://localhost:8123
linkchecker --config .linkcheckerrc http://localhost:8123
result=$?
echo "::endgroup::"

Expand Down
Loading