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 @@ - + io.spring.javaformat spring-javaformat-maven-plugin @@ -222,7 +222,7 @@ - + org.apache.maven.plugins 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 @@ 2.7 1.0.2 1.1.0 + 0.1.8-beta.7 + @@ -3233,6 +3235,14 @@ + + + com.undefinedlabs.scope + scope-agent + ${scope.agent.version} + provided + + 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 @@ ${basedir}/../.. - false + true 1.8 UTF-8 UTF-8 @@ -496,7 +496,7 @@ file:/dev/./urandom true - -Xmx1024m + -Xmx1024m -javaagent:${settings.localRepository}/com/undefinedlabs/scope/scope-agent/${scope.agent.version}/scope-agent-${scope.agent.version}.jar false true alphabetical 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 @@ - + org.basepom.maven duplicate-finder-maven-plugin 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 @@ ${basedir}/../.. 1.8 - false + true spring-boot-smoke-test-ant