You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by al...@apache.org on 2014/04/16 15:07:05 UTC
svn commit: r1587899 - in /jackrabbit/oak/branches/1.0: ./
oak-upgrade/pom.xml
Author: alexparvulescu
Date: Wed Apr 16 13:07:05 2014
New Revision: 1587899
URL: http://svn.apache.org/r1587899
Log:
Merged workaround to the Java 6 bug to the 1.0 branch.
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-upgrade/pom.xml
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1586836
Modified: jackrabbit/oak/branches/1.0/oak-upgrade/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-upgrade/pom.xml?rev=1587899&r1=1587898&r2=1587899&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-upgrade/pom.xml (original)
+++ jackrabbit/oak/branches/1.0/oak-upgrade/pom.xml Wed Apr 16 13:07:05 2014
@@ -105,4 +105,21 @@
</dependency>
</dependencies>
+ <!-- Workaround for http://bugs.java.com/view_bug.do?bug_id=6550655 -->
+ <profiles>
+ <profile>
+ <id>java6</id>
+ <activation>
+ <jdk>1.6</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>