root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Sync up versions used in Maven integration tests 

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
Show Stats 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> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-context</artifactId>
<version>4.0.5.RELEASE</version> <version>@spring.version@</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version> <version>@servlet-api.version@</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

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

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

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

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

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

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

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

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

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

@ -48,18 +48,18 @@
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-context</artifactId>
<version>4.0.5.RELEASE</version> <version>@spring.version@</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version> <version>@servlet-api.version@</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
<version>1.2.17</version> <version>@log4j.version@</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </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 @Override
protected void verifyZipEntries(Verify.ArchiveVerifier verifier) throws Exception { protected void verifyZipEntries(Verify.ArchiveVerifier verifier) throws Exception {
super.verifyZipEntries(verifier) super.verifyZipEntries(verifier)
verifier.hasUnpackEntry("lib/spring-core-4.0.5.RELEASE.jar") verifier.hasUnpackEntry("lib/spring-core-")
verifier.hasNonUnpackEntry("lib/spring-context-4.0.5.RELEASE.jar") verifier.hasNonUnpackEntry("lib/spring-context-")
} }
}.verify(); }.verify();

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

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

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

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

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

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

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

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

18
spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java
View File

@ -87,15 +87,25 @@ public class Verify {
} }
} }
public boolean hasNonUnpackEntry(String entry) { public boolean hasNonUnpackEntry(String entryName) {
return !hasUnpackEntry(entry); return !hasUnpackEntry(entryName);
} }
public boolean hasUnpackEntry(String entry) { public boolean hasUnpackEntry(String entryName) {
String comment = this.content.get(entry).getComment(); String comment = getEntryStartingWith(entryName).getComment();
return comment != null && comment.startsWith("UNPACK:"); return comment != null && comment.startsWith("UNPACK:");
} }
private ZipEntry getEntryStartingWith(String entryName) {
for (Map.Entry<String, ZipEntry> entry : this.content.entrySet()) {
if (entry.getKey().startsWith(entryName)) {
return entry.getValue();
}
}
throw new IllegalStateException("Unable to find entry starting with "
+ entryName);
}
public boolean hasEntry(String entry) { public boolean hasEntry(String entry) {
return this.content.containsKey(entry); return this.content.containsKey(entry);
} }