You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2018/07/09 11:05:46 UTC
svn commit: r1835409 - in /jackrabbit/branches/2.8: ./
jackrabbit-bundle/pom.xml jackrabbit-jcr-commons/pom.xml
Author: reschke
Date: Mon Jul 9 11:05:46 2018
New Revision: 1835409
URL: http://svn.apache.org/viewvc?rev=1835409&view=rev
Log:
JCR-4330: jackrabbit-jcr-commons and jackrabbit-bundle have broken manifests - backport changes from JCR-3937)
Modified:
jackrabbit/branches/2.8/ (props changed)
jackrabbit/branches/2.8/jackrabbit-bundle/pom.xml
jackrabbit/branches/2.8/jackrabbit-jcr-commons/pom.xml
Propchange: jackrabbit/branches/2.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 9 11:05:46 2018
@@ -2,4 +2,4 @@
/jackrabbit/branches/2.14:1813154
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1615997,1625561,1627529,1634584,1653275,1667787,1667795,1674859,1680757,1709811,1717599,1729382,1730696,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775657,1779166,1779460,1780208,1786325,1787043,1787381,1792100,1792105,1792113,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1810108,1811667,1812994,1814831,1817097-1817098,1817100,1817201,1818586,1819269,1820133,1821597,1822947,1822950,1826230,1826647,1826940,1826964,1833374
+/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1615997,1625561,1627529,1634584,1653275,1667787,1667795,1674859,1680757,1709811,1717599,1720093,1729382,1730696,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775657,1779166,1779460,1780208,1786325,1787043,1787381,1792100,1792105,1792113,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1810108,1811667,1812994,1814831,1817097-1817098,1817100,1817201,1818586,1819269,1820133,1821597,1822947,1822950,1826230,1826647,1826940,1826964,1833374
Modified: jackrabbit/branches/2.8/jackrabbit-bundle/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-bundle/pom.xml?rev=1835409&r1=1835408&r2=1835409&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-bundle/pom.xml (original)
+++ jackrabbit/branches/2.8/jackrabbit-bundle/pom.xml Mon Jul 9 11:05:46 2018
@@ -48,7 +48,6 @@
org.apache.jackrabbit.api.*;version=${project.version}
</Export-Package>
<Import-Package>
- *,
<!-- Optional dependencies from jackrabbit-core -->
org.apache.jackrabbit.test;resolution:=optional,
<!-- Optional dependencies from jackrabbit-webdav -->
@@ -60,7 +59,8 @@
org.apache.xml.utils;resolution:=optional,
org.apache.xalan.serialize;resolution:=optional,
org.apache.xalan.templates;resolution:=optional,
- org.apache.derby.impl.drda;resolution:=optional
+ org.apache.derby.impl.drda;resolution:=optional,
+ *
</Import-Package>
<Bundle-Activator>
org.apache.jackrabbit.bundle.Activator
Modified: jackrabbit/branches/2.8/jackrabbit-jcr-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-jcr-commons/pom.xml?rev=1835409&r1=1835408&r2=1835409&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-jcr-commons/pom.xml (original)
+++ jackrabbit/branches/2.8/jackrabbit-jcr-commons/pom.xml Mon Jul 9 11:05:46 2018
@@ -46,8 +46,8 @@
org.apache.jackrabbit.util.Base64
</Main-Class>
<Import-Package>
- *,
- org.apache.jackrabbit.api.security.user;version="[2.2,3)";resolution:=optional
+ org.apache.jackrabbit.api.security.user;version="[2.2,3)";resolution:=optional,
+ *
</Import-Package>
</instructions>
</configuration>