jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r901189 - in /jackrabbit/branches/2.0: ./ jackrabbit-standalone/src/main/appended-resources/META-INF/LICENSE
Date Wed, 20 Jan 2010 13:29:47 GMT
Author: jukka
Date: Wed Jan 20 13:29:47 2010
New Revision: 901189

URL: http://svn.apache.org/viewvc?rev=901189&view=rev
Log:
2.0: Merged revision 901144 (JCR-2471)

Modified:
    jackrabbit/branches/2.0/   (props changed)
    jackrabbit/branches/2.0/jackrabbit-standalone/src/main/appended-resources/META-INF/LICENSE

Propchange: jackrabbit/branches/2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 20 13:29:47 2010
@@ -2,4 +2,4 @@
 /jackrabbit/sandbox/JCR-1456:774917-886178
 /jackrabbit/sandbox/JCR-2170:812417-816332
 /jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:891595,891629,892253,892263,894150-894151,896408,896513,896532,896857,896870,896876,896908,896940,896942-896943,896969,896977,897071,897836,897842,897858,897935,897983,897992-897993,897996,898002,898042,898267,898325,898540,898677,898699,898701,898715,898872,899102,899181,899391,899393-899394,899583,899594,900305,900310,900314,900453,900702,900736,900762-900763,900767,901095,901122,901139,901170,901176
+/jackrabbit/trunk:891595,891629,892253,892263,894150-894151,896408,896513,896532,896857,896870,896876,896908,896940,896942-896943,896969,896977,897071,897836,897842,897858,897935,897983,897992-897993,897996,898002,898042,898267,898325,898540,898677,898699,898701,898715,898872,899102,899181,899391,899393-899394,899583,899594,900305,900310,900314,900453,900702,900736,900762-900763,900767,901095,901122,901139,901144,901170,901176

Modified: jackrabbit/branches/2.0/jackrabbit-standalone/src/main/appended-resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-standalone/src/main/appended-resources/META-INF/LICENSE?rev=901189&r1=901188&r2=901189&view=diff
==============================================================================
--- jackrabbit/branches/2.0/jackrabbit-standalone/src/main/appended-resources/META-INF/LICENSE
(original)
+++ jackrabbit/branches/2.0/jackrabbit-standalone/src/main/appended-resources/META-INF/LICENSE
Wed Jan 20 13:29:47 2010
@@ -773,11 +773,11 @@
     conditions of this Agreement carefully.
 
     Content Repository for JavaTM Technology API Specification ("Specification")
-    Version: 1.0
+    Version: 2.0
     Status: FCS
-    Release: 11 May 2005
+    Release: 10 August 2009
 
-    Copyright 2005 Day Management AG
+    Copyright 2009 Day Management AG
     Barfüsserplatz 6, 4001 Basel, Switzerland.
     All rights reserved.
 
@@ -898,8 +898,8 @@
     worldwide, non-exclusive, no-charge, royalty-free, irrevocable
     license to reproduce, publicly display, publicly perform,
     sublicense, and distribute unmodified copies of the Content
-    Repository for Java Technology API (JCR 1.0) Java Archive (JAR)
-    file ("jcr-1.0.jar") and to make, have made, use, offer to sell,
+    Repository for Java Technology API (JCR 2.0) Java Archive (JAR)
+    file ("jcr-2.0.jar") and to make, have made, use, offer to sell,
     sell, import, and otherwise transfer said file on its own or
     as part of a larger work that makes use of the JCR API.
 



Mime
View raw message