You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/08/29 06:21:35 UTC

ant-ivy git commit: Update tools

Repository: ant-ivy
Updated Branches:
  refs/heads/master fd81f4461 -> 7c33b3c07


Update tools

Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/7c33b3c0
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/7c33b3c0
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/7c33b3c0

Branch: refs/heads/master
Commit: 7c33b3c0790bdbc2bb9c9f74270db6e4624f47f1
Parents: fd81f44
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Wed Aug 29 08:22:48 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Wed Aug 29 08:22:48 2018 +0200

----------------------------------------------------------------------
 .../extensions/src/org/apache/ivy/asciidoc/JiraMacro.java        | 2 +-
 build-release.xml                                                | 4 ++--
 build.xml                                                        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/7c33b3c0/asciidoc/templates/extensions/src/org/apache/ivy/asciidoc/JiraMacro.java
----------------------------------------------------------------------
diff --git a/asciidoc/templates/extensions/src/org/apache/ivy/asciidoc/JiraMacro.java b/asciidoc/templates/extensions/src/org/apache/ivy/asciidoc/JiraMacro.java
index 113520a..875cdce 100644
--- a/asciidoc/templates/extensions/src/org/apache/ivy/asciidoc/JiraMacro.java
+++ b/asciidoc/templates/extensions/src/org/apache/ivy/asciidoc/JiraMacro.java
@@ -30,7 +30,7 @@ public class JiraMacro extends InlineMacroProcessor {
     }
 
     @Override
-    protected String process(AbstractBlock parent, String target, Map<String, Object> attributes) {
+    public String process(AbstractBlock parent, String target, Map<String, Object> attributes) {
         Map<String, Object> options = new HashMap<String, Object>();
         options.put("type", ":link");
         options.put("target", "https://issues.apache.org/jira/browse/" + target);

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/7c33b3c0/build-release.xml
----------------------------------------------------------------------
diff --git a/build-release.xml b/build-release.xml
index e2b887e..63e1f50 100644
--- a/build-release.xml
+++ b/build-release.xml
@@ -170,7 +170,7 @@
     </target>
 
     <target name="init-asciidoctor-extensions" depends="init-ivy" unless="skip.doc">
-        <ivy:cachepath pathid="asciidoctorj.path" organisation="org.asciidoctor" module="asciidoctorj" revision="1.5.6" inline="true"/>
+        <ivy:cachepath pathid="asciidoctorj.path" organisation="org.asciidoctor" module="asciidoctorj" revision="1.5.7" inline="true"/>
         <mkdir dir="${build.dir}/asciidoc-extensions/classes"/>
         <javac srcdir="${doc.src.dir}/templates/extensions/src" destdir="${build.dir}/asciidoc-extensions/classes"
                debug="true" includeantruntime="no" classpathref="asciidoctorj.path"/>
@@ -184,7 +184,7 @@
     <target name="init-asciidoctor" depends="init-asciidoctor-extensions" unless="skip.doc">
         <mkdir dir="${build.dir}/asciidoc-lib/jars" />
         <mkdir dir="${build.dir}/asciidoc-lib/classes" />
-        <ivy:retrieve organisation="org.asciidoctor" module="asciidoctor-ant" revision="1.5.4" inline="true" pattern="${build.dir}/asciidoc-lib/jars/[artifact].[ext]" conf="default" />
+        <ivy:retrieve organisation="org.asciidoctor" module="asciidoctor-ant" revision="1.5.5" inline="true" pattern="${build.dir}/asciidoc-lib/jars/[artifact].[ext]" conf="default" />
         <unzip src="${build.dir}/asciidoc-lib/jars/asciidoctor-ant.jar" dest="${build.dir}/asciidoc-lib/classes" />
         <taskdef uri="antlib:org.asciidoctor.ant" resource="org/asciidoctor/ant/antlib.xml">
             <classpath>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/7c33b3c0/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 2ea3114..6e2f424 100644
--- a/build.xml
+++ b/build.xml
@@ -409,7 +409,7 @@
     </target>
 
     <target name="init-jacoco" depends="jar" unless="skip.test">
-        <ivy:cachepath organisation="org.jacoco" module="org.jacoco.ant" revision="0.8.1"
+        <ivy:cachepath organisation="org.jacoco" module="org.jacoco.ant" revision="0.8.2"
                        inline="true" conf="default" pathid="jacoco.classpath" log="download-only"/>
         <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml"
                  classpathref="jacoco.classpath"/>