diff --git a/.github/pull.yml b/.github/pull.yml new file mode 100644 index 000000000000..761887516860 --- /dev/null +++ b/.github/pull.yml @@ -0,0 +1,5 @@ +version: "1" +rules: + - base: master + upstream: spring-boot:master + mergeMethod: rebase diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000000..2237dfab87b3 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,20 @@ +pipeline { + agent none + stages { + stage('Build JDK8') { + agent { docker 'openjdk:8-jdk' } + steps { + sh './mvnw clean verify -U -fae -Pfast' + } + } + } + + post { + always { + node('master') { + archiveArtifacts artifacts: '**/scope_*.log' + sh 'rm -f scope_*.log' + } + } + } +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 9d8cc672217e..913ca8bca7f9 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ </properties> <build> <plugins> - <plugin> + <!--<plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>3.0.0</version> @@ -85,7 +85,7 @@ <inherited>false</inherited> </execution> </executions> - </plugin> + </plugin>--> <plugin> <groupId>io.spring.javaformat</groupId> <artifactId>spring-javaformat-maven-plugin</artifactId> @@ -222,7 +222,7 @@ <configuration> <lifecycleMappingMetadata> <pluginExecutions> - <pluginExecution> + <!--<pluginExecution> <pluginExecutionFilter> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> @@ -234,7 +234,7 @@ <action> <ignore /> </action> - </pluginExecution> + </pluginExecution>--> <pluginExecution> <pluginExecutionFilter> <groupId>org.apache.maven.plugins</groupId> diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 6a41f9ba8358..e014d63367e5 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -236,6 +236,8 @@ <versions-maven-plugin.version>2.7</versions-maven-plugin.version> <xml-maven-plugin.version>1.0.2</xml-maven-plugin.version> <flatten-maven-plugin.version>1.1.0</flatten-maven-plugin.version> + <scope.agent.version>0.1.8-beta.7</scope.agent.version> + </properties> <dependencyManagement> <dependencies> @@ -3233,6 +3235,14 @@ </dependency> </dependencies> </dependencyManagement> + <dependencies> + <dependency> + <groupId>com.undefinedlabs.scope</groupId> + <artifactId>scope-agent</artifactId> + <version>${scope.agent.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> <build> <pluginManagement> <plugins> diff --git a/spring-boot-project/spring-boot-parent/pom.xml b/spring-boot-project/spring-boot-parent/pom.xml index 29611d2eaef3..3be3aab35f97 100644 --- a/spring-boot-project/spring-boot-parent/pom.xml +++ b/spring-boot-project/spring-boot-parent/pom.xml @@ -19,7 +19,7 @@ </organization> <properties> <main.basedir>${basedir}/../..</main.basedir> - <disable.checks>false</disable.checks> + <disable.checks>true</disable.checks> <java.version>1.8</java.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -496,7 +496,7 @@ <java.security.egd>file:/dev/./urandom</java.security.egd> <java.awt.headless>true</java.awt.headless> </systemPropertyVariables> - <argLine>-Xmx1024m</argLine> + <argLine>-Xmx1024m -javaagent:${settings.localRepository}/com/undefinedlabs/scope/scope-agent/${scope.agent.version}/scope-agent-${scope.agent.version}.jar</argLine> <trimStackTrace>false</trimStackTrace> <redirectTestOutputToFile>true</redirectTestOutputToFile> <runOrder>alphabetical</runOrder> diff --git a/spring-boot-project/spring-boot-starters/pom.xml b/spring-boot-project/spring-boot-starters/pom.xml index 6b96374e81c8..6371f789afc3 100644 --- a/spring-boot-project/spring-boot-starters/pom.xml +++ b/spring-boot-project/spring-boot-starters/pom.xml @@ -118,7 +118,7 @@ </execution> </executions> </plugin> - <plugin> + <!--<plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <executions> @@ -133,7 +133,7 @@ </configuration> </execution> </executions> - </plugin> + </plugin>--> <plugin> <groupId>org.basepom.maven</groupId> <artifactId>duplicate-finder-maven-plugin</artifactId> diff --git a/spring-boot-tests/spring-boot-smoke-tests/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/pom.xml index 7d08c31aa741..f82e0341b16e 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/pom.xml +++ b/spring-boot-tests/spring-boot-smoke-tests/pom.xml @@ -15,7 +15,7 @@ <properties> <main.basedir>${basedir}/../..</main.basedir> <java.version>1.8</java.version> - <disable.checks>false</disable.checks> + <disable.checks>true</disable.checks> </properties> <modules> <module>spring-boot-smoke-test-ant</module>