openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mik...@apache.org
Subject svn commit: r653499 - in /openjpa/trunk: openjpa-project/LICENSE.txt pom.xml
Date Mon, 05 May 2008 15:27:53 GMT
Author: mikedd
Date: Mon May  5 08:27:52 2008
New Revision: 653499

URL: http://svn.apache.org/viewvc?rev=653499&view=rev
Log:
Exclude internal repository from RAT check, also update license.txt to mention WebSphere UOW
jar

Modified:
    openjpa/trunk/openjpa-project/LICENSE.txt
    openjpa/trunk/pom.xml

Modified: openjpa/trunk/openjpa-project/LICENSE.txt
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/LICENSE.txt?rev=653499&r1=653498&r2=653499&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/LICENSE.txt (original)
+++ openjpa/trunk/openjpa-project/LICENSE.txt Mon May  5 08:27:52 2008
@@ -219,6 +219,10 @@
     http://java.sun.com/xml/ns/persistence/orm_1_0.xsd)
   persistence-xsd.rsrc - included in the openjpa jar, taken from:
     http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd)
+  websphere-uow-api.jar - this jar file contains WebSphere proprietary
+    API code which is licensed for use when compiling OpenJPA. The
+    jar is not distributed with OpenJPA and is only included with the
+    source archive in order to resolve compilation dependencies. 
 ===========================
 
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
@@ -255,7 +259,7 @@
 
 1.12. Source Code means (a) the common form of computer software code in which modifications
are made and (b) associated documentation included in or with such code.
 
-1.13. You (or Your) means an individual or a legal entity exercising rights under, and complying
with all of the terms of, this License. For legal entities, You includes any entity which
controls, is controlled by, or is under common control with You. For purposes of this definition,
control means (a)áthe power, direct or indirect, to cause the direction or management of
such entity, whether by contract or otherwise, or (b)áownership of more than fifty percent
(50%) of the outstanding shares or beneficial ownership of such entity.
+1.13. You (or Your) means an individual or a legal entity exercising rights under, and complying
with all of the terms of, this License. For legal entities, You includes any entity which
controls, is controlled by, or is under common control with You. For purposes of this definition,
control means (a)�the power, direct or indirect, to cause the direction or management
of such entity, whether by contract or otherwise, or (b)�ownership of more than fifty
percent (50%) of the outstanding shares or beneficial ownership of such entity.
 
 2. License Grants.
 
@@ -263,15 +267,15 @@
 Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual
property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive
license:
 (a) under intellectual property rights (other than patent or trademark) Licensable by Initial
Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original
Software (or portions thereof), with or without Modifications, and/or as part of a Larger
Work; and
 (b) under Patent Claims infringed by the making, using or selling of Original Software, to
make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the
Original Software (or portions thereof).
-(c) The licenses granted in Sectionsá2.1(a) and (b) are effective on the date Initial Developer
first distributes or otherwise makes the Original Software available to a third party under
the terms of this License.
-(d) Notwithstanding Sectioná2.1(b) above, no patent license is granted: (1)áfor code that
You delete from the Original Software, or (2)áfor infringements caused by: (i)áthe modification
of the Original Software, or (ii)áthe combination of the Original Software with other software
or devices.
+(c) The licenses granted in Sections�2.1(a) and (b) are effective on the date Initial
Developer first distributes or otherwise makes the Original Software available to a third
party under the terms of this License.
+(d) Notwithstanding Section�2.1(b) above, no patent license is granted: (1)�for
code that You delete from the Original Software, or (2)�for infringements caused by:
(i)�the modification of the Original Software, or (ii)�the combination of the Original
Software with other software or devices.
 
 2.2. Contributor Grant.
 Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual
property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive
license:
 (a) under intellectual property rights (other than patent or trademark) Licensable by Contributor
to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created
by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications,
as Covered Software and/or as part of a Larger Work; and
-(b) under Patent Claims infringed by the making, using, or selling of Modifications made
by that Contributor either alone and/or in combination with its Contributor Version (or portions
of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose
of: (1)áModifications made by that Contributor (or portions thereof); and (2)áthe combination
of Modifications made by that Contributor with its Contributor Version (or portions of such
combination).
-(c) The licenses granted in Sectionsá2.2(a) and 2.2(b) are effective on the date Contributor
first distributes or otherwise makes the Modifications available to a third party.
-(d) Notwithstanding Sectioná2.2(b) above, no patent license is granted: (1)áfor any code
that Contributor has deleted from the Contributor Version; (2)áfor infringements caused by:
(i)áthird party modifications of Contributor Version, or (ii)áthe combination of Modifications
made by that Contributor with other software (except as part of the Contributor Version) or
other devices; or (3)áunder Patent Claims infringed by Covered Software in the absence of
Modifications made by that Contributor.
+(b) under Patent Claims infringed by the making, using, or selling of Modifications made
by that Contributor either alone and/or in combination with its Contributor Version (or portions
of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose
of: (1)�Modifications made by that Contributor (or portions thereof); and (2)�the
combination of Modifications made by that Contributor with its Contributor Version (or portions
of such combination).
+(c) The licenses granted in Sections�2.2(a) and 2.2(b) are effective on the date Contributor
first distributes or otherwise makes the Modifications available to a third party.
+(d) Notwithstanding Section�2.2(b) above, no patent license is granted: (1)�for
any code that Contributor has deleted from the Contributor Version; (2)�for infringements
caused by: (i)�third party modifications of Contributor Version, or (ii)�the combination
of Modifications made by that Contributor with other software (except as part of the Contributor
Version) or other devices; or (3)�under Patent Claims infringed by Covered Software in
the absence of Modifications made by that Contributor.
 
 3. Distribution Obligations.
 
@@ -305,7 +309,7 @@
 You may always continue to use, distribute or otherwise make the Covered Software available
under the terms of the version of the License under which You originally received the Covered
Software. If the Initial Developer includes a notice in the Original Software prohibiting
it from being distributed or otherwise made available under any subsequent version of the
License, You must distribute and make the Covered Software available under the terms of the
version of the License under which You originally received the Covered Software. Otherwise,
You may also choose to use, distribute or otherwise make the Covered Software available under
the terms of any subsequent version of the License published by the license steward.
 4.3. Modified Versions.
 
-When You are an Initial Developer and You want to create a new license for Your Original
Software, You may create and use a modified version of this License if You: (a)árename the
license and remove any references to the name of the license steward (except to note that
the license differs from this License); and (b)áotherwise make it clear that the license
contains terms which differ from this License.
+When You are an Initial Developer and You want to create a new license for Your Original
Software, You may create and use a modified version of this License if You: (a)�rename
the license and remove any references to the name of the license steward (except to note that
the license differs from this License); and (b)�otherwise make it clear that the license
contains terms which differ from this License.
 
 5. DISCLAIMER OF WARRANTY.
 
@@ -315,9 +319,9 @@
 
 6.1. This License and the rights granted hereunder will terminate automatically if You fail
to comply with terms herein and fail to cure such breach within 30 days of becoming aware
of the breach. Provisions which, by their nature, must remain in effect beyond the termination
of this License shall survive.
 
-6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against
Initial Developer or a Contributor (the Initial Developer or Contributor against whom You
assert such claim is referred to as Participant) alleging that the Participant Software (meaning
the Contributor Version where the Participant is a Contributor or the Original Software where
the Participant is the Initial Developer) directly or indirectly infringes any patent, then
any and all rights granted directly or indirectly to You by such Participant, the Initial
Developer (if the Initial Developer is not the Participant) and all Contributors under Sectionsá2.1
and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively
and automatically at the expiration of such 60 day notice period, unless if within such 60
day period You withdraw Your claim with respect to the Participant Software against such Participant
either unilaterally or pursuant to a writt
 en agreement with Participant.
+6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against
Initial Developer or a Contributor (the Initial Developer or Contributor against whom You
assert such claim is referred to as Participant) alleging that the Participant Software (meaning
the Contributor Version where the Participant is a Contributor or the Original Software where
the Participant is the Initial Developer) directly or indirectly infringes any patent, then
any and all rights granted directly or indirectly to You by such Participant, the Initial
Developer (if the Initial Developer is not the Participant) and all Contributors under Sections�2.1
and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively
and automatically at the expiration of such 60 day notice period, unless if within such 60
day period You withdraw Your claim with respect to the Participant Software against such Participant
either unilaterally or pursuant to a w
 ritten agreement with Participant.
 
-6.3. In the event of termination under Sectionsá6.1 or 6.2 above, all end user licenses
that have been validly granted by You or any distributor hereunder prior to termination (excluding
licenses granted to You by any distributor) shall survive termination.
+6.3. In the event of termination under Sections�6.1 or 6.2 above, all end user licenses
that have been validly granted by You or any distributor hereunder prior to termination (excluding
licenses granted to You by any distributor) shall survive termination.
 
 7. LIMITATION OF LIABILITY.
 
@@ -325,7 +329,7 @@
 
 8. U.S. GOVERNMENT END USERS.
 
-The Covered Software is a commercial item, as that term is defined in 48áC.F.R.á2.101 (Oct.
1995), consisting of commercial computer software (as that term is defined at 48 C.F.R. á252.227-7014(a)(1))
and commercial computer software documentation as such terms are used in 48áC.F.R.á12.212
(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
(June 1995), all U.S. Government End Users acquire Covered Software with only those rights
set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other
FAR, DFAR, or other clause or provision that addresses Government rights in computer software
under this License.
+The Covered Software is a commercial item, as that term is defined in 48�C.F.R.�2.101
(Oct. 1995), consisting of commercial computer software (as that term is defined at 48 C.F.R.
�252.227-7014(a)(1)) and commercial computer software documentation as such terms are
used in 48�C.F.R.�12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R.
227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software
with only those rights set forth herein. This U.S. Government Rights clause is in lieu of,
and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government
rights in computer software under this License.
 
 9. MISCELLANEOUS.
 

Modified: openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=653499&r1=653498&r2=653499&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Mon May  5 08:27:52 2008
@@ -191,6 +191,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>rat-maven-plugin</artifactId>
+                        <version>1.0-alpha-1</version>
                         <executions>
                             <execution>
                                 <phase>verify</phase>
@@ -199,6 +200,15 @@
                                 </goals>
                             </execution>
                         </executions>
+                        <configuration>
+                            <excludes>
+                                <!--
+                                    Exclude internal repository. These files are 
+                                    generated by Maven or only used for build purposes.
+                                -->
+                                <exclude>**/internal-repository/**</exclude>
+                            </excludes>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>



Mime
View raw message