Spring/spring-data-dev-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#92 - Adapt parent pom update to after Spring Doc Resources inclusion.

Browse Source 
Include artifactId of spring-data-build-resources in update XPath to update the appropriate dependency.
This commit is contained in:
Mark Paluch
2018-12-10 14:53:00 +01:00
parent 628da8bd4e
commit 20a8b8cb6f
3 changed files with 556 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
release-tools/src/main/java/org/springframework/data/release/build/ParentPom.java
View File

@@ -21,12 +21,13 @@ import org.xmlbeam.annotation.XBWrite;
/** /**
* @author Oliver Gierke * @author Oliver Gierke
* @author Mark Paluch
*/ */
public interface ParentPom extends Pom { public interface ParentPom extends Pom {
@XBWrite("/project/properties/releasetrain") @XBWrite("/project/properties/releasetrain")
void setReleaseTrain(@XBValue String releaseTrain); void setReleaseTrain(@XBValue String releaseTrain);
@XBWrite("/project/profiles/profile[id=\"distribute\"]/dependencies/dependency/version") @XBWrite("/project/profiles/profile[id=\"distribute\"]/dependencies/dependency[artifactId=\"spring-data-build-resources\"]/version")
void setSharedResourcesVersion(@XBValue ArtifactVersion value); void setSharedResourcesVersion(@XBValue ArtifactVersion value);
} }

11
release-tools/src/test/java/org/springframework/data/release/build/MavenIntegrationTests.java
View File

@@ -15,8 +15,10 @@
*/ */
package org.springframework.data.release.build; package org.springframework.data.release.build;
import static org.assertj.core.api.Assertions.*;
import static org.junit.Assume.*; import static org.junit.Assume.*;
import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
@@ -31,10 +33,12 @@ import org.springframework.data.release.io.Workspace;
import org.springframework.data.release.model.ArtifactVersion; import org.springframework.data.release.model.ArtifactVersion;
import org.springframework.data.release.model.Projects; import org.springframework.data.release.model.Projects;
import org.xmlbeam.ProjectionFactory; import org.xmlbeam.ProjectionFactory;
import org.xmlbeam.evaluation.XPathEvaluator;
import org.xmlbeam.io.XBFileIO; import org.xmlbeam.io.XBFileIO;
/** /**
* @author Oliver Gierke * @author Oliver Gierke
* @author Mark Paluch
*/ */
public class MavenIntegrationTests extends AbstractIntegrationTests { public class MavenIntegrationTests extends AbstractIntegrationTests {
@@ -64,7 +68,12 @@ public class MavenIntegrationTests extends AbstractIntegrationTests {
ParentPom pom = io.read(ParentPom.class); ParentPom pom = io.read(ParentPom.class);
pom.setSharedResourcesVersion(ArtifactVersion.of("1.2.0.RELEASE")); pom.setSharedResourcesVersion(ArtifactVersion.of("1.2.0.RELEASE"));
System.out.println(projection.asString(pom)); String xml = projection.asString(pom);
XPathEvaluator xPathEvaluator = projection.io().stream(new ByteArrayInputStream(xml.getBytes())).evalXPath(
"/project/profiles/profile[id=\"distribute\"]/dependencies/dependency[artifactId=\"spring-data-build-resources\"]/version");
assertThat(xPathEvaluator.asString()).isEqualToIgnoringCase("1.2.0.RELEASE");
} }
@Test @Test

680
release-tools/src/test/resources/parent-pom.xml
View File

File diff suppressed because it is too large Load Diff