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 ju...@apache.org on 2014/04/12 10:35:28 UTC

svn commit: r1586836 - /jackrabbit/oak/trunk/oak-upgrade/pom.xml

Author: jukka
Date: Sat Apr 12 08:35:28 2014
New Revision: 1586836

URL: http://svn.apache.org/r1586836
Log:
OAK-1719: Missing commit hooks in upgrade

Add a workaround to the Java 6 bug brought up by Julian.

Modified:
    jackrabbit/oak/trunk/oak-upgrade/pom.xml

Modified: jackrabbit/oak/trunk/oak-upgrade/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/pom.xml?rev=1586836&r1=1586835&r2=1586836&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-upgrade/pom.xml Sat Apr 12 08:35:28 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>

Re: svn commit: r1586836 - /jackrabbit/oak/trunk/oak-upgrade/pom.xml

Posted by Jukka Zitting <ju...@gmail.com>.

Hi,

On Wed, Apr 16, 2014 at 8:17 AM, Alex Parvulescu
<al...@gmail.com> wrote:
> the same issue affects the 1.0 branch, can I merge this in?

+1. The fix has no effect on functionality, so there's near zero risk
in merging.

BR,

Jukka Zitting

Re: svn commit: r1586836 - /jackrabbit/oak/trunk/oak-upgrade/pom.xml

Posted by Alex Parvulescu <al...@gmail.com>.

the same issue affects the 1.0 branch, can I merge this in?


On Sat, Apr 12, 2014 at 5:44 PM, Julian Reschke <ju...@gmx.de>wrote:

> On 2014-04-12 10:35, jukka@apache.org wrote:
>
>> Author: jukka
>> Date: Sat Apr 12 08:35:28 2014
>> New Revision: 1586836
>>
>> URL: http://svn.apache.org/r1586836
>> Log:
>> OAK-1719: Missing commit hooks in upgrade
>>
>> Add a workaround to the Java 6 bug brought up by Julian.
>>
>> Modified:
>>      jackrabbit/oak/trunk/oak-upgrade/pom.xml
>>
>
> ...and that works. Thanks!
>
>

Re: svn commit: r1586836 - /jackrabbit/oak/trunk/oak-upgrade/pom.xml

Posted by Julian Reschke <ju...@gmx.de>.

On 2014-04-12 10:35, jukka@apache.org wrote:
> Author: jukka
> Date: Sat Apr 12 08:35:28 2014
> New Revision: 1586836
>
> URL: http://svn.apache.org/r1586836
> Log:
> OAK-1719: Missing commit hooks in upgrade
>
> Add a workaround to the Java 6 bug brought up by Julian.
>
> Modified:
>      jackrabbit/oak/trunk/oak-upgrade/pom.xml

...and that works. Thanks!