Author: xavier
Date: Thu Dec 6 16:37:48 2007
New Revision: 601931
URL: http://svn.apache.org/viewvc?rev=601931&view=rev
Log:
merge 601176, 601621 and 601624 from branch 2.0.0-beta1
Added:
ant/ivy/core/trunk/src/etc/license/
ant/ivy/core/trunk/src/etc/license/license-header.xml (with props)
Modified:
ant/ivy/core/trunk/build-release.xml
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-optional.xml
Modified: ant/ivy/core/trunk/build-release.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/build-release.xml?rev=601931&r1=601930&r2=601931&view=diff
==============================================================================
--- ant/ivy/core/trunk/build-release.xml (original)
+++ ant/ivy/core/trunk/build-release.xml Thu Dec 6 16:37:48 2007
@@ -64,6 +64,7 @@
<zipfileset dir="${doc.build.dir}"
prefix="${snapshot.full.name}/doc"
excludes="**/reports/coverage/**,**/reports/test/**"/>
<zipfileset dir="${src.dir}"
prefix="${snapshot.full.name}/src/java"/>
<zipfileset dir="${basedir}/src/example"
prefix="${snapshot.full.name}/src/example"/>
+ <zipfileset dir="${basedir}/src/etc"
prefix="${snapshot.full.name}/src/etc"/>
<zipfileset dir="${test.dir}"
prefix="${snapshot.full.name}/test/java"/>
<zipfileset dir="${basedir}/test/repositories"
prefix="${snapshot.full.name}/test/repositories"/>
<zipfileset dir="${basedir}/test/buildlist"
prefix="${snapshot.full.name}/test/buildlist"/>
@@ -72,10 +73,13 @@
<zipfileset
dir="${src.dir}/org/apache/ivy/plugins/parser/xml" includes="ivy.xsd"
fullpath="${snapshot.full.name}/ivy.xsd"/>
<zipfileset dir="${basedir}" includes="MANIFEST.MF"
fullpath="${snapshot.full.name}/MANIFEST.MF"/>
<zipfileset dir="${basedir}" includes="NOTICE"
fullpath="${snapshot.full.name}/NOTICE"/>
+ <zipfileset dir="${basedir}" includes="README"
prefix="${snapshot.full.name}"/>
<zipfileset dir="${basedir}" includes="LICENSE*"
prefix="${snapshot.full.name}"/>
<zipfileset dir="${basedir}" includes="CHANGES.txt"
fullpath="${snapshot.full.name}/CHANGES.txt"/>
<zipfileset dir="${basedir}" includes="RELEASE_NOTES"
fullpath="${snapshot.full.name}/RELEASE_NOTES"/>
<zipfileset dir="${basedir}"
includes="build.properties" fullpath="${snapshot.full.name}/build.properties"/>
+ <zipfileset dir="${basedir}" includes="ant.patterns"
fullpath="${snapshot.full.name}/ant.patterns"/>
+ <zipfileset dir="${basedir}"
includes="optional.patterns"
fullpath="${snapshot.full.name}/optional.patterns"/>
<zipfileset dir="${distrib.dir}" includes="ivy.xml"
fullpath="${snapshot.full.name}/ivy.xml"/>
<zipfileset dir="${basedir}" includes="build.xml"
fullpath="${snapshot.full.name}/build.xml"/>
@@ -91,6 +95,7 @@
<zipfileset dir="${doc.build.dir}"
prefix="${snapshot.full.name}/doc"
excludes="**/reports/coverage/**,**/reports/test/**"/>
<zipfileset dir="${basedir}/src/example"
prefix="${snapshot.full.name}/src/example"/>
<zipfileset dir="${basedir}" includes="NOTICE"
fullpath="${snapshot.full.name}/NOTICE"/>
+ <zipfileset dir="${basedir}" includes="README"
prefix="${snapshot.full.name}"/>
<zipfileset dir="${basedir}" includes="LICENSE*"
prefix="${snapshot.full.name}"/>
<zipfileset dir="${basedir}" includes="CHANGES.txt"
fullpath="${snapshot.full.name}/CHANGES.txt"/>
<zipfileset dir="${basedir}" includes="RELEASE_NOTES"
fullpath="${snapshot.full.name}/RELEASE_NOTES"/>
@@ -114,6 +119,7 @@
<zipfileset dir="${doc.build.dir}"
prefix="${snapshot.full.name}/doc"
excludes="**/reports/coverage/**,**/reports/test/**"/>
<zipfileset dir="${basedir}/src/example"
prefix="${snapshot.full.name}/src/example"/>
<zipfileset dir="${basedir}" includes="NOTICE"
fullpath="${snapshot.full.name}/NOTICE"/>
+ <zipfileset dir="${basedir}" includes="README"
prefix="${snapshot.full.name}"/>
<zipfileset dir="${basedir}" includes="LICENSE*"
prefix="${snapshot.full.name}"/>
<zipfileset dir="${basedir}" includes="CHANGES.txt"
fullpath="${snapshot.full.name}/CHANGES.txt"/>
<zipfileset dir="${basedir}" includes="RELEASE_NOTES"
fullpath="${snapshot.full.name}/RELEASE_NOTES"/>
@@ -149,7 +155,8 @@
<target name="snapshot-maven2" depends="init-snapshot,
snapshot-metadata, jar, sources, javadoc">
<property name="m2.distrib.dir"
value="${distrib.dir}/maven2/${build.version}" />
<ivy:makepom ivyfile="${distrib.dir}/ivy.xml"
- pomfile="${m2.distrib.dir}/ivy-${build.version}.pom">
+ pomfile="${m2.distrib.dir}/ivy-${build.version}.pom"
+
headerfile="${basedir}/src/etc/license/license-header.xml">
<mapping conf="core" scope="compile"/>
<mapping conf="test" scope="test"/>
</ivy:makepom>
Added: ant/ivy/core/trunk/src/etc/license/license-header.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/etc/license/license-header.xml?rev=601931&view=auto
==============================================================================
--- ant/ivy/core/trunk/src/etc/license/license-header.xml (added)
+++ ant/ivy/core/trunk/src/etc/license/license-header.xml Thu Dec 6 16:37:48
2007
@@ -0,0 +1,18 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+-->
Propchange: ant/ivy/core/trunk/src/etc/license/license-header.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-optional.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-optional.xml?rev=601931&r1=601930&r2=601931&view=diff
==============================================================================
---
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-optional.xml
(original)
+++
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-optional.xml
Thu Dec 6 16:37:48 2007
@@ -34,7 +34,7 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>cglib</groupId>
