Author: jukka Date: Wed Mar 6 11:38:33 2013 New Revision: 1453301 URL: http://svn.apache.org/r1453301 Log: OAK-676: Unify and upgrade SLF4j and Logback versions
Modified: jackrabbit/oak/trunk/oak-commons/pom.xml jackrabbit/oak/trunk/oak-core/pom.xml jackrabbit/oak/trunk/oak-it/mk/pom.xml jackrabbit/oak/trunk/oak-it/osgi/pom.xml jackrabbit/oak/trunk/oak-jcr/pom.xml jackrabbit/oak/trunk/oak-lucene/pom.xml jackrabbit/oak/trunk/oak-mk/pom.xml jackrabbit/oak/trunk/oak-mongomk/pom.xml jackrabbit/oak/trunk/oak-parent/pom.xml jackrabbit/oak/trunk/oak-run/pom.xml jackrabbit/oak/trunk/oak-solr-core/pom.xml Modified: jackrabbit/oak/trunk/oak-commons/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/pom.xml?rev=1453301&r1=1453300&r2=1453301&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-commons/pom.xml (original) +++ jackrabbit/oak/trunk/oak-commons/pom.xml Wed Mar 6 11:38:33 2013 @@ -45,7 +45,6 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.4</version> </dependency> <dependency> <groupId>com.google.code.findbugs</groupId> @@ -62,7 +61,6 @@ <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>1.0.1</version> <scope>test</scope> </dependency> </dependencies> Modified: jackrabbit/oak/trunk/oak-core/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1453301&r1=1453300&r2=1453301&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/pom.xml (original) +++ jackrabbit/oak/trunk/oak-core/pom.xml Wed Mar 6 11:38:33 2013 @@ -193,7 +193,6 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.4</version> </dependency> <!-- Findbugs annotations --> @@ -230,7 +229,6 @@ <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>1.0.1</version> <scope>test</scope> </dependency> <dependency> Modified: jackrabbit/oak/trunk/oak-it/mk/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/pom.xml?rev=1453301&r1=1453300&r2=1453301&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-it/mk/pom.xml (original) +++ jackrabbit/oak/trunk/oak-it/mk/pom.xml Wed Mar 6 11:38:33 2013 @@ -93,14 +93,12 @@ <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>1.0.1</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jul-to-slf4j</artifactId> - <version>1.6.4</version> - <scope>test</scope> + <groupId>org.slf4j</groupId> + <artifactId>jul-to-slf4j</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>com.google.guava</groupId> Modified: jackrabbit/oak/trunk/oak-it/osgi/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/osgi/pom.xml?rev=1453301&r1=1453300&r2=1453301&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-it/osgi/pom.xml (original) +++ jackrabbit/oak/trunk/oak-it/osgi/pom.xml Wed Mar 6 11:38:33 2013 @@ -149,7 +149,6 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> - <version>1.6.1</version> <scope>test</scope> </dependency> </dependencies> Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1453301&r1=1453300&r2=1453301&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/pom.xml (original) +++ jackrabbit/oak/trunk/oak-jcr/pom.xml Wed Mar 6 11:38:33 2013 @@ -304,7 +304,6 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.4</version> </dependency> <!-- Findbugs annotations --> @@ -330,13 +329,11 @@ <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>1.0.1</version> <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>jul-to-slf4j</artifactId> - <version>1.6.5</version> <scope>test</scope> </dependency> <dependency> Modified: jackrabbit/oak/trunk/oak-lucene/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/pom.xml?rev=1453301&r1=1453300&r2=1453301&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/pom.xml (original) +++ jackrabbit/oak/trunk/oak-lucene/pom.xml Wed Mar 6 11:38:33 2013 @@ -109,7 +109,6 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.4</version> </dependency> <!-- Findbugs annotations --> @@ -160,7 +159,6 @@ <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>1.0.1</version> <scope>test</scope> </dependency> </dependencies> Modified: jackrabbit/oak/trunk/oak-mk/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/pom.xml?rev=1453301&r1=1453300&r2=1453301&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mk/pom.xml (original) +++ jackrabbit/oak/trunk/oak-mk/pom.xml Wed Mar 6 11:38:33 2013 @@ -95,7 +95,6 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.4</version> </dependency> <!-- Caching --> @@ -135,7 +134,6 @@ <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>1.0.1</version> <scope>test</scope> </dependency> <dependency> Modified: jackrabbit/oak/trunk/oak-mongomk/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/pom.xml?rev=1453301&r1=1453300&r2=1453301&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mongomk/pom.xml (original) +++ jackrabbit/oak/trunk/oak-mongomk/pom.xml Wed Mar 6 11:38:33 2013 @@ -90,7 +90,6 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.4</version> </dependency> <!-- Other --> @@ -143,13 +142,11 @@ <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>1.0.1</version> <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>jul-to-slf4j</artifactId> - <version>1.6.4</version> <scope>test</scope> </dependency> <dependency> Modified: jackrabbit/oak/trunk/oak-parent/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1453301&r1=1453300&r2=1453301&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-parent/pom.xml (original) +++ jackrabbit/oak/trunk/oak-parent/pom.xml Wed Mar 6 11:38:33 2013 @@ -47,6 +47,9 @@ <mongo.db2>MongoMKDB2</mongo.db2> <segment.db>SegmentMK</segment.db> <solr.version>4.0.0</solr.version> + <!-- SLF4J and Logback versions should be kept in sync --> + <slf4j.version>1.7.2</slf4j.version> + <logback.version>1.0.9</logback.version> </properties> <issueManagement> @@ -257,6 +260,36 @@ <artifactId>easymock</artifactId> <version>3.1</version> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>${slf4j.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + <version>${slf4j.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>${slf4j.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jul-to-slf4j</artifactId> + <version>${slf4j.version}</version> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>${logback.version}</version> + </dependency> </dependencies> </dependencyManagement> Modified: jackrabbit/oak/trunk/oak-run/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/pom.xml?rev=1453301&r1=1453300&r2=1453301&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/pom.xml (original) +++ jackrabbit/oak/trunk/oak-run/pom.xml Wed Mar 6 11:38:33 2013 @@ -152,7 +152,6 @@ <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>1.0.1</version> </dependency> <!-- Test dependencies --> <dependency> Modified: jackrabbit/oak/trunk/oak-solr-core/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/pom.xml?rev=1453301&r1=1453300&r2=1453301&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/pom.xml (original) +++ jackrabbit/oak/trunk/oak-solr-core/pom.xml Wed Mar 6 11:38:33 2013 @@ -210,14 +210,12 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>log4j-over-slf4j</artifactId> - <version>1.6.4</version> <optional>true</optional> <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> - <version>1.6.4</version> <optional>true</optional> <scope>test</scope> </dependency>