You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2023/02/23 22:18:00 UTC
svn commit: r1907835 - in /xmlbeans/trunk: LICENSE-binary.txt build.gradle build.xml src/main/maven/org.apache.xmlbeans/xmlbeans/pom.xml src/main/maven/plugin.xml
Author: fanningpj
Date: Thu Feb 23 22:18:00 2023
New Revision: 1907835
URL: http://svn.apache.org/viewvc?rev=1907835&view=rev
Log:
use LICENSE-BINARY.txt as the license in bin distributions
Added:
xmlbeans/trunk/LICENSE-binary.txt (with props)
Modified:
xmlbeans/trunk/build.gradle
xmlbeans/trunk/build.xml
xmlbeans/trunk/src/main/maven/org.apache.xmlbeans/xmlbeans/pom.xml
xmlbeans/trunk/src/main/maven/plugin.xml
Added: xmlbeans/trunk/LICENSE-binary.txt
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/LICENSE-binary.txt?rev=1907835&view=auto
==============================================================================
--- xmlbeans/trunk/LICENSE-binary.txt (added)
+++ xmlbeans/trunk/LICENSE-binary.txt Thu Feb 23 22:18:00 2023
@@ -0,0 +1,237 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.
+
+--------------------------------------------------------------------------------
+This project bundles some components that are also licensed under the Apache
+License Version 2.0:
+
+commons-codec:commons-codec:1.15
+com.google.guava:guava:31.1-jre
+org.apache.ant:ant:1.10.13
+org.apache.ant:ant-launcher:1.10.13
+org.apache.httpcomponents.client5:httpclient5:5.1.3
+org.apache.httpcomponents.client5:httpcore5:5.1.3
+org.apache.httpcomponents.client5:httpcore5-h2:5.1.3
+org.apache.logging.log4j:log4j-api:2.20.0
+org.xmlresolver:xmlresolver:4.4.3
+org.xmlresolver:xmlresolver-data:4.4.3
+
+Apache Software License 2.0 and LGPL 3.0
+----------------------------------------
+
+com.github.javaparser:javaparser-core:3.25.0
+com.github.javaparser:javaparser-symbol-solver-core:3.25.0
+
+Apache Software License 2.0 and LGPL 2.1 and Mozilla Public License 1.1
+-----------------------------------------------------------------------
+
+org.javassist:javassist:3.29.2-GA
+
+MIT License
+-----------
+
+org.slf4j:slf4j-api:1.7.25
+
+Mozilla Public License 2.0
+--------------------------
+
+net.sf.saxon:Saxon-HE:11.5
Propchange: xmlbeans/trunk/LICENSE-binary.txt
------------------------------------------------------------------------------
svn:executable = *
Modified: xmlbeans/trunk/build.gradle
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/build.gradle?rev=1907835&r1=1907834&r2=1907835&view=diff
==============================================================================
--- xmlbeans/trunk/build.gradle (original)
+++ xmlbeans/trunk/build.gradle Thu Feb 23 22:18:00 2023
@@ -67,9 +67,9 @@ configurations {
ext {
antVersion = '1.10.13'
- javaparserVersion = '3.24.9'
+ javaparserVersion = '3.25.0'
log4jVersion = '2.20.0'
- saxonVersion = '11.4'
+ saxonVersion = '11.5'
androidSdkMinimum = '26'
}
@@ -484,8 +484,9 @@ distributions {
into 'bin'
}
from ('.') {
- include 'LICENSE.txt'
+ include 'LICENSE-binary.txt'
include 'NOTICE.txt'
+ rename ('LICENSE-binary.txt', 'LICENSE.txt')
}
includeEmptyDirs = false
@@ -607,6 +608,7 @@ generatePomFileForPOIPublication.destina
[binDistTar, binDistZip]*.dependsOn 'cyclonedxBom'
[srcDistTar, srcDistZip]*.dependsOn 'cacheJava9'
[srcDistTar, srcDistZip]*.dependsOn 'cyclonedxBom'
+[srcDistTar, srcDistZip]*.dependsOn 'javadoc'
tasks.withType(Tar) {
compression = Compression.GZIP
Modified: xmlbeans/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/build.xml?rev=1907835&r1=1907834&r2=1907835&view=diff
==============================================================================
--- xmlbeans/trunk/build.xml (original)
+++ xmlbeans/trunk/build.xml Thu Feb 23 22:18:00 2023
@@ -121,9 +121,9 @@
<!-- dependencies -->
<dependency prefix="xml-apis" artifact="xml-apis:xml-apis:1.4.01" usage="java8"/>
<dependency prefix="log4j-api" artifact="org.apache.logging.log4j:log4j-api:2.20.0" usage="main"/>
- <dependency prefix="saxon" artifact="net.sf.saxon:Saxon-HE:11.4" usage="main"/>
+ <dependency prefix="saxon" artifact="net.sf.saxon:Saxon-HE:11.5" usage="main"/>
<dependency prefix="ant" artifact="org.apache.ant:ant:1.10.13" usage="main"/>
- <dependency prefix="javaparser.core" artifact="com.github.javaparser:javaparser-core:3.24.9" usage="main"/>
+ <dependency prefix="javaparser.core" artifact="com.github.javaparser:javaparser-core:3.25.0" usage="main"/>
<!-- previous xmlbeans version is used to bootstrap necessary schema bindings -->
<dependency prefix="old.xmlbeans" artifact="org.apache.xmlbeans:xmlbeans:3.1.0" usage="previous"/>
@@ -638,7 +638,7 @@
<excludepackage name="org.apache.xmlbeans.impl.xb.*"/>
<link href="https://docs.oracle.com/javase/9/docs/api/"/>
<!-- <link href="https://javadoc.io/doc/xml-apis/xml-apis/1.4.01/"/>-->
- <link href="https://javadoc.io/doc/com.github.javaparser/javaparser-core/3.24.9"/>
+ <link href="https://javadoc.io/doc/com.github.javaparser/javaparser-core/3.25.0"/>
<link href="https://ant.apache.org/manual/api/"/>
</javadoc>
</target>
Modified: xmlbeans/trunk/src/main/maven/org.apache.xmlbeans/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/maven/org.apache.xmlbeans/xmlbeans/pom.xml?rev=1907835&r1=1907834&r2=1907835&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/maven/org.apache.xmlbeans/xmlbeans/pom.xml (original)
+++ xmlbeans/trunk/src/main/maven/org.apache.xmlbeans/xmlbeans/pom.xml Thu Feb 23 22:18:00 2023
@@ -85,19 +85,19 @@
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
- <version>11.4</version>
+ <version>11.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.javaparser</groupId>
<artifactId>javaparser-core</artifactId>
- <version>3.24.9</version>
+ <version>3.25.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.javaparser</groupId>
<artifactId>javaparser-symbol-solver-core</artifactId>
- <version>3.24.9</version>
+ <version>3.25.0</version>
<scope>provided</scope>
</dependency>
Modified: xmlbeans/trunk/src/main/maven/plugin.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/maven/plugin.xml?rev=1907835&r1=1907834&r2=1907835&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/maven/plugin.xml (original)
+++ xmlbeans/trunk/src/main/maven/plugin.xml Thu Feb 23 22:18:00 2023
@@ -409,17 +409,17 @@
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
- <version>11.4</version>
+ <version>11.5</version>
</dependency>
<dependency>
<groupId>com.github.javaparser</groupId>
<artifactId>javaparser-core</artifactId>
- <version>3.24.9</version>
+ <version>3.25.0</version>
</dependency>
<dependency>
<groupId>com.github.javaparser</groupId>
<artifactId>javaparser-symbol-solver-core</artifactId>
- <version>3.24.9</version>
+ <version>3.25.0</version>
</dependency>
</dependencies>
</plugin>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org