You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2017/05/31 08:17:44 UTC

[1/2] ant-antlibs-common git commit: upgrade Ivy

Repository: ant-antlibs-common
Updated Branches:
  refs/heads/master 72410879d -> 3f7e30692


upgrade Ivy


Project: http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/commit/6ec76bcd
Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/tree/6ec76bcd
Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/diff/6ec76bcd

Branch: refs/heads/master
Commit: 6ec76bcd39d921a42d2cc8168f8b05a664634057
Parents: 7241087
Author: Stefan Bodewig <bo...@apache.org>
Authored: Wed May 31 10:16:01 2017 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Wed May 31 10:16:01 2017 +0200

----------------------------------------------------------------------
 build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/blob/6ec76bcd/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index c0fde72..20e9f47 100644
--- a/build.properties
+++ b/build.properties
@@ -17,7 +17,7 @@
 # Common properties. Could be overwritten by the concrete antlib project.
 
 # Ivy installation. Which version to use, where to store.
-ivy.install.version=2.4.0-rc1
+ivy.install.version=2.4.0
 ivy.jar.dir=${basedir}/ivy
 ivy.jar.file=${ivy.jar.dir}/ivy.jar
 


[2/2] ant-antlibs-common git commit: fix upload process, many thanks to Jaikiran

Posted by bo...@apache.org.
fix upload process, many thanks to Jaikiran


Project: http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/commit/3f7e3069
Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/tree/3f7e3069
Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/diff/3f7e3069

Branch: refs/heads/master
Commit: 3f7e306921c499a6b14a117f342e51c1820a4b51
Parents: 6ec76bc
Author: Stefan Bodewig <bo...@apache.org>
Authored: Wed May 31 10:17:07 2017 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Wed May 31 10:17:07 2017 +0200

----------------------------------------------------------------------
 build.xml  | 2 +-
 ivy.xml    | 2 +-
 upload.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/blob/3f7e3069/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index f9785a1..745fd89 100644
--- a/build.xml
+++ b/build.xml
@@ -453,7 +453,7 @@
 
   <target name="prepare-upload" depends="bin-dist">
     <property name="upload.dir"
-              value="${build.javarepository}/org/apache/ant/${artifact.name}/${artifact.version}"/>
+              value="${build.javarepository}/org.apache.ant/${artifact.name}/${artifact.version}"/>
     <mkdir dir="${upload.dir}"/>
     <copy file="${jarname}" todir="${upload.dir}"/>
     <copy file="${target.pom}" todir="${upload.dir}"/>

http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/blob/3f7e3069/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy.xml b/ivy.xml
index ea0cb11..b93fa5c 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -71,7 +71,7 @@
     <echo message="Creating ivy.xml ${target.ivy.xml}" level="verbose"/>
     <echo file="${target.ivy.xml}"><![CDATA[
       <ivy-module version="2.0">
-        <info organisation="Apache Ant"
+        <info organisation="org.apache.ant"
               module="${artifact.name}"
               revision="${artifact.version}"
               publication="${artifact.publication.datetime}">

http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/blob/3f7e3069/upload.xml
----------------------------------------------------------------------
diff --git a/upload.xml b/upload.xml
index 32a3a56..d4910e6 100644
--- a/upload.xml
+++ b/upload.xml
@@ -35,7 +35,7 @@
     <ivy:retrieve settingsRef="upload"/>
     <ivy:deliver settingsRef="upload"/>
     <ivy:publish publishivy="false"
-                 artifactspattern="${build.javarepository}/[organisation]/[module]/[artifact]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
+                 artifactspattern="${build.javarepository}/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
                  resolver="nexus"
                  settingsRef="upload"/>
   </target>