Author: chetanm
Date: Thu Mar 13 03:53:56 2014
New Revision: 1577026
URL: http://svn.apache.org/r1577026
Log:
OAK-1528 - Update Slf4j Api dependency to 1.7.6
Modifying the paxexam setup to use latest Pax Logging which exports 1.7.x
version of Slf4j API bundle
Added:
jackrabbit/oak/trunk/oak-it/osgi/src/test/resources/
jackrabbit/oak/trunk/oak-it/osgi/src/test/resources/exam.properties (with
props)
Modified:
jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
Modified:
jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java?rev=1577026&r1=1577025&r2=1577026&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
(original)
+++
jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
Thu Mar 13 03:53:56 2014
@@ -57,6 +57,7 @@ public class OSGiIT {
mavenBundle("org.apache.felix", "org.apache.felix.scr",
"1.8.0"),
mavenBundle( "org.apache.felix",
"org.apache.felix.configadmin", "1.4.0" ),
mavenBundle( "org.apache.felix",
"org.apache.felix.fileinstall", "3.2.6" ),
+ mavenBundle( "org.ops4j.pax.logging", "pax-logging-api",
"1.7.2" ),
systemProperties(new
SystemPropertyOption("felix.fileinstall.dir").value(getConfigDir())),
jarBundles());
}
Added: jackrabbit/oak/trunk/oak-it/osgi/src/test/resources/exam.properties
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/osgi/src/test/resources/exam.properties?rev=1577026&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-it/osgi/src/test/resources/exam.properties (added)
+++ jackrabbit/oak/trunk/oak-it/osgi/src/test/resources/exam.properties Thu Mar
13 03:53:56 2014
@@ -0,0 +1,21 @@
+#
+# 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.
+#
+
+#Disable the default bundles provisioned under pax logging
+pax.exam.logging=none
\ No newline at end of file
Propchange: jackrabbit/oak/trunk/oak-it/osgi/src/test/resources/exam.properties
------------------------------------------------------------------------------
svn:eol-style = native
