Various enhancements to pax-exam-helper

daisy · Jun 12, 2017 · e20e0bf · e20e0bf
2 parents e87e750 + b302f69
commit e20e0bf
Show file tree

Hide file tree

Showing 6 changed files with 198 additions and 72 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ before_install:
   - source <(curl -fsSL https://raw.github.com/daisy/maven-parents/travis/before_install)
 
 # main task, run the verify goal
+install: true
 script: mvn verify
 
 # if the build succeeds, deploy the artifact (tests are skipped)

diff --git a/pax-exam-helper/pom.xml b/pax-exam-helper/pom.xml
@@ -20,6 +20,7 @@
   <properties>
     <felix.version>4.4.1</felix.version>
     <pax-exam.version>3.3.0</pax-exam.version>
+    <pax-url.version>1.6.0</pax-url.version>
     <junit.version>4.11</junit.version>
     <slf4j.version>1.6.3</slf4j.version>
     <logback.version>0.9.30</logback.version>
@@ -69,6 +70,21 @@
       <artifactId>wagon-http</artifactId>
       <version>${wagon.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-file</artifactId>
+      <version>${wagon.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-settings</artifactId>
+      <version>${maven.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-settings-builder</artifactId>
+      <version>${maven.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -85,22 +101,35 @@
       <version>${felix.version}</version>
       <scope>runtime</scope>
     </dependency>
+    <!--
+        Using the forked container can apparently result in the Surefire error "The forked VM
+        terminated without properly saying goodbye". Setting forkCount to 0 in Surefire doesn't help
+        because it results in the error "java.net.MalformedURLException: unknown protocol:
+        link". Using the native container does fix the problem. Note that according to the Pax Exam
+        documentation the native container could result in classloader issues, but fortunately this
+        is not the case for us. Also note that the forked container has better isolation and
+        resembles better a production environment. We should therefore also try to run tests with
+        the forked container.
+        
+        See https://ops4j1.jira.com/wiki/display/PAXEXAM3/OSGi+Containers.
+    -->
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
-      <artifactId>pax-exam-container-forked</artifactId>
+      <!-- <artifactId>pax-exam-container-forked</artifactId> -->
+      <artifactId>pax-exam-container-native</artifactId>
       <version>${pax-exam.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.url</groupId>
       <artifactId>pax-url-reference</artifactId>
-      <version>1.6.0</version>
+      <version>${pax-url.version}</version>
      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.url</groupId>
       <artifactId>pax-url-wrap</artifactId>
-      <version>1.6.0</version>
+      <version>${pax-url.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -231,6 +260,8 @@
                 <xprocspec.version>${xprocspec.version}</xprocspec.version>
                 <xprocspec-runner.version>${xprocspec-runner.version}</xprocspec-runner.version>
                 <xproc-engine-daisy-pipeline.version>${xproc-engine-daisy-pipeline.version}</xproc-engine-daisy-pipeline.version>
+                <org.ops4j.pax.url.mvn.localRepository>${project.build.directory}/local-repo</org.ops4j.pax.url.mvn.localRepository>
+                <org.daisy.org.ops4j.pax.url.mvn.settings>${basedir}/src/it/settings.xml</org.daisy.org.ops4j.pax.url.mvn.settings>
               </properties>
               <goals>
                 <goal>clean</goal>

diff --git a/pax-exam-helper/src/it/it-pax-exam-xprocspec/pom.xml b/pax-exam-helper/src/it/it-pax-exam-xprocspec/pom.xml
@@ -14,6 +14,15 @@
       <artifactId>xproc-engine-daisy-pipeline</artifactId>
       <version>${xproc-engine-daisy-pipeline.version}</version>
       <scope>test</scope>
+      <!--
+          osgi.core 4.3.1 is dependency of xproc-engine-daisy-pipeline 1.10 but is not compatible with Felix 4.4.1
+      -->
+      <exclusions>
+        <exclusion>
+          <groupId>org.osgi</groupId>
+          <artifactId>org.osgi.core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.daisy.xprocspec</groupId>

diff --git a/pax-exam-helper/src/it/it-pax-exam-xspec/pom.xml b/pax-exam-helper/src/it/it-pax-exam-xspec/pom.xml
@@ -14,6 +14,15 @@
       <artifactId>saxon-adapter</artifactId>
       <version>1.1</version>
       <scope>test</scope>
+      <!--
+          osgi.core 4.3.1 is dependency of saxon-adapter 1.1 but is not compatible with Felix 4.4.1
+      -->
+      <exclusions>
+        <exclusion>
+          <groupId>org.osgi</groupId>
+          <artifactId>org.osgi.core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.daisy.maven</groupId>