Skip to content

Commit 277a9fb

Browse files
Universal: Remove gradle 7 patches (devcontainers#422)
1 parent 2bb7de0 commit 277a9fb

File tree

2 files changed

+0
-37
lines changed

2 files changed

+0
-37
lines changed

src/universal/.devcontainer/local-features/setup-user/install.sh

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -20,36 +20,6 @@ chmod +x /etc/profile.d/00-restore-env.sh
2020

2121
export DEBIAN_FRONTEND=noninteractive
2222

23-
# Temporary: Replace the current gradle plugins with patched versions
24-
GRADLE_PATH=$(cd /usr/local/sdkman/candidates/gradle/7*/lib/plugins/ && pwd)
25-
26-
# Temporary: Due to https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-31159
27-
# Delete the current plugin
28-
rm -f ${GRADLE_PATH}/aws-java-sdk-s3-*
29-
30-
# Install "aws-java-sdk-s3" plugin with version >= 1.12.261
31-
curl -sSL https://github.com/aws/aws-sdk-java/archive/refs/tags/1.12.363.tar.gz | tar -xzC /tmp 2>&1
32-
jar cf ${GRADLE_PATH}/aws-java-sdk-s3-1.12.363.jar /tmp/aws-sdk-java-1.12.363/aws-java-sdk-s3
33-
rm -rf /tmp/aws-sdk-java-1.12.363
34-
35-
# Temporary: Due to https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-36033
36-
rm -f ${GRADLE_PATH}/jsoup-*
37-
curl -sSL https://github.com/jhy/jsoup/archive/refs/tags/jsoup-1.15.3.tar.gz | tar -xzC /tmp 2>&1
38-
jar cf ${GRADLE_PATH}/jsoup-1.15.3.jar /tmp/jsoup-jsoup-1.15.3
39-
rm -rf /tmp/jsoup-jsoup-1.15.3
40-
41-
# Temporary: Due to https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-42004
42-
rm -f ${GRADLE_PATH}/jackson-databind-*
43-
curl -sSL https://github.com/FasterXML/jackson-databind/archive/refs/tags/jackson-databind-2.14.1.tar.gz | tar -xzC /tmp 2>&1
44-
jar cf ${GRADLE_PATH}/jackson-databind-2.14.1.jar /tmp/jackson-databind-jackson-databind-2.14.1
45-
rm -rf /tmp/jackson-databind-jackson-databind-2.14.1
46-
47-
# Temporary: Due to https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-4065
48-
rm -f ${GRADLE_PATH}/testng-*
49-
curl -sSL https://github.com/cbeust/testng/archive/refs/tags/7.7.0.tar.gz | tar -xzC /tmp 2>&1
50-
jar cf ${GRADLE_PATH}/testng-7.7.0.jar /tmp/testng-7.7.0
51-
rm -rf /tmp/testng-7.7.0
52-
5323
# Temporary: Due to https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29425
5424
MAVEN_PATH=$(cd /usr/local/sdkman/candidates/maven/3*/lib/ && pwd)
5525
rm -f ${MAVEN_PATH}/commons-io-*

src/universal/test-project/test.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -178,16 +178,9 @@ check "java-12.0.2-installed-by-oryx" ls /opt/java/ | grep 12.0.2
178178
check "java-version-on-path-is-12.0.2" java --version | grep 12.0.2
179179

180180
# Test patches
181-
GRADLE_PATH=$(cd /usr/local/sdkman/candidates/gradle/7*/lib/plugins && pwd)
182-
check "aws-java-sdk-s3-plugin" bash -c "ls ${GRADLE_PATH} | grep aws-java-sdk-s3-1.12.363.jar"
183-
check "jsoup-plugin" bash -c "ls ${GRADLE_PATH} | grep jsoup-1.15.3.jar"
184-
check "jackson-databind" bash -c "ls ${GRADLE_PATH} | grep jackson-databind-2.14.1.jar"
185-
check "testng-plugin" bash -c "ls ${GRADLE_PATH} | grep testng-7.7.0.jar"
186-
187181
MAVEN_PATH=$(cd /usr/local/sdkman/candidates/maven/3*/lib/ && pwd)
188182
check "commons-io-lib" bash -c "ls ${MAVEN_PATH} | grep commons-io-2.11.jar"
189183

190-
191184
ls -la /home/codespace
192185

193186
# Report result

0 commit comments

Comments
 (0)