From 6b358acb0d454110a39c1a5852fb286c5264c5e6 Mon Sep 17 00:00:00 2001
From: Maarten Coene <maartenc@apache.org>
Date: Tue, 6 Nov 2012 20:50:26 +0000
Subject: [PATCH] - Added missing license (merged from trunk) - Make sure all
 properties are set before starting to upload to repository.apache.org (merged
 from trunk)

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1406320 13f79535-47bb-0310-9956-ffa450edef68
---
 build-release.xml                              |  7 +++++++
 .../master-parent/ivy.xml                      | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/build-release.xml b/build-release.xml
index 525bc4ed..9b9cc5a8 100644
--- a/build-release.xml
+++ b/build-release.xml
@@ -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"
diff --git a/test/buildlists/testAbsolutePathToParent/master-parent/ivy.xml b/test/buildlists/testAbsolutePathToParent/master-parent/ivy.xml
index 3f1a8578..0b663e2b 100644
--- a/test/buildlists/testAbsolutePathToParent/master-parent/ivy.xml
+++ b/test/buildlists/testAbsolutePathToParent/master-parent/ivy.xml
@@ -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">