Author: fanningpj
Date: Mon Jun 11 20:48:19 2018
New Revision: 1833354
URL: http://svn.apache.org/viewvc?rev=1833354&view=rev
Log:
update build script
Modified:
xmlbeans/trunk/CHANGES.txt
xmlbeans/trunk/NOTICE.txt
xmlbeans/trunk/build.xml
Modified: xmlbeans/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/CHANGES.txt?rev=1833354&r1=1833353&r2=1833354&view=diff
==============================================================================
--- xmlbeans/trunk/CHANGES.txt (original)
+++ xmlbeans/trunk/CHANGES.txt Mon Jun 11 20:48:19 2018
@@ -1,5 +1,6 @@
Changes in V2.7.0 since V2.6.0
+* XMLBEANS-517: use safe XML parsers
* XMLBEANS-516: remove unnecessary javax and org.w3c classes
* XMLBEANS-515: remove piccolo support
* XMLBEANS-514: make java 6 the lowest supported runtime
Modified: xmlbeans/trunk/NOTICE.txt
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/NOTICE.txt?rev=1833354&r1=1833353&r2=1833354&view=diff
==============================================================================
--- xmlbeans/trunk/NOTICE.txt (original)
+++ xmlbeans/trunk/NOTICE.txt Mon Jun 11 20:48:19 2018
@@ -3,7 +3,7 @@
== Version 2.0, in this case for the Apache XmlBeans distribution. ==
=========================================================================
- This product includes software developed by
+ This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Portions of this software were originally based on the following:
@@ -22,8 +22,3 @@
- resolver.jar from Apache Xml Commons project,
Copyright (c) 2001-2003 Apache Software Foundation
- - Piccolo XML Parser for Java from http://piccolo.sourceforge.net/,
- Copyright 2002 Yuval Oren under the terms of the Apache Software License
2.0
-
- - JSR-173 Streaming API for XML from
http://sourceforge.net/projects/xmlpullparser/,
- Copyright 2005 BEA under the terms of the Apache Software License 2.0
Modified: xmlbeans/trunk/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/build.xml?rev=1833354&r1=1833353&r2=1833354&view=diff
==============================================================================
--- xmlbeans/trunk/build.xml (original)
+++ xmlbeans/trunk/build.xml Mon Jun 11 20:48:19 2018
@@ -60,21 +60,11 @@
<include name="saxonb8-6-1.zip"/>
<include name="saxonb8-2.zip"/>
<include name="saxonb8-1.zip"/>
- <include name="jsr173_1.0_api_bundle.jar"/>
- <include name="jsr173_1.0_api.jar"/>
<include name="saxon9.jar"/>
<include name="saxon9-dom.jar"/>
<include name="saxon8.jar"/>
<include name="saxon8-dom.jar"/>
<include name="xcresolver.zip"/>
- <!-- the entries below are to delete the previous versions of
the jsr173 jars -->
- <include name="jsr173.jar"/>
- <include name="jsr173_api.jar"/>
- <include name="jsr173_ri.jar"/>
- <include name="jsr173_1.0_api-mini-bundle.jar"/>
- <include name="jsr173_1.0_ri.jar"/>
- <include name="BEA Binary RI License (JSR 173).1(Clean).txt"/>
- <include name="README(jsr_173 api and ri).txt"/>
</fileset>
</delete>
</target>
@@ -288,6 +278,21 @@
<copy todir="${docs.dir}/images">
<fileset dir="docs/images"/>
</copy>
+ <delete
file="build/private/xmlbeans-${version.base}${version.rc}-javadoc.jar"/>
+ <jar
jarfile="build/private/xmlbeans-${version.base}${version.rc}-javadoc.jar"
index="false">
+ <fileset dir="${docs.dir}/reference"/>
+ <fileset file="LICENSE.txt"/>
+ <fileset file="NOTICE.txt"/>
+ <manifest>
+ <section name="${manifest.name}">
+ <attribute name="Comment" value="${manifest.comment}"/>
+ <attribute name="Implementation-Title"
value="${manifest.title}"/>
+ <attribute name="Implementation-Version"
value="${version.full}"/>
+ <attribute name="Implementation-Vendor"
value="${manifest.vendor}"/>
+ <attribute name="Implementation-URL"
value="${manifest.url}"/>
+ </section>
+ </manifest>
+ </jar>
</target>
@@ -393,7 +398,7 @@
<exclude name="bin/*.cmd"/>
</tarfileset>
</tar>
- <jar
jarfile="build/private/xmlbeans-${version.base}${version.rc}-sources.jar"
index="false">
+ <jar
jarfile="build/private/xmlbeans-${version.base}${version.rc}-source.jar"
index="false">
<fileset dir="src/common" includes="**/*.java"/>
<fileset dir="src/configschema" includes="**/*.java"/>
<fileset dir="src/jamsupport" includes="**/*.java"/>
@@ -464,9 +469,6 @@
<fileset dir="build/classes/toolschema"/>
<fileset dir="build/classes/xsdschema"/>
<fileset dir="build/classes/xmlschema"/>
- <fileset dir="build/classes/store">
- <exclude name="org/w3c/dom/**" />
- </fileset>
<fileset dir="build/classes/saaj_api"/>
<fileset dir="build/classes/xmlinputstream"/>
<fileset dir="build/classes/marshal"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
