Skip to content

Commit

Permalink
assertj module requires Java7, push it into a profile
Browse files Browse the repository at this point in the history
  • Loading branch information
bodewig committed May 14, 2018
1 parent f3e1d47 commit 3a76af0
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 7 deletions.
25 changes: 19 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
<module>xmlunit-matchers</module>
<module>xmlunit-legacy</module>
<module>xmlunit-placeholders</module>
<module>xmlunit-assertj</module>
</modules>

<developers>
Expand Down Expand Up @@ -124,11 +123,6 @@
<version>2.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>2.9.0</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -455,5 +449,24 @@
<javadoc.additionalparam>-Xdoclint:html,syntax,accessibility,reference</javadoc.additionalparam>
</properties>
</profile>
<profile>
<id>java7+</id>
<activation>
<activeByDefault>false</activeByDefault>
<jdk>[1.7,)</jdk>
</activation>
<modules>
<module>xmlunit-assertj</module>
</modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>2.9.0</version>
</dependency>
</dependencies>
</dependencyManagement>
</profile>
</profiles>
</project>
7 changes: 6 additions & 1 deletion xmlunit-assertj/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<properties>
<maven.compile.source>7</maven.compile.source>
<maven.compile.target>7</maven.compile.target>
</properties>

<artifactId>xmlunit-assertj</artifactId>
<name>org.xmlunit:xmlunit-assertj</name>
<description>XMLUnit with AssertJ fluent API</description>
Expand All @@ -30,4 +35,4 @@
</dependency>
</dependencies>

</project>
</project>

0 comments on commit 3a76af0

Please sign in to comment.