Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ jobs:
- run:
name: Install fn binary (as it is needed for the integration tests)
command: ./.circleci/install-fn.sh
- run:
name: Workaround for https://issues.apache.org/jira/browse/SUREFIRE-1588
command: ./.circleci/fix-java-for-surefire.sh
- run:
name: Install junit-merge
command: npm install -g junit-merge
Expand Down
19 changes: 19 additions & 0 deletions .circleci/fix-java-for-surefire.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/usr/bin/env bash

set -ex

cat << 'EOF' > $HOME/.m2/settings.xml
<settings>
<profiles>
<profile>
<id>SUREFIRE-1588</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<argLine>-Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
</properties>
</profile>
</profiles>
</settings>
EOF
10 changes: 10 additions & 0 deletions images/build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

<fdk.version>1.0.0-SNAPSHOT</fdk.version>
<fn.repo.url>http://172.17.0.1:18080</fn.repo.url>

<surefire.version>2.22.1</surefire.version>
</properties>

<!-- The artifact is irrelevant, this pom is only used to download dependencies. -->
Expand Down Expand Up @@ -55,6 +57,14 @@
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
<useSystemClassLoader>false</useSystemClassLoader>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
Expand Down
9 changes: 9 additions & 0 deletions integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<version>1.0.0-SNAPSHOT</version>
<properties>
<jackson.version>2.9.6</jackson.version>
<surefire.version>2.22.1</surefire.version>
<junit.version>4.12</junit.version>
<commons-io.version>2.5</commons-io.version>
<assertj-core.version>3.6.2</assertj-core.version>
Expand Down Expand Up @@ -72,6 +73,14 @@
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
<useSystemClassLoader>false</useSystemClassLoader>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
9 changes: 9 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<jetty.version>9.4.12.v20180830</jetty.version>
<!--TDD-->
<jacoco.version>0.8.1</jacoco.version>
<surefire.version>2.22.1</surefire.version>
<junit.version>4.12</junit.version>
<mockito.version>2.21.0</mockito.version>
<assertj-core.version>3.10.0</assertj-core.version>
Expand Down Expand Up @@ -208,6 +209,14 @@
</execution>
</executions>
</plugin>
<plugin>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might need this in the IGN tests pom too as that isn't a module of this project

<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
<useSystemClassLoader>false</useSystemClassLoader>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
Expand Down