This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-contentdetection.git

commit eab790bd60ae96e452c9e6f42313e142ea68be8f
Author: Oliver Lietz <o...@apache.org>
AuthorDate: Fri Feb 2 17:36:41 2018 +0100

    use Testing PaxExam 1.0.0 and Tika 1.17
---
 pom.xml                                                          | 8 ++++----
 .../internal/it/ContentAwareMimeTypeServiceImplIT.java           | 2 +-
 .../internal/it/ContentdetectionTestSupport.java                 | 9 ++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 60f1799..85a4b2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <org.ops4j.pax.exam.version>4.10.0</org.ops4j.pax.exam.version>
+        <org.ops4j.pax.exam.version>4.11.0</org.ops4j.pax.exam.version>
     </properties>
     
     <scm>
@@ -97,12 +97,12 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.paxexam</artifactId>
-            <version>0.0.4</version>
+            <version>1.0.0</version>
             <scope>test</scope>
         </dependency>
         <!-- Apache Tika-->
         <dependency>
-            <version>1.2</version>
+            <version>1.17</version>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-core</artifactId>
             <scope>provided</scope>
@@ -111,7 +111,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
-            <version>5.6.2</version>
+            <version>5.6.10</version>
             <scope>test</scope>
         </dependency>
         <!-- testing -->
diff --git 
a/src/test/java/org/apache/sling/commons/contentdetection/internal/it/ContentAwareMimeTypeServiceImplIT.java
 
b/src/test/java/org/apache/sling/commons/contentdetection/internal/it/ContentAwareMimeTypeServiceImplIT.java
index 81a74e2..c00f1dc 100644
--- 
a/src/test/java/org/apache/sling/commons/contentdetection/internal/it/ContentAwareMimeTypeServiceImplIT.java
+++ 
b/src/test/java/org/apache/sling/commons/contentdetection/internal/it/ContentAwareMimeTypeServiceImplIT.java
@@ -80,7 +80,7 @@ public class ContentAwareMimeTypeServiceImplIT extends 
ContentdetectionTestSuppo
         assertNotNull("Expecting stream to be found:" + filename, s);
         InputStream originalStream = null;
         try {
-            assertEquals("audio/x-wav", 
contentAwareMimeTypeService.getMimeType(filename, s));
+            assertEquals("audio/vnd.wave", 
contentAwareMimeTypeService.getMimeType(filename, s));
             originalStream = getClass().getResourceAsStream(path);
             assertNotNull("Expecting stream to be found:" + filename, 
originalStream);
             assertTrue("Expecting content to be unchanged", 
IOUtils.contentEquals(s, originalStream));
diff --git 
a/src/test/java/org/apache/sling/commons/contentdetection/internal/it/ContentdetectionTestSupport.java
 
b/src/test/java/org/apache/sling/commons/contentdetection/internal/it/ContentdetectionTestSupport.java
index 4c74ed3..22c7551 100644
--- 
a/src/test/java/org/apache/sling/commons/contentdetection/internal/it/ContentdetectionTestSupport.java
+++ 
b/src/test/java/org/apache/sling/commons/contentdetection/internal/it/ContentdetectionTestSupport.java
@@ -20,8 +20,7 @@ import org.apache.sling.testing.paxexam.TestSupport;
 import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.Option;
 
-import static 
org.apache.sling.testing.paxexam.SlingOptions.slingLaunchpadOakTar;
-import static org.apache.sling.testing.paxexam.SlingOptions.versionResolver;
+import static 
org.apache.sling.testing.paxexam.SlingOptions.slingQuickstartOakTar;
 import static org.ops4j.pax.exam.CoreOptions.composite;
 import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 
@@ -31,7 +30,7 @@ public abstract class ContentdetectionTestSupport extends 
TestSupport {
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            launchpad(),
+            slingQuickstart(),
             // Sling Content Detection
             testBundle("bundle.filename"),
             // testing
@@ -39,11 +38,11 @@ public abstract class ContentdetectionTestSupport extends 
TestSupport {
         };
     }
 
-    protected Option launchpad() {
+    protected Option slingQuickstart() {
         final int httpPort = findFreePort();
         final String workingDirectory = workingDirectory();
         return composite(
-            slingLaunchpadOakTar(workingDirectory, httpPort)
+            slingQuickstartOakTar(workingDirectory, httpPort)
         );
     }
 

-- 
To stop receiving notification emails like this one, please contact
o...@apache.org.

Reply via email to