jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From resc...@apache.org
Subject svn commit: r1868237 - in /jackrabbit/branches/2.18: ./ jackrabbit-jcr-rmi/ jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/iterator/ jackrabbit-jcr-rmi/src/main/java/...
Date Thu, 10 Oct 2019 10:01:36 GMT
Author: reschke
Date: Thu Oct 10 10:01:36 2019
New Revision: 1868237

URL: http://svn.apache.org/viewvc?rev=1868237&view=rev
Log:
JCR-4472: jcr-rmi: switch to package-level version annotations (merged r1865991 into 2.18)

Added:
    jackrabbit/branches/2.18/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/iterator/package-info.java
      - copied unchanged from r1865991, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/iterator/package-info.java
    jackrabbit/branches/2.18/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/package-info.java
      - copied unchanged from r1865991, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/package-info.java
    jackrabbit/branches/2.18/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/principal/package-info.java
      - copied unchanged from r1865991, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/principal/package-info.java
    jackrabbit/branches/2.18/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/security/package-info.java
      - copied unchanged from r1865991, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/security/package-info.java
    jackrabbit/branches/2.18/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/iterator/package-info.java
      - copied unchanged from r1865991, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/iterator/package-info.java
    jackrabbit/branches/2.18/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/jackrabbit/package-info.java
      - copied unchanged from r1865991, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/jackrabbit/package-info.java
    jackrabbit/branches/2.18/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/observation/package-info.java
      - copied unchanged from r1865991, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/observation/package-info.java
    jackrabbit/branches/2.18/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/package-info.java
      - copied unchanged from r1865991, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/package-info.java
    jackrabbit/branches/2.18/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/principal/package-info.java
      - copied unchanged from r1865991, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/principal/package-info.java
    jackrabbit/branches/2.18/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/security/package-info.java
      - copied unchanged from r1865991, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/security/package-info.java
    jackrabbit/branches/2.18/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/package-info.java
      - copied unchanged from r1865991, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/package-info.java
    jackrabbit/branches/2.18/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/iterator/package-info.java
      - copied unchanged from r1865991, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/iterator/package-info.java
    jackrabbit/branches/2.18/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/jmx/package-info.java
      - copied unchanged from r1865991, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/jmx/package-info.java
    jackrabbit/branches/2.18/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/package-info.java
      - copied unchanged from r1865991, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/package-info.java
    jackrabbit/branches/2.18/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/principal/package-info.java
      - copied unchanged from r1865991, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/principal/package-info.java
    jackrabbit/branches/2.18/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/security/package-info.java
      - copied unchanged from r1865991, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/security/package-info.java
    jackrabbit/branches/2.18/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/package-info.java
      - copied unchanged from r1865991, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/package-info.java
Modified:
    jackrabbit/branches/2.18/   (props changed)
    jackrabbit/branches/2.18/jackrabbit-jcr-rmi/pom.xml

Propchange: jackrabbit/branches/2.18/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 10 10:01:36 2019
@@ -1,3 +1,3 @@
 /jackrabbit/branches/JCR-2272:1173165-1176545
 /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1850224,1851360,1851369,1851372,1851380,1851384,1851904,1851946,1851953,1851961,1852417,1853927,1854018,1856855,1856969,1857631,1857721,1858564,1858566,1859534,1859563,1859633,1860118,1860123,1860645,1861773,1861777-1861778,1861781,1861786,1862283,1862783,1862805,1863196,1863222,1863384,1865525,1865748,1866280
+/jackrabbit/trunk:1850224,1851360,1851369,1851372,1851380,1851384,1851904,1851946,1851953,1851961,1852417,1853927,1854018,1856855,1856969,1857631,1857721,1858564,1858566,1859534,1859563,1859633,1860118,1860123,1860645,1861773,1861777-1861778,1861781,1861786,1862283,1862783,1862805,1863196,1863222,1863384,1865525,1865748,1865991,1866280

Modified: jackrabbit/branches/2.18/jackrabbit-jcr-rmi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.18/jackrabbit-jcr-rmi/pom.xml?rev=1868237&r1=1868236&r2=1868237&view=diff
==============================================================================
--- jackrabbit/branches/2.18/jackrabbit-jcr-rmi/pom.xml (original)
+++ jackrabbit/branches/2.18/jackrabbit-jcr-rmi/pom.xml Thu Oct 10 10:01:36 2019
@@ -52,9 +52,6 @@
           <instructions>
             <Bundle-Category>jcr,jackrabbit</Bundle-Category>
             <Bundle-DocURL>http://jackrabbit.apache.org/</Bundle-DocURL>
-            <Export-Package>
-              org.apache.jackrabbit.rmi.*;version=3.1.0
-            </Export-Package>
             <!-- optional resolution XA -->
             <Import-Package>
               javax.transaction.xa;resolution:=optional,*
@@ -515,6 +512,11 @@ org.apache.jackrabbit.test.api.observati
   <!-- D E P E N D E N C I E S                                             -->
   <!-- =================================================================== -->
   <dependencies>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.annotation</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <!-- Hard dependencies -->
     <dependency>
       <groupId>javax.jcr</groupId>



Mime
View raw message