You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by gt...@apache.org on 2016/02/08 06:36:31 UTC
svn commit: r1729075 - in /river/jtsk/branches/2.2: LICENSE NOTICE build.xml
Author: gtrasuk
Date: Mon Feb 8 05:36:31 2016
New Revision: 1729075
URL: http://svn.apache.org/viewvc?rev=1729075&view=rev
Log:
The generated release artifacts for the 2.2 branch are now only the source and documentation artifacts, and do not include the release tooling like 'release.xml' and 'roll_release.sh'. Those files are only used by the release manager, so shouldn't be in the source distribution.
The LICENSE and NOTICE files also are no longer duplicated to 'LICENSE.TXT' and 'NOTICE.txt', as per Apache release recommendations.
LICENSE and NOTICE files have been modified to reflect the fact that 'asm' and 'animal-sniffer' are no longer distributed with the source, but are downloaded at build time.
Modified:
river/jtsk/branches/2.2/LICENSE
river/jtsk/branches/2.2/NOTICE
river/jtsk/branches/2.2/build.xml
Modified: river/jtsk/branches/2.2/LICENSE
URL: http://svn.apache.org/viewvc/river/jtsk/branches/2.2/LICENSE?rev=1729075&r1=1729074&r2=1729075&view=diff
==============================================================================
--- river/jtsk/branches/2.2/LICENSE (original)
+++ river/jtsk/branches/2.2/LICENSE Mon Feb 8 05:36:31 2016
@@ -199,39 +199,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.
-
-
-APACHE RIVER SUBCOMPONENTS:
-
-Apache River includes some external software components. Your use of these
-components is subject to the terms and conditions of the following licenses:
-
-ASM libraries (tools/asm-3.2.jar and tools/asm-commons-3.2.jar)
-
- ASM: a very small and fast Java bytecode manipulation framework
- Copyright (c) 2000-2005 INRIA, France Telecom
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- THE POSSIBILITY OF SUCH DAMAGE.
Modified: river/jtsk/branches/2.2/NOTICE
URL: http://svn.apache.org/viewvc/river/jtsk/branches/2.2/NOTICE?rev=1729075&r1=1729074&r2=1729075&view=diff
==============================================================================
--- river/jtsk/branches/2.2/NOTICE (original)
+++ river/jtsk/branches/2.2/NOTICE Mon Feb 8 05:36:31 2016
@@ -1,5 +1,5 @@
Apache River
-Copyright 2009 The Apache Software Foundation
+Copyright 2016 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -23,11 +23,3 @@ The original two releases of the Service
and code, are available from:
http://www.artima.com/jini/serviceui/index.html
-
-Copyright (c) 2000-2005 INRIA, France Telecom
-This product includes the ASM library (http://asm.ow2.org/)
-
-This product includes the animal-sniffer library from codehaus.org.
-The original software is available from http://mojo.codehaus.org/animal-sniffer/
-Licensed under the MIT license.
-
Modified: river/jtsk/branches/2.2/build.xml
URL: http://svn.apache.org/viewvc/river/jtsk/branches/2.2/build.xml?rev=1729075&r1=1729074&r2=1729075&view=diff
==============================================================================
--- river/jtsk/branches/2.2/build.xml (original)
+++ river/jtsk/branches/2.2/build.xml Mon Feb 8 05:36:31 2016
@@ -52,9 +52,14 @@
<target name="hudson-qa" description="hudson QA build target" depends="diagnostics,hudson-qa-settings,all.clean,qa.run" />
+ <!-- This property tells the qa package to generate an html report.
+ If for whatever reason that's not what you want, override it on the ant
+ command line with '-Dharness.generateHtml=false'
+ -->
+
+ <property name="harness.generateHtml" value="true" />
<target name="hudson-qa-settings" description="provide default settings" >
- <property name="harness.generateHtml" value="true" />
<echoproperties />
</target>
@@ -70,7 +75,7 @@
</target>
<target name="release" description="Create source and binary release packages"
- depends="release-src, release-bin, release-doc">
+ depends="release-src, release-doc">
</target>
<fileset id="river.bin.files" dir="${basedir}">
@@ -100,7 +105,11 @@
<include name="README*"/>
</fileset>-->
- <target name="release-bin" description="Create a binary release" depends="duplicate-text-files, all.build">
+ <!-- This target is here, but unused as of 2.2.3 release. Since the created
+ jar files are on Maven Central, and the binary release doesn't actually do
+ anything on its own, there's little point in having a binary release.
+ -->
+ <target name="release-bin" description="Create a binary release" depends="all.build">
<!-- TODO: add depends: javadoc-internals and remove from ci-build -->
<mkdir dir="${dist.dir}"/>
@@ -127,16 +136,12 @@
<exclude name="${lib-ext}/**"/>
<!-- TODO: remove when archive building is pure river.src.files based -->
<exclude name="qa/**"/>
-
+ <exclude name="roll_release.sh"/>
+ <exclude name="release.xml"/>
<exclude name="${test}/classes/**" />
<exclude name="${test}/results/**" />
-
- <!--
- TODO: why were these excluded from the source archive?
- <exclude name="${doc}/release-notes/new.html"/>
- <exclude name="${src}/**/*.sh"/>
- -->
-
+ <exclude name="${test}/lib/**" />
+ <exclude name="nbproject/**"/>
</fileset>
<fileset id="qa.src.files" dir="${basedir}/qa">
@@ -150,12 +155,7 @@
<include name="README*"/>
</fileset>
- <target name="duplicate-text-files" description="Creates friendly txt versions of common files">
- <copy file="LICENSE" toFile="LICENSE.txt"/>
- <copy file="NOTICE" toFile="NOTICE.txt"/>
- </target>
-
- <target name="release-doc" description="Create release doc archives" depends="duplicate-text-files, river-doc">
+ <target name="release-doc" description="Create release doc archives" depends="release-src, all.build, river-doc">
<mkdir dir="${dist.dir}"/>
<delete file="${doc.zip.bundle}"/>
@@ -168,7 +168,7 @@
</tar>
</target>
- <target name="release-src" description="Create a source release" depends="duplicate-text-files">
+ <target name="release-src" description="Create a source release" depends="clean">
<mkdir dir="${dist.dir}"/>
<delete file="${src.zip.bundle}"/>
<zip destfile="${src.zip.bundle}" roundup="yes">