Using gradle wrapper defined by spring project (#3530)

Disable project with jdk17 Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>
adoptium · Apr 6, 2022 · bde273b · bde273b
1 parent 4b33dc8
commit bde273b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/external/spring/playlist.xml b/external/spring/playlist.xml
@@ -15,6 +15,12 @@
 <playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../TKG/playlist.xsd">
 	<test>
 		<testCaseName>spring_test</testCaseName>
+		<disables>
+			<disable>
+				<comment>https://github.com/adoptium/aqa-tests/issues/3505#issuecomment-1086270612</comment>
+				<version>17</version>
+			</disable>
+		</disables>
 		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir spring --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
 			$(TEST_STATUS); \
 			$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir spring

diff --git a/external/spring/test.properties b/external/spring/test.properties
@@ -1,5 +1,4 @@
 github_url="https://github.com/spring-projects/spring-boot.git"
 test_results="testResults"
-gradle_version="5.1"
 ubuntu_packages="git wget unzip"
-tag_version="v2.6.4"
+tag_version="v2.6.6"