Skip to content

Commit

Permalink
Switch from jdk8 to jdk11 (#1309)
Browse files Browse the repository at this point in the history
  • Loading branch information
nvuillam authored Mar 2, 2022
1 parent 7cf2608 commit aa8280f
Show file tree
Hide file tree
Showing 29 changed files with 111 additions and 44 deletions.
64 changes: 64 additions & 0 deletions .automation/generated/flavors-stats.json
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,10 @@
[
"2022-02-28T01:51:49",
2462174
],
[
"2022-03-02T23:33:51",
2465236
]
],
"ci_light": [
Expand Down Expand Up @@ -1201,6 +1205,10 @@
[
"2022-02-28T01:51:49",
7944
],
[
"2022-03-02T23:33:51",
8135
]
],
"dart": [
Expand Down Expand Up @@ -1803,6 +1811,10 @@
[
"2022-02-28T01:51:49",
2354
],
[
"2022-03-02T23:33:51",
2366
]
],
"documentation": [
Expand Down Expand Up @@ -2405,6 +2417,10 @@
[
"2022-02-28T01:51:49",
43717
],
[
"2022-03-02T23:33:51",
44349
]
],
"dotnet": [
Expand Down Expand Up @@ -3007,6 +3023,10 @@
[
"2022-02-28T01:51:49",
288123
],
[
"2022-03-02T23:33:51",
289309
]
],
"go": [
Expand Down Expand Up @@ -3609,6 +3629,10 @@
[
"2022-02-28T01:51:49",
8443
],
[
"2022-03-02T23:33:51",
8624
]
],
"java": [
Expand Down Expand Up @@ -4211,6 +4235,10 @@
[
"2022-02-28T01:51:49",
61950
],
[
"2022-03-02T23:33:51",
62488
]
],
"javascript": [
Expand Down Expand Up @@ -4813,6 +4841,10 @@
[
"2022-02-28T01:51:49",
94199
],
[
"2022-03-02T23:33:51",
95281
]
],
"php": [
Expand Down Expand Up @@ -5415,6 +5447,10 @@
[
"2022-02-28T01:51:49",
4378
],
[
"2022-03-02T23:33:51",
4466
]
],
"python": [
Expand Down Expand Up @@ -6017,6 +6053,10 @@
[
"2022-02-28T01:51:49",
62256
],
[
"2022-03-02T23:33:51",
63202
]
],
"ruby": [
Expand Down Expand Up @@ -6615,6 +6655,10 @@
[
"2022-02-28T01:51:49",
1910
],
[
"2022-03-02T23:33:51",
1910
]
],
"rust": [
Expand Down Expand Up @@ -7213,6 +7257,10 @@
[
"2022-02-28T01:51:49",
2192
],
[
"2022-03-02T23:33:51",
2271
]
],
"salesforce": [
Expand Down Expand Up @@ -7815,6 +7863,10 @@
[
"2022-02-28T01:51:49",
11156
],
[
"2022-03-02T23:33:51",
11225
]
],
"scala": [
Expand Down Expand Up @@ -8413,6 +8465,10 @@
[
"2022-02-28T01:51:49",
1455
],
[
"2022-03-02T23:33:51",
1455
]
],
"swift": [
Expand Down Expand Up @@ -9011,6 +9067,10 @@
[
"2022-02-28T01:51:49",
1496
],
[
"2022-03-02T23:33:51",
1496
]
],
"terraform": [
Expand Down Expand Up @@ -9613,6 +9673,10 @@
[
"2022-02-28T01:51:49",
42221
],
[
"2022-03-02T23:33:51",
42937
]
]
}
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

Note: Can be used with `megalinter/megalinter@beta` in your GitHub Action mega-linter.yml file, or with `megalinter/megalinter:beta` docker image

- Core
- Switch from JDK 8 to JDK 11

