Index: oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java	(revision defc26b34b52acd95138d8ff1deedc9cfe96a233)
+++ oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java	(revision )
@@ -16,6 +16,8 @@
  */
 package org.apache.jackrabbit.oak.osgi;
 
+import static org.apache.jackrabbit.oak.commons.CIHelper.buildBotTrunkLinux;
+import static org.junit.Assume.assumeTrue;
 import static org.ops4j.pax.exam.CoreOptions.bundle;
 import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
@@ -81,6 +83,7 @@
 
     @Test
     public void listBundles() {
+        assumeTrue(!buildBotTrunkLinux());  // FIXME OAK-2374: fails often on http://ci.apache.org/builders/oak-trunk.
         for (Bundle bundle : context.getBundles()) {
             System.out.println(bundle);
         }
Index: oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/package-info.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/package-info.java	(revision )
+++ oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/package-info.java	(revision )
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+@Version("1.0")
+@Export(optional = "provide:=true")
+package org.apache.jackrabbit.oak.commons;
+
+import aQute.bnd.annotation.Export;
+import aQute.bnd.annotation.Version;
\ No newline at end of file
Index: oak-it/osgi/pom.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- oak-it/osgi/pom.xml	(revision defc26b34b52acd95138d8ff1deedc9cfe96a233)
+++ oak-it/osgi/pom.xml	(revision )
@@ -77,6 +77,13 @@
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>oak-commons</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
       <artifactId>oak-mk-api</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
Index: oak-it/osgi/test-bundles.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- oak-it/osgi/test-bundles.xml	(revision defc26b34b52acd95138d8ff1deedc9cfe96a233)
+++ oak-it/osgi/test-bundles.xml	(revision )
@@ -25,7 +25,7 @@
   <dependencySets>
     <dependencySet>
       <outputDirectory/>
-      <outputFileNameMapping>${artifact.artifactId}.jar</outputFileNameMapping>
+      <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.jar</outputFileNameMapping>
       <scope>test</scope>
       <includes>
         <include>javax.jcr:jcr</include>