Author: maartenc
Date: Tue Nov 6 20:50:26 2012
New Revision: 1406320
URL: http://svn.apache.org/viewvc?rev=1406320&view=rev
Log:
- Added missing license (merged from trunk)
- Make sure all properties are set before starting to upload to
repository.apache.org (merged from trunk)
Modified:
ant/ivy/core/branches/2.3.x/ (props changed)
ant/ivy/core/branches/2.3.x/build-release.xml
ant/ivy/core/branches/2.3.x/test/buildlists/testAbsolutePathToParent/master-parent/ivy.xml
Propchange: ant/ivy/core/branches/2.3.x/
------------------------------------------------------------------------------
Merged /ant/ivy/core/trunk:r1402974,1405955
Modified: ant/ivy/core/branches/2.3.x/build-release.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/build-release.xml?rev=1406320&r1=1406319&r2=1406320&view=diff
==============================================================================
--- ant/ivy/core/branches/2.3.x/build-release.xml (original)
+++ ant/ivy/core/branches/2.3.x/build-release.xml Tue Nov 6 20:50:26 2012
@@ -496,6 +496,13 @@
</classpath>
</taskdef>
+ <property file="${user.home}/ivybuild.properties" />
+ <input message="please enter your PGP password: "
addproperty="pgp.password"/>
+ <input message="please enter your PGP keyId: "
addproperty="pgp.keyId"/>
+
+ <input message="please enter your repository.apache.org username: "
addproperty="upload.user"/>
+ <input message="please enter your repository.apache.org password: "
addproperty="upload.password"/>
+
<ivy2:settings id="upload.settingsId" file="ivysettings-release.xml" />
<ivy2:resolve file="${basedir}/build/artifact/ivy.xml"
transitive="false" />
<ivy2:publish organisation="org.apache.ivy"
Modified:
ant/ivy/core/branches/2.3.x/test/buildlists/testAbsolutePathToParent/master-parent/ivy.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/test/buildlists/testAbsolutePathToParent/master-parent/ivy.xml?rev=1406320&r1=1406319&r2=1406320&view=diff
==============================================================================
---
ant/ivy/core/branches/2.3.x/test/buildlists/testAbsolutePathToParent/master-parent/ivy.xml
(original)
+++
ant/ivy/core/branches/2.3.x/test/buildlists/testAbsolutePathToParent/master-parent/ivy.xml
Tue Nov 6 20:50:26 2012
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<ivy-module version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd";>