- Flavors
- Add shell linters to ci_light flavor ([#1298](https://github.com/megalinter/megalinter/issues/1298))

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ RUN apk add --update --no-cache \
linux-headers \
make \
musl-dev \
openjdk8 \
openjdk11 \
openssh \
npm \
nodejs \
Expand All @@ -86,7 +86,7 @@ RUN apk add --update --no-cache \
zlib \
zlib-dev \
go \
openjdk8 \
openjdk11 \
perl \
perl-dev \
php7 \
Expand Down Expand Up @@ -253,7 +253,7 @@ ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
RUN git config --global core.autocrlf true

# JAVA installation
ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk
ENV PATH="$JAVA_HOME/bin:${PATH}"

# PHP installation
Expand Down Expand Up @@ -288,7 +288,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
ENV PATH="/root/.cargo/bin:${PATH}"

# SALESFORCE installation
ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk
ENV PATH="$JAVA_HOME/bin:${PATH}"
RUN echo y|sfdx plugins:install sfdx-hardis

Expand Down
4 changes: 2 additions & 2 deletions docs/descriptors/java.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@

- Dockerfile commands :
```dockerfile
ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk
ENV PATH="$JAVA_HOME/bin:${PATH}"
```

- APK packages (Linux):
- [openjdk8](https://pkgs.alpinelinux.org/packages?branch=edge&name=openjdk8)
- [openjdk11](https://pkgs.alpinelinux.org/packages?branch=edge&name=openjdk11)
2 changes: 1 addition & 1 deletion docs/descriptors/java_checkstyle.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ See http://www.oracle.com/technetwork/java/javase/documentation/index.html for m
- Dockerfile commands :
```dockerfile
# Parent descriptor install
ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk
ENV PATH="$JAVA_HOME/bin:${PATH}"
# Linter install
RUN CHECKSTYLE_LATEST=$(curl -s https://api.github.com/repos/checkstyle/checkstyle/releases/latest \
Expand Down
4 changes: 2 additions & 2 deletions docs/descriptors/salesforce.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@

- Dockerfile commands :
```dockerfile
ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk
ENV PATH="$JAVA_HOME/bin:${PATH}"
RUN echo y|sfdx plugins:install sfdx-hardis
```

- APK packages (Linux):
- [openjdk8](https://pkgs.alpinelinux.org/packages?branch=edge&name=openjdk8)
- [openjdk11](https://pkgs.alpinelinux.org/packages?branch=edge&name=openjdk11)
- NPM packages (node.js):
- [sfdx-cli](https://www.npmjs.com/package/sfdx-cli)
2 changes: 1 addition & 1 deletion docs/descriptors/salesforce_sfdx_scanner.md
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ use-isnan typescript Possible Errors
- Dockerfile commands :
```dockerfile
# Parent descriptor install
ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk
ENV PATH="$JAVA_HOME/bin:${PATH}"
# Linter install
RUN sfdx plugins:install @salesforce/sfdx-scanner
Expand Down
2 changes: 1 addition & 1 deletion docs/descriptors/salesforce_sfdx_scanner_apex.md
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ use-isnan typescript Possible Errors
- Dockerfile commands :
```dockerfile
# Parent descriptor install
ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk
ENV PATH="$JAVA_HOME/bin:${PATH}"
RUN echo y|sfdx plugins:install sfdx-hardis
# Linter install
Expand Down
2 changes: 1 addition & 1 deletion docs/descriptors/salesforce_sfdx_scanner_aura.md
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ use-isnan typescript Possible Errors
- Dockerfile commands :
```dockerfile
# Parent descriptor install
ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk
ENV PATH="$JAVA_HOME/bin:${PATH}"
RUN echo y|sfdx plugins:install sfdx-hardis
# Linter install
Expand Down
2 changes: 1 addition & 1 deletion docs/descriptors/salesforce_sfdx_scanner_lwc.md
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ use-isnan typescript Possible Errors
- Dockerfile commands :
```dockerfile
# Parent descriptor install
ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk
ENV PATH="$JAVA_HOME/bin:${PATH}"
RUN echo y|sfdx plugins:install sfdx-hardis
# Linter install
Expand Down
Loading

0 comments on commit aa8280f

Please sign in to comment.