Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the way integration tests find version numbers

Browse Source 
Update the integration tests so that the version number is found using
the main POM.xml files. Without this change `${revision}` would be
used.

See gh-9316
This commit is contained in:
Phillip Webb 2017-08-04 09:32:13 -07:00
parent 80562247fe
commit 8670151045
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/Versions.java
View File

@ -16,14 +16,16 @@
package org.springframework.boot.context.embedded; package org.springframework.boot.context.embedded;
import java.io.File;
import java.io.FileReader; import java.io.FileReader;
import javax.xml.xpath.XPath; import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathExpression;
import javax.xml.xpath.XPathFactory; import javax.xml.xpath.XPathFactory;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
import org.springframework.util.StringUtils;
/** /**
* Provides access to dependency versions by querying the project's pom. * Provides access to dependency versions by querying the project's pom.
* *
@ -31,22 +33,25 @@ import org.xml.sax.InputSource;
*/ */
final class Versions { final class Versions {
private static final String PROPERTIES = "/*[local-name()='project']/*[local-name()='properties']";
private Versions() { private Versions() {
} }
public static String getBootVersion() { public static String getBootVersion() {
return evaluateExpression( String baseDir = StringUtils.cleanPath(new File(".").getAbsolutePath());
"/*[local-name()='project']/*[local-name()='parent']/*[local-name()='version']" String mainBaseDir = evaluateExpression("pom.xml",
+ "/text()"); PROPERTIES + "/*[local-name()='main.basedir']/text()");
mainBaseDir = mainBaseDir.replace("${basedir}", baseDir);
return evaluateExpression(mainBaseDir + "/pom.xml",
PROPERTIES + "/*[local-name()='revision']/text()");
} }
private static String evaluateExpression(String expression) { private static String evaluateExpression(String file, String expression) {
try { try {
XPathFactory xPathFactory = XPathFactory.newInstance(); InputSource source = new InputSource(new FileReader(file));
XPath xpath = xPathFactory.newXPath(); XPath xpath = XPathFactory.newInstance().newXPath();
XPathExpression expr = xpath.compile(expression); return xpath.compile(expression).evaluate(source);
String version = expr.evaluate(new InputSource(new FileReader("pom.xml")));
return version;
} }
catch (Exception ex) { catch (Exception ex) {
throw new IllegalStateException("Failed to evaluate expression", ex); throw new IllegalStateException("Failed to evaluate expression", ex);