Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sync up versions used in Maven integration tests

Browse Source 
Fixes gh-1797
This commit is contained in:
Phillip Webb
2014-11-13 18:44:10 -08:00
parent 345ced1675
commit 3a9d6242ea
14 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-artifact/pom.xml
View File

@@ -43,12 +43,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.0.5.RELEASE</version>
<version>@spring.version@</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<version>@servlet-api.version@</version>
<scope>provided</scope>
</dependency>
<dependency>

4
spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-entry/pom.xml
View File

@@ -48,12 +48,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.0.5.RELEASE</version>
<version>@spring.version@</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<version>@servlet-api.version@</version>
<scope>provided</scope>
</dependency>
<dependency>

4
spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-group/pom.xml
View File

@@ -43,12 +43,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.0.5.RELEASE</version>
<version>@spring.version@</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<version>@servlet-api.version@</version>
<scope>provided</scope>
</dependency>
<dependency>

2
spring-boot-tools/spring-boot-maven-plugin/src/it/jar-lib-name-conflict/acme-lib/pom.xml
View File

@@ -14,7 +14,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.0.5.RELEASE</version>
<version>@spring.version@</version>
</dependency>
</dependencies>
</project>

2
spring-boot-tools/spring-boot-maven-plugin/src/it/jar-lib-name-conflict/test-project/pom.xml
View File

@@ -51,7 +51,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<version>@servlet-api.version@</version>
<scope>provided</scope>
</dependency>
</dependencies>

4
spring-boot-tools/spring-boot-maven-plugin/src/it/jar-pom/pom.xml
View File

@@ -29,12 +29,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.0.5.RELEASE</version>
<version>@spring.version@</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<version>@servlet-api.version@</version>
<scope>provided</scope>
</dependency>
</dependencies>

6
spring-boot-tools/spring-boot-maven-plugin/src/it/jar-test-scope/pom.xml
View File

@@ -43,18 +43,18 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.0.5.RELEASE</version>
<version>@spring.version@</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<version>@servlet-api.version@</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<version>@log4j.version@</version>
<scope>test</scope>
</dependency>
</dependencies>

6
spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-unpack/pom.xml
View File

@@ -48,18 +48,18 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.0.5.RELEASE</version>
<version>@spring.version@</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<version>@servlet-api.version@</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<version>@log4j.version@</version>
</dependency>
</dependencies>
</project>

4
spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-unpack/verify.groovy
View File

@@ -22,7 +22,7 @@ new Verify.JarArchiveVerification(f, Verify.SAMPLE_APP) {
@Override
protected void verifyZipEntries(Verify.ArchiveVerifier verifier) throws Exception {
super.verifyZipEntries(verifier)
verifier.hasUnpackEntry("lib/spring-core-4.0.5.RELEASE.jar")
verifier.hasNonUnpackEntry("lib/spring-context-4.0.5.RELEASE.jar")
verifier.hasUnpackEntry("lib/spring-core-")
verifier.hasNonUnpackEntry("lib/spring-context-")
}
}.verify();

4
spring-boot-tools/spring-boot-maven-plugin/src/it/jar/pom.xml
View File

@@ -43,12 +43,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.0.5.RELEASE</version>
<version>@spring.version@</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<version>@servlet-api.version@</version>
<scope>provided</scope>
</dependency>
</dependencies>

4
spring-boot-tools/spring-boot-maven-plugin/src/it/prop/pom.xml
View File

@@ -43,12 +43,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.0.5.RELEASE</version>
<version>@spring.version@</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<version>@servlet-api.version@</version>
<scope>provided</scope>
</dependency>
</dependencies>

4
spring-boot-tools/spring-boot-maven-plugin/src/it/run-exclude/pom.xml
View File

@@ -38,12 +38,12 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<version>@log4j.version@</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<version>@servlet-api.version@</version>
<scope>provided</scope>
</dependency>
<dependency>

4
spring-boot-tools/spring-boot-maven-plugin/src/it/war/pom.xml
View File

@@ -42,12 +42,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.0.5.RELEASE</version>
<version>@spring.version@</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<version>@servlet-api.version@</version>
<scope>provided</scope>
</dependency>
</dependencies>