Skip to content

Commit e9a613b

Browse files
Support scope (#1)
* Support Scope v0.1.8-beta.7 #1
1 parent 73cd1c9 commit e9a613b

File tree

7 files changed

+44
-9
lines changed

7 files changed

+44
-9
lines changed

.github/pull.yml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
version: "1"
2+
rules:
3+
- base: master
4+
upstream: spring-boot:master
5+
mergeMethod: rebase

Jenkinsfile

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
pipeline {
2+
agent none
3+
stages {
4+
stage('Build JDK8') {
5+
agent { docker 'openjdk:8-jdk' }
6+
steps {
7+
sh './mvnw clean verify -U -fae -Pfast'
8+
}
9+
}
10+
}
11+
12+
post {
13+
always {
14+
node('master') {
15+
archiveArtifacts artifacts: '**/scope_*.log'
16+
sh 'rm -f scope_*.log'
17+
}
18+
}
19+
}
20+
}

pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</properties>
3030
<build>
3131
<plugins>
32-
<plugin>
32+
<!--<plugin>
3333
<groupId>org.apache.maven.plugins</groupId>
3434
<artifactId>maven-checkstyle-plugin</artifactId>
3535
<version>3.0.0</version>
@@ -85,7 +85,7 @@
8585
<inherited>false</inherited>
8686
</execution>
8787
</executions>
88-
</plugin>
88+
</plugin>-->
8989
<plugin>
9090
<groupId>io.spring.javaformat</groupId>
9191
<artifactId>spring-javaformat-maven-plugin</artifactId>
@@ -222,7 +222,7 @@
222222
<configuration>
223223
<lifecycleMappingMetadata>
224224
<pluginExecutions>
225-
<pluginExecution>
225+
<!--<pluginExecution>
226226
<pluginExecutionFilter>
227227
<groupId>org.apache.maven.plugins</groupId>
228228
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -234,7 +234,7 @@
234234
<action>
235235
<ignore />
236236
</action>
237-
</pluginExecution>
237+
</pluginExecution>-->
238238
<pluginExecution>
239239
<pluginExecutionFilter>
240240
<groupId>org.apache.maven.plugins</groupId>

spring-boot-project/spring-boot-dependencies/pom.xml

+10
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,8 @@
236236
<versions-maven-plugin.version>2.7</versions-maven-plugin.version>
237237
<xml-maven-plugin.version>1.0.2</xml-maven-plugin.version>
238238
<flatten-maven-plugin.version>1.1.0</flatten-maven-plugin.version>
239+
<scope.agent.version>0.1.8-beta.7</scope.agent.version>
240+
239241
</properties>
240242
<dependencyManagement>
241243
<dependencies>
@@ -3233,6 +3235,14 @@
32333235
</dependency>
32343236
</dependencies>
32353237
</dependencyManagement>
3238+
<dependencies>
3239+
<dependency>
3240+
<groupId>com.undefinedlabs.scope</groupId>
3241+
<artifactId>scope-agent</artifactId>
3242+
<version>${scope.agent.version}</version>
3243+
<scope>provided</scope>
3244+
</dependency>
3245+
</dependencies>
32363246
<build>
32373247
<pluginManagement>
32383248
<plugins>

spring-boot-project/spring-boot-parent/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</organization>
2020
<properties>
2121
<main.basedir>${basedir}/../..</main.basedir>
22-
<disable.checks>false</disable.checks>
22+
<disable.checks>true</disable.checks>
2323
<java.version>1.8</java.version>
2424
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2525
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -496,7 +496,7 @@
496496
<java.security.egd>file:/dev/./urandom</java.security.egd>
497497
<java.awt.headless>true</java.awt.headless>
498498
</systemPropertyVariables>
499-
<argLine>-Xmx1024m</argLine>
499+
<argLine>-Xmx1024m -javaagent:${settings.localRepository}/com/undefinedlabs/scope/scope-agent/${scope.agent.version}/scope-agent-${scope.agent.version}.jar</argLine>
500500
<trimStackTrace>false</trimStackTrace>
501501
<redirectTestOutputToFile>true</redirectTestOutputToFile>
502502
<runOrder>alphabetical</runOrder>

spring-boot-project/spring-boot-starters/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
</execution>
119119
</executions>
120120
</plugin>
121-
<plugin>
121+
<!--<plugin>
122122
<groupId>org.apache.maven.plugins</groupId>
123123
<artifactId>maven-checkstyle-plugin</artifactId>
124124
<executions>
@@ -133,7 +133,7 @@
133133
</configuration>
134134
</execution>
135135
</executions>
136-
</plugin>
136+
</plugin>-->
137137
<plugin>
138138
<groupId>org.basepom.maven</groupId>
139139
<artifactId>duplicate-finder-maven-plugin</artifactId>

spring-boot-tests/spring-boot-smoke-tests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<properties>
1616
<main.basedir>${basedir}/../..</main.basedir>
1717
<java.version>1.8</java.version>
18-
<disable.checks>false</disable.checks>
18+
<disable.checks>true</disable.checks>
1919
</properties>
2020
<modules>
2121
<module>spring-boot-smoke-test-ant</module>

0 commit comments

Comments
 (0)