Revert "Add or avoid proxy configurations for integration tests"

This reverts commit 251f280.
philipsamuel · Nov 2, 2015 · fa9724b · fa9724b
1 parent 251f280
commit fa9724b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 42 deletions.
diff --git a/README.adoc b/README.adoc
@@ -111,9 +111,6 @@ tests there (e.g. in Eclipse go to `Preferences->Java->Installed JREs` and edit
 JRE definition so that all processes are launched with those arguments). This property
 is automatically set if you use the maven wrapper.
 
-NOTE: Make sure that your Git config property "core.autocrlf" setting is set to true
-under Windows to avoid build and test failures due to missing CRLF EOL characters.
-
 _Also see link:CONTRIBUTING.adoc[CONTRIBUTING.adoc] if you wish to submit pull requests,
 and in particular please fill out the
 https://support.springsource.com/spring_committer_signup[Contributor's Agreement]

diff --git a/...pring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/ProjectCreator.java b/...pring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/ProjectCreator.java
@@ -16,9 +16,7 @@
 
 package org.springframework.boot.gradle;
 
-import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
 
 import org.gradle.tooling.GradleConnector;
@@ -48,8 +46,7 @@ public ProjectConnection createProject(String name) throws IOException {
 		projectDirectory.mkdirs();
 
 		File gradleScript = new File(projectDirectory, "build.gradle");
-		writeGradleProperties(projectDirectory);
-
+
 		if (new File("src/test/resources", name).isDirectory()) {
 			FileSystemUtils.copyRecursively(new File("src/test/resources", name),
 					projectDirectory);
@@ -65,21 +62,4 @@ public ProjectConnection createProject(String name) throws IOException {
 		((DefaultGradleConnector) gradleConnector).embedded(true);
 		return gradleConnector.forProjectDirectory(projectDirectory).connect();
 	}
-
-	private void writeGradleProperties(File projectDirectory) throws IOException {
-		File gradleProperties = new File(projectDirectory, "gradle.properties");
-        BufferedWriter writer = new BufferedWriter(new FileWriter(gradleProperties));
-        writeProperty(writer, "http.proxyHost");
-        writeProperty(writer, "https.proxyHost");
-        writeProperty(writer, "http.proxyPort");
-        writeProperty(writer, "https.proxyPort");
-        writer.close();		
-	}
-
-	private void writeProperty(BufferedWriter writer, String name) throws IOException {
-		String value = System.getProperty(name);
-        if (value != null) {
-        	writer.write("systemProp." + name + "=" + value + "\n");
-        }
-	}
 }
diff --git a/...s/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java b/...s/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java
@@ -91,7 +91,7 @@ public static void closeProject() {
 
 	public StarterDependenciesIntegrationTests(String starter) {
 		this.buildArguments = new String[] { "-Pstarter=" + starter,
-				"-PbootVersion=" + bootVersion, "-PspringVersion=" + springVersion, "--stacktrace" };
+				"-PbootVersion=" + bootVersion, "-PspringVersion=" + springVersion };
 	}
 
 	@Test

diff --git a/spring-boot-samples/spring-boot-sample-ant/ivysettings.xml b/spring-boot-samples/spring-boot-sample-ant/ivysettings.xml
@@ -7,6 +7,10 @@
 				<artifact pattern="${user.home}/.m2/repository/[organisation]/[module]/[revision]/[module]-[revision].[ext]" />
 				<ivy pattern="${user.home}/.m2/repository/[organisation]/[module]/[revision]/[module]-[revision].pom" />
 			</filesystem>
+			<ibiblio name="ibiblio" m2compatible="true" />
+			<ibiblio name="spring-milestones" m2compatible="true" root="http://repo.spring.io/release" />
+			<ibiblio name="spring-milestones" m2compatible="true" root="http://repo.spring.io/milestone" />
+			<ibiblio name="spring-snapshots" m2compatible="true" root="http://repo.spring.io/snapshot" />
 		</chain>
 	</resolvers>
 </ivysettings>
diff --git a/spring-boot-tools/spring-boot-antlib/pom.xml b/spring-boot-tools/spring-boot-antlib/pom.xml
@@ -36,21 +36,7 @@
 			<version>${ant.version}</version>
 			<scope>provided</scope>
 		</dependency>
-		<!-- The antunit tests require joda-time -->
-		<dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-			<version>${joda-time.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<!-- This is an optional depencency in the joda-time 2.8.1 pom.xml but Ivy tries to resolve it -->
-		<dependency>
-			<groupId>org.joda</groupId>
-			<artifactId>joda-convert</artifactId>
-			<version>1.2</version>
-			<scope>compile</scope>
-		</dependency>
-    </dependencies>
+	</dependencies>
 	<build>
 		<plugins>
 			<plugin>

diff --git a/spring-boot-tools/spring-boot-antlib/src/it/sample/ivysettings.xml b/spring-boot-tools/spring-boot-antlib/src/it/sample/ivysettings.xml
@@ -4,9 +4,13 @@
 		<chain name="chain">
 			<!-- NOTE: You should declare only repositories that you need here -->
 			<filesystem name="local" local="true" m2compatible="true">
-				<artifact pattern="${user.home}/.m2/repository/[organisation]/[module]/[revision]/[module]-[revision].[ext]" />
-				<ivy pattern="${user.home}/.m2/repository/[organisation]/[module]/[revision]/[module]-[revision].pom" />
+				<artifact pattern="${user.home}/.m2/[organisation]/[module]/[revision]/[module]-[revision].[ext]" />
+				<ivy pattern="${user.home}/.m2/[organisation]/[module]/[revision]/[module]-[revision].pom" />
 			</filesystem>
+			<ibiblio name="ibiblio" m2compatible="true" />
+			<ibiblio name="spring-milestones" m2compatible="true" root="http://repo.spring.io/release" />
+			<ibiblio name="spring-milestones" m2compatible="true" root="http://repo.spring.io/milestone" />
+			<ibiblio name="spring-snapshots" m2compatible="true" root="http://repo.spring.io/snapshot" />
 		</chain>
 	</resolvers>
 </ivysettings>