Skip to content

Commit

Permalink
[#28] Make site generation work
Browse files Browse the repository at this point in the history
2 main workarounds:

 - remove Java 8 code causing coverage plugins to fail
 - override plugins improperly set in parent POM (see
assertj/assertj-parent-pom#38)
  • Loading branch information
Florent Biville committed Jun 26, 2019
1 parent f81f372 commit 726b2e1
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 8 deletions.
30 changes: 24 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@
<version>2.0.2-SNAPSHOT</version>
<name>AssertJ fluent assertions for Neo4j</name>
<url>http://www.assertj.org/assertj-neo4j.html</url>

<parent>
<groupId>org.assertj</groupId>
<artifactId>assertj-parent-pom</artifactId>
<version>2.1.6</version>
<version>2.2.3</version>
</parent>

<scm>
<developerConnection>scm:git:[email protected]:joel-costigliola/assertj-neo4j.git</developerConnection>
<connection>scm:git:[email protected]:joel-costigliola/assertj-neo4j.git</connection>
<url>[email protected]:joel-costigliola/assertj-neo4j</url>
<tag>HEAD</tag>
</scm>

<issueManagement>
<system>github</system>
<url>https://github.com/joel-costigliola/assertj-neo4j/issues</url>
Expand All @@ -29,7 +29,7 @@
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
<maven.compiler.showWarnings>true</maven.compiler.showWarnings>
</properties>

<dependencies>
<dependency>
<groupId>org.assertj</groupId>
Expand All @@ -53,7 +53,7 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -83,8 +83,26 @@
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.7.1</version>
</plugin>
</plugins>
</pluginManagement>
</build>

<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.0.0</version>
</plugin>
</plugins>
</reporting>

<profiles>
<profile>
<id>coverage</id>
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/org/assertj/neo4j/api/ResultAssert.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,12 @@ public class ResultAssert extends IterableAssert<Map<String, Object>> {
public ResultAssert(Result result) {
super(convertToIterable(result));
}
private static Iterable<Map<String, Object>> convertToIterable (Iterator<Map<String, Object>> iterator) {

private static Iterable<Map<String, Object>> convertToIterable(Iterator<Map<String, Object>> iterator) {
List<Map<String, Object>> result = new ArrayList<>();
iterator.forEachRemaining(result::add);
for (Iterator<Map<String, Object>> rows = iterator; rows.hasNext(); ) {
result.add(rows.next());
}
return result;
}
}

0 comments on commit 726b2e1

Please sign in to comment.