Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add or avoid proxy configurations for integration tests"

Browse Source 
This reverts commit 251f2805a8.
This commit is contained in:
Dave Syer 2015-11-02 17:38:54 +00:00
parent 251f2805a8
commit fa9724becb
6 changed files with 13 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.adoc
View File

@ -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]

22
spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/ProjectCreator.java
View File

@ -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 class ProjectCreator {
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 class ProjectCreator {
((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");
}
}
}

2
spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java
View File

@ -91,7 +91,7 @@ public class StarterDependenciesIntegrationTests {
public StarterDependenciesIntegrationTests(String starter) {
this.buildArguments = new String[] { "-Pstarter=" + starter,
"-PbootVersion=" + bootVersion, "-PspringVersion=" + springVersion, "--stacktrace" };
"-PbootVersion=" + bootVersion, "-PspringVersion=" + springVersion };
}
@Test

4
spring-boot-samples/spring-boot-sample-ant/ivysettings.xml
View File

@ -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>

16
spring-boot-tools/spring-boot-antlib/pom.xml
View File

@ -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>

8
spring-boot-tools/spring-boot-antlib/src/it/sample/ivysettings.xml
View File

@ -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>