You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2009/07/27 20:35:47 UTC
svn commit: r798248 - in /geronimo/specs/trunk/geronimo-jaxb_2.1_spec: ./
LICENSE NOTICE pom.xml
Author: djencks
Date: Mon Jul 27 18:35:47 2009
New Revision: 798248
URL: http://svn.apache.org/viewvc?rev=798248&view=rev
Log:
Rollback release and fix legal files
Modified:
geronimo/specs/trunk/geronimo-jaxb_2.1_spec/ (props changed)
geronimo/specs/trunk/geronimo-jaxb_2.1_spec/LICENSE
geronimo/specs/trunk/geronimo-jaxb_2.1_spec/NOTICE
geronimo/specs/trunk/geronimo-jaxb_2.1_spec/pom.xml
Propchange: geronimo/specs/trunk/geronimo-jaxb_2.1_spec/
('svn:mergeinfo' removed)
Modified: geronimo/specs/trunk/geronimo-jaxb_2.1_spec/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxb_2.1_spec/LICENSE?rev=798248&r1=798247&r2=798248&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxb_2.1_spec/LICENSE (original)
+++ geronimo/specs/trunk/geronimo-jaxb_2.1_spec/LICENSE Mon Jul 27 18:35:47 2009
@@ -200,58 +200,3 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
-
-#########################################################################
-## ADDITIONAL LICENSES ##
-#########################################################################
-
-The XMLSchema.dtd included in this project was developed by the
-W3C Consortium (http://www.w3c.org/).
-Use of the source code, thus licensed, and the resultant binary are
-subject to the terms and conditions of the following license.
-
-W3C¨ SOFTWARE NOTICE AND LICENSE
-Copyright © 1994-2002 World Wide Web Consortium, (Massachusetts Institute of
-Technology, Institut National de Recherche en Informatique et en Automatique,
-Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
-
-This W3C work (including software, documents, or other related items) is
-being provided by the copyright holders under the following license. By
-obtaining, using and/or copying this work, you (the licensee) agree that you
-have read, understood, and will comply with the following terms and
-conditions:
-
-Permission to use, copy, modify, and distribute this software and its
-documentation, with or without modification, for any purpose and without
-fee or royalty is hereby granted, provided that you include the following on
-ALL copies of the software and documentation or portions thereof, including
-modifications, that you make:
-
- 1. The full text of this NOTICE in a location viewable to users of the
- redistributed or derivative work.
- 2. Any pre-existing intellectual property disclaimers, notices, or terms
- and conditions. If none exist, a short notice of the following form
- (hypertext is preferred, text is permitted) should be used within
- the body of any redistributed or derivative code: "Copyright ©
- [$date-of-software] World Wide Web Consortium, (Massachusetts Institute
- of Technology, Institut National de Recherche en Informatique et en
- Automatique, Keio University). All Rights Reserved.
- http://www.w3.org/Consortium/Legal/"
- 3. Notice of any changes or modifications to the W3C files, including the
- date changes were made. (We recommend you provide URIs to the location
- from which the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE
-NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
-THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS,
-COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in advertising or
-publicity pertaining to the software without specific, written prior permission.
-Title to copyright in this software and any associated documentation will at all
-times remain with copyright holders.
Modified: geronimo/specs/trunk/geronimo-jaxb_2.1_spec/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxb_2.1_spec/NOTICE?rev=798248&r1=798247&r2=798248&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxb_2.1_spec/NOTICE (original)
+++ geronimo/specs/trunk/geronimo-jaxb_2.1_spec/NOTICE Mon Jul 27 18:35:47 2009
@@ -1,21 +1,8 @@
-Apache Geronimo
+
+Apache JAXB 2.1 Spec
Copyright 2003-2009 The Apache Software Foundation
-This product includes software developed by
+This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-This product includes software developed by
-The Object Management Group.
-
-Copyright (c) 1999-2000 Object Management Group. Unlimited rights to
-duplicate and use this code are hereby granted provided that this
-copyright notice is included.
-
-This product includes software developed by
-The W3C Consortium (http://www.w3.org/).
-Copyright © 1994-2002 World Wide Web Consortium,
-(Massachusetts Institute of Technology, Institut National
-de Recherche en Informatique et en Automatique, Keio
-University). All Rights Reserved.
-http://www.w3.org/Consortium/Legal/
Modified: geronimo/specs/trunk/geronimo-jaxb_2.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxb_2.1_spec/pom.xml?rev=798248&r1=798247&r2=798248&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxb_2.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaxb_2.1_spec/pom.xml Mon Jul 27 18:35:47 2009
@@ -30,7 +30,7 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxb_2.1_spec</artifactId>
<packaging>bundle</packaging>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<name>Apache JAXB 2.1 Spec</name>
<description>Java API for XML binding 2.1 API</description>