Skip to content

Commit a9b642b

Browse files
philwebbphilwebb
committed
Align versions used in loader integration tests
Update `spring-boot-loader` to use the same dependency versions as the main project.
1 parent 9192444 commit a9b642b

File tree

6 files changed

+200
-98
lines changed

6 files changed

+200
-98
lines changed

‎spring-boot-tools/spring-boot-loader/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<groupId>org.springframework.boot</groupId>

‎spring-boot-tools/spring-boot-loader/src/it/executable-dir/pom.xml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
</properties>
1313
<build>
1414
<plugins>
15+
<plugin>
16+
<groupId>org.apache.maven.plugins</groupId>
17+
<artifactId>maven-compiler-plugin</artifactId>
18+
<version>@maven-compiler-plugin.version@</version>
19+
</plugin>
1520
<plugin>
1621
<groupId>org.apache.maven.plugins</groupId>
1722
<artifactId>maven-dependency-plugin</artifactId>
@@ -47,10 +52,20 @@
4752
</execution>
4853
</executions>
4954
</plugin>
55+
<plugin>
56+
<groupId>org.apache.maven.plugins</groupId>
57+
<artifactId>maven-jar-plugin</artifactId>
58+
<version>@maven-jar-plugin.version@</version>
59+
</plugin>
60+
<plugin>
61+
<groupId>org.apache.maven.plugins</groupId>
62+
<artifactId>maven-surefire-plugin</artifactId>
63+
<version>@maven-surefire-plugin.version@</version>
64+
</plugin>
5065
<plugin>
5166
<groupId>org.codehaus.mojo</groupId>
5267
<artifactId>exec-maven-plugin</artifactId>
53-
<version>1.2.1</version>
68+
<version>@exec-maven-plugin.version@</version>
5469
<configuration>
5570
<executable>java</executable>
5671
<arguments>
@@ -62,6 +77,15 @@
6277
</plugin>
6378
</plugins>
6479
</build>
80+
<dependencyManagement>
81+
<dependencies>
82+
<dependency>
83+
<groupId>javax.annotation</groupId>
84+
<artifactId>javax.annotation-api</artifactId>
85+
<version>@javax-annotation.version@</version>
86+
</dependency>
87+
</dependencies>
88+
</dependencyManagement>
6589
<dependencies>
6690
<dependency>
6791
<groupId>org.eclipse.jetty</groupId>

‎spring-boot-tools/spring-boot-loader/src/it/executable-jar/pom.xml

Lines changed: 49 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,38 @@
1212
</properties>
1313
<build>
1414
<plugins>
15+
<plugin>
16+
<artifactId>maven-assembly-plugin</artifactId>
17+
<version>@maven-assembly-plugin.version@</version>
18+
<configuration>
19+
<descriptors>
20+
<descriptor>src/main/assembly/jar-with-dependencies.xml</descriptor>
21+
</descriptors>
22+
<recompressZippedFiles>false</recompressZippedFiles>
23+
<archive>
24+
<manifest>
25+
<mainClass>org.springframework.boot.loader.JarLauncher</mainClass>
26+
</manifest>
27+
<manifestEntries>
28+
<Start-Class>org.springframework.boot.load.it.jar.EmbeddedJarStarter</Start-Class>
29+
</manifestEntries>
30+
</archive>
31+
</configuration>
32+
<executions>
33+
<execution>
34+
<id>jar-with-dependencies</id>
35+
<phase>package</phase>
36+
<goals>
37+
<goal>single</goal>
38+
</goals>
39+
</execution>
40+
</executions>
41+
</plugin>
42+
<plugin>
43+
<groupId>org.apache.maven.plugins</groupId>
44+
<artifactId>maven-compiler-plugin</artifactId>
45+
<version>@maven-compiler-plugin.version@</version>
46+
</plugin>
1547
<plugin>
1648
<groupId>org.apache.maven.plugins</groupId>
1749
<artifactId>maven-dependency-plugin</artifactId>
@@ -48,33 +80,26 @@
4880
</executions>
4981
</plugin>
5082
<plugin>
51-
<artifactId>maven-assembly-plugin</artifactId>
52-
<version>2.4</version>
53-
<configuration>
54-
<descriptors>
55-
<descriptor>src/main/assembly/jar-with-dependencies.xml</descriptor>
56-
</descriptors>
57-
<archive>
58-
<manifest>
59-
<mainClass>org.springframework.boot.loader.JarLauncher</mainClass>
60-
</manifest>
61-
<manifestEntries>
62-
<Start-Class>org.springframework.boot.load.it.jar.EmbeddedJarStarter</Start-Class>
63-
</manifestEntries>
64-
</archive>
65-
</configuration>
66-
<executions>
67-
<execution>
68-
<id>jar-with-dependencies</id>
69-
<phase>package</phase>
70-
<goals>
71-
<goal>single</goal>
72-
</goals>
73-
</execution>
74-
</executions>
83+
<groupId>org.apache.maven.plugins</groupId>
84+
<artifactId>maven-jar-plugin</artifactId>
85+
<version>@maven-jar-plugin.version@</version>
86+
</plugin>
87+
<plugin>
88+
<groupId>org.apache.maven.plugins</groupId>
89+
<artifactId>maven-surefire-plugin</artifactId>
90+
<version>@maven-surefire-plugin.version@</version>
7591
</plugin>
7692
</plugins>
7793
</build>
94+
<dependencyManagement>
95+
<dependencies>
96+
<dependency>
97+
<groupId>javax.annotation</groupId>
98+
<artifactId>javax.annotation-api</artifactId>
99+
<version>@javax-annotation.version@</version>
100+
</dependency>
101+
</dependencies>
102+
</dependencyManagement>
78103
<dependencies>
79104
<dependency>
80105
<groupId>org.eclipse.jetty</groupId>

‎spring-boot-tools/spring-boot-loader/src/it/executable-props-lib/pom.xml

Lines changed: 53 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -12,44 +12,9 @@
1212
</properties>
1313
<build>
1414
<plugins>
15-
<plugin>
16-
<groupId>org.apache.maven.plugins</groupId>
17-
<artifactId>maven-dependency-plugin</artifactId>
18-
<version>@maven-dependency-plugin.version@</version>
19-
<executions>
20-
<execution>
21-
<id>unpack</id>
22-
<phase>prepare-package</phase>
23-
<goals>
24-
<goal>unpack</goal>
25-
</goals>
26-
<configuration>
27-
<artifactItems>
28-
<artifactItem>
29-
<groupId>@project.groupId@</groupId>
30-
<artifactId>@project.artifactId@</artifactId>
31-
<version>@project.version@</version>
32-
<type>jar</type>
33-
</artifactItem>
34-
</artifactItems>
35-
<outputDirectory>${project.build.directory}/app-assembly</outputDirectory>
36-
</configuration>
37-
</execution>
38-
<execution>
39-
<id>copy</id>
40-
<phase>prepare-package</phase>
41-
<goals>
42-
<goal>copy-dependencies</goal>
43-
</goals>
44-
<configuration>
45-
<outputDirectory>${project.build.directory}/dependencies-assembly/BOOT-INF/lib</outputDirectory>
46-
</configuration>
47-
</execution>
48-
</executions>
49-
</plugin>
5015
<plugin>
5116
<artifactId>maven-assembly-plugin</artifactId>
52-
<version>2.4</version>
17+
<version>@maven-assembly-plugin.version@</version>
5318
<executions>
5419
<execution>
5520
<id>app</id>
@@ -61,6 +26,7 @@
6126
<descriptors>
6227
<descriptor>src/main/assembly/app.xml</descriptor>
6328
</descriptors>
29+
<recompressZippedFiles>false</recompressZippedFiles>
6430
<archive>
6531
<manifest>
6632
<mainClass>org.springframework.boot.loader.PropertiesLauncher</mainClass>
@@ -81,10 +47,61 @@
8147
<descriptors>
8248
<descriptor>src/main/assembly/dependencies.xml</descriptor>
8349
</descriptors>
50+
<recompressZippedFiles>false</recompressZippedFiles>
8451
</configuration>
8552
</execution>
8653
</executions>
8754
</plugin>
55+
<plugin>
56+
<groupId>org.apache.maven.plugins</groupId>
57+
<artifactId>maven-compiler-plugin</artifactId>
58+
<version>@maven-compiler-plugin.version@</version>
59+
</plugin>
60+
<plugin>
61+
<groupId>org.apache.maven.plugins</groupId>
62+
<artifactId>maven-dependency-plugin</artifactId>
63+
<version>@maven-dependency-plugin.version@</version>
64+
<executions>
65+
<execution>
66+
<id>unpack</id>
67+
<phase>prepare-package</phase>
68+
<goals>
69+
<goal>unpack</goal>
70+
</goals>
71+
<configuration>
72+
<artifactItems>
73+
<artifactItem>
74+
<groupId>@project.groupId@</groupId>
75+
<artifactId>@project.artifactId@</artifactId>
76+
<version>@project.version@</version>
77+
<type>jar</type>
78+
</artifactItem>
79+
</artifactItems>
80+
<outputDirectory>${project.build.directory}/app-assembly</outputDirectory>
81+
</configuration>
82+
</execution>
83+
<execution>
84+
<id>copy</id>
85+
<phase>prepare-package</phase>
86+
<goals>
87+
<goal>copy-dependencies</goal>
88+
</goals>
89+
<configuration>
90+
<outputDirectory>${project.build.directory}/dependencies-assembly/BOOT-INF/lib</outputDirectory>
91+
</configuration>
92+
</execution>
93+
</executions>
94+
</plugin>
95+
<plugin>
96+
<groupId>org.apache.maven.plugins</groupId>
97+
<artifactId>maven-jar-plugin</artifactId>
98+
<version>@maven-jar-plugin.version@</version>
99+
</plugin>
100+
<plugin>
101+
<groupId>org.apache.maven.plugins</groupId>
102+
<artifactId>maven-surefire-plugin</artifactId>
103+
<version>@maven-surefire-plugin.version@</version>
104+
</plugin>
88105
</plugins>
89106
</build>
90107
<dependencies>

‎spring-boot-tools/spring-boot-loader/src/it/executable-props/pom.xml

Lines changed: 40 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,38 @@
1212
</properties>
1313
<build>
1414
<plugins>
15+
<plugin>
16+
<artifactId>maven-assembly-plugin</artifactId>
17+
<version>@maven-assembly-plugin.version@</version>
18+
<configuration>
19+
<descriptors>
20+
<descriptor>src/main/assembly/jar-with-dependencies.xml</descriptor>
21+
</descriptors>
22+
<recompressZippedFiles>false</recompressZippedFiles>
23+
<archive>
24+
<manifest>
25+
<mainClass>org.springframework.boot.loader.PropertiesLauncher</mainClass>
26+
</manifest>
27+
<manifestEntries>
28+
<Start-Class>org.springframework.boot.load.it.props.EmbeddedJarStarter</Start-Class>
29+
</manifestEntries>
30+
</archive>
31+
</configuration>
32+
<executions>
33+
<execution>
34+
<id>jar-with-dependencies</id>
35+
<phase>package</phase>
36+
<goals>
37+
<goal>single</goal>
38+
</goals>
39+
</execution>
40+
</executions>
41+
</plugin>
42+
<plugin>
43+
<groupId>org.apache.maven.plugins</groupId>
44+
<artifactId>maven-compiler-plugin</artifactId>
45+
<version>@maven-compiler-plugin.version@</version>
46+
</plugin>
1547
<plugin>
1648
<groupId>org.apache.maven.plugins</groupId>
1749
<artifactId>maven-dependency-plugin</artifactId>
@@ -48,30 +80,14 @@
4880
</executions>
4981
</plugin>
5082
<plugin>
51-
<artifactId>maven-assembly-plugin</artifactId>
52-
<version>2.4</version>
53-
<configuration>
54-
<descriptors>
55-
<descriptor>src/main/assembly/jar-with-dependencies.xml</descriptor>
56-
</descriptors>
57-
<archive>
58-
<manifest>
59-
<mainClass>org.springframework.boot.loader.PropertiesLauncher</mainClass>
60-
</manifest>
61-
<manifestEntries>
62-
<Start-Class>org.springframework.boot.load.it.props.EmbeddedJarStarter</Start-Class>
63-
</manifestEntries>
64-
</archive>
65-
</configuration>
66-
<executions>
67-
<execution>
68-
<id>jar-with-dependencies</id>
69-
<phase>package</phase>
70-
<goals>
71-
<goal>single</goal>
72-
</goals>
73-
</execution>
74-
</executions>
83+
<groupId>org.apache.maven.plugins</groupId>
84+
<artifactId>maven-jar-plugin</artifactId>
85+
<version>@maven-jar-plugin.version@</version>
86+
</plugin>
87+
<plugin>
88+
<groupId>org.apache.maven.plugins</groupId>
89+
<artifactId>maven-surefire-plugin</artifactId>
90+
<version>@maven-surefire-plugin.version@</version>
7591
</plugin>
7692
</plugins>
7793
</build>

0 commit comments

Comments
 (0)