[GitHub] ant-ivy pull request #:
Github user twogee commented on the pull request: https://github.com/apache/ant-ivy/commit/6f22f4b49c2a3a59840d28e6cbe0c37a56ab1f90#commitcomment-23069324 Neat! ð Perhaps it would make sense to ask asciidoctorj team to add support for inlined Ruby and ditto for asciidoctor-ant? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org For additional commands, e-mail: dev-h...@ant.apache.org
Re: Fw: [2/2] ant-ivy git commit: Merge remote-tracking branch 'origin/master'
I remember IntelliJ was saying something about a failed commit asking me to merge to the last revision. I still don't understand why this results in 2 commits. (my knowledge of git is very limited as you can see) But I guess this is ok? Or should it be reverted somehow? Maarten Van: Jaikiran Pai Aan: dev@ant.apache.org Verzonden: woensdag 12 juli 17:53 2017 Onderwerp: Re: Fw: [2/2] ant-ivy git commit: Merge remote-tracking branch 'origin/master' I'm guessing that while committing the fix for IVY-1404 you probably did a "git merge" against latest master of upstream, which created this merge commit. -Jaikiran On 12/07/17 1:45 PM, Maarten Coene wrote: > > Any idea where this commit comes from?I didn't touch any of these files as > far as I know... > Maarten > > > - Doorgestuurd bericht - > Van: "maart...@apache.org" > Aan: notificati...@ant.apache.org > Verzonden: woensdag 12 juli 10:06 2017 > Onderwerp: [2/2] ant-ivy git commit: Merge remote-tracking branch >'origin/master' > > Merge remote-tracking branch 'origin/master' > > > Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo > Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/1a36ae09 > Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/1a36ae09 > Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/1a36ae09 > > Branch: refs/heads/master > Commit: 1a36ae09d2848d687895532acf46531437721692 > Parents: 585a702 dcaacf4 > Author: Maarten Coene > Authored: Wed Jul 12 10:05:54 2017 +0200 > Committer: Maarten Coene > Committed: Wed Jul 12 10:05:54 2017 +0200 > > -- > .../xml/XmlModuleDescriptorParserTest.java | 56 > .../hello/test-ivy-extends-absolute.xml | 25 + > .../plugins/parser/xml/foo%2Fbar/parent-ivy.xml | 27 ++ > 3 files changed, 108 insertions(+) > -- > > > > > - To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org For additional commands, e-mail: dev-h...@ant.apache.org
Re: ant-ivy git commit: An asciidoctor macro to create links to Jira
I look deeper into asciidoctor and asciidoctor-ant, and I have managed to create a simple macro. It creates links to jira just by declaring the name of the issue. The Ant tasks only supports macro implemented in Java, not Ruby, even if it seems that asciidoctor itself might support them in Ruby. So the build is a little more complex. I hope it is ok. At least the setup is in place in case somebody wants to add more macros. Nicolas > Le 12 juil. 2017 à 22:55, hi...@apache.org a écrit : > > Repository: ant-ivy > Updated Branches: > refs/heads/master 1a36ae09d -> 6f22f4b49 > > > An asciidoctor macro to create links to Jira > > > Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo > Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/6f22f4b4 > Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/6f22f4b4 > Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/6f22f4b4 > > Branch: refs/heads/master > Commit: 6f22f4b49c2a3a59840d28e6cbe0c37a56ab1f90 > Parents: 1a36ae0 > Author: Nicolas LaleveÌe > Authored: Wed Jul 12 22:54:25 2017 +0200 > Committer: Nicolas LaleveÌe > Committed: Wed Jul 12 22:54:25 2017 +0200 > > -- > asciidoc/release-notes.adoc | 54 ++-- > .../src/org/apache/ivy/asciidoc/JiraMacro.java | 40 +++ > build-release.xml | 23 - > 3 files changed, 88 insertions(+), 29 deletions(-) > -- > > > http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6f22f4b4/asciidoc/release-notes.adoc > -- > diff --git a/asciidoc/release-notes.adoc b/asciidoc/release-notes.adoc > index c2b7962..3b691b6 100644 > --- a/asciidoc/release-notes.adoc > +++ b/asciidoc/release-notes.adoc > @@ -50,40 +50,40 @@ http://issues.apache.org/jira/browse/ivy > > List of changes since Ivy 2.4.0: > > -- FIX: Local conflict manager didn't handle deeper conflicts in transitive > dependencies (link:https://issues.apache.org/jira/browse/IVY-1404[IVY-1404]) > -- FIX: Made the maven 'test' configuration public so we can use the test-jar > as dependency (link:https://issues.apache.org/jira/browse/IVY-1444[IVY-1444]) > -- FIX: NullPointerException in dependencytree with no dependencies > (link:https://issues.apache.org/jira/browse/IVY-1539[IVY-1539]) > -- FIX: checkIfChanged is not settable attribute for checkdepsupdate ant task > (link:https://issues.apache.org/jira/browse/IVY-1549[IVY-1549]) > -- FIX: ArrayIndexOutOfBoundsException when using a p2 repository for > dependencies (link:https://issues.apache.org/jira/browse/IVY-1504[IVY-1504]) > +- FIX: Local conflict manager didn't handle deeper conflicts in transitive > dependencies (jira:IVY-1404[]) > +- FIX: Made the maven 'test' configuration public so we can use the test-jar > as dependency (jira:IVY-1444[]) > +- FIX: NullPointerException in dependencytree with no dependencies > (jira:IVY-1539[]) > +- FIX: checkIfChanged is not settable attribute for checkdepsupdate ant task > (jira:IVY-1549[]) > +- FIX: ArrayIndexOutOfBoundsException when using a p2 repository for > dependencies (jira:IVY-1504[]) > - FIX: fixdeps remove transitive 'kept' dependencies > -- FIX: PomModuleDescriptorParser should parse licenses from parent POM > (link:https://issues.apache.org/jira/browse/IVY-1526[IVY-1526]) (Thanks to > Jaikiran Pai) > -- FIX: dynamic revisions are not cached per resolver > (link:https://issues.apache.org/jira/browse/IVY-1430[IVY-1430]) (Thanks to > Stephen Haberman) > -- FIX: Dependencies failed using branch attribute (and extra attributes) > (link:https://issues.apache.org/jira/browse/IVY-1141[IVY-1141]) (Thanks to > Stephen Haberman) > -- FIX: useCacheOnly should allow lookup of changing dependencies in cache > (link:https://issues.apache.org/jira/browse/IVY-1515[IVY-1515]) (Thanks to > Ilya) > -- FIX: Translation of POM to Ivy XML with * exclusion is removing main > artifact (link:https://issues.apache.org/jira/browse/IVY-1531[IVY-1531]) > (Thanks to Jaikiran Pai) > -- FIX: Have makepom task take description from ivy-module > info > > description element > (link:https://issues.apache.org/jira/browse/IVY-1520[IVY-1520]) > -- FIX: Fix RetrieveEngine to take into account the correct extension while > dealing with unpacked artifacts > (link:https://issues.apache.org/jira/browse/IVY-1478[IVY-1478]) (Thanks to > Jaikiran Pai) > -- FIX: ParseException "Unsupported repository, resources names are not uris" > for ivy.xml with parent on Windows > (link:https://issues.apache.org/jira/browse/IVY-1448[IVY-1448]) (Thanks to > Riccardo Foschia and Jaikiran Pai) > -- FIX: Ivy 2.4.0 improperly handles modules with colon (:) in version > (link:https://issues.apache.org/jira/browse/IVY-1522[IVY-1522]) (Thanks to > Jaikiran Pai) > -- FIX: Delay the
Re: Fw: [2/2] ant-ivy git commit: Merge remote-tracking branch 'origin/master'
I'm guessing that while committing the fix for IVY-1404 you probably did a "git merge" against latest master of upstream, which created this merge commit. -Jaikiran On 12/07/17 1:45 PM, Maarten Coene wrote: Any idea where this commit comes from?I didn't touch any of these files as far as I know... Maarten - Doorgestuurd bericht - Van: "maart...@apache.org" Aan: notificati...@ant.apache.org Verzonden: woensdag 12 juli 10:06 2017 Onderwerp: [2/2] ant-ivy git commit: Merge remote-tracking branch 'origin/master' Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/1a36ae09 Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/1a36ae09 Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/1a36ae09 Branch: refs/heads/master Commit: 1a36ae09d2848d687895532acf46531437721692 Parents: 585a702 dcaacf4 Author: Maarten Coene Authored: Wed Jul 12 10:05:54 2017 +0200 Committer: Maarten Coene Committed: Wed Jul 12 10:05:54 2017 +0200 -- .../xml/XmlModuleDescriptorParserTest.java | 56 .../hello/test-ivy-extends-absolute.xml| 25 + .../plugins/parser/xml/foo%2Fbar/parent-ivy.xml | 27 ++ 3 files changed, 108 insertions(+) -- - To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org For additional commands, e-mail: dev-h...@ant.apache.org
Re: AW: [VOTE] IvyDE requirements
+1 Maarten Van: Jan Matèrne (jhm) Aan: 'Ant Developers List' Verzonden: woensdag 12 juli 6:59 2017 Onderwerp: AW: [VOTE] IvyDE requirements summa summarum +2 ;-) Jan > -Ursprüngliche Nachricht- > Von: Gintautas Grigelionis [mailto:g.grigelio...@gmail.com] > Gesendet: Dienstag, 11. Juli 2017 23:24 > An: Ant Developers List > Betreff: Re: [VOTE] IvyDE requirements > > +1 on both (having suggested it previously). > > Gintas > > 2017-07-11 23:07 GMT+02:00 Nicolas Lalevée > : > > > We have recently voted to make Ivy require Java 1.7. I think we > should > > do it for IvyDE too. > > Do you vote for it ? > > > > > > And while making the build of IvyDE work again nicely, I had to > update > > its dependencies. Mainly, the build requires Eclipse 4.3, aka Eclipse > > Kepler (it is not the newest one as you can see [1]). So let’s make > it > > official that we require at least Eclipse 4.3. > > Do you vote for it ? > > > > > > Nicolas > > > > [1] https://en.wikipedia.org/wiki/Eclipse_(software)#Releases < > > https://en.wikipedia.org/wiki/Eclipse_(software)#Releases> > > > > - To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org For additional commands, e-mail: dev-h...@ant.apache.org
Fw: [2/2] ant-ivy git commit: Merge remote-tracking branch 'origin/master'
Any idea where this commit comes from?I didn't touch any of these files as far as I know... Maarten - Doorgestuurd bericht - Van: "maart...@apache.org" Aan: notificati...@ant.apache.org Verzonden: woensdag 12 juli 10:06 2017 Onderwerp: [2/2] ant-ivy git commit: Merge remote-tracking branch 'origin/master' Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/1a36ae09 Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/1a36ae09 Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/1a36ae09 Branch: refs/heads/master Commit: 1a36ae09d2848d687895532acf46531437721692 Parents: 585a702 dcaacf4 Author: Maarten Coene Authored: Wed Jul 12 10:05:54 2017 +0200 Committer: Maarten Coene Committed: Wed Jul 12 10:05:54 2017 +0200 -- .../xml/XmlModuleDescriptorParserTest.java | 56 .../hello/test-ivy-extends-absolute.xml | 25 + .../plugins/parser/xml/foo%2Fbar/parent-ivy.xml | 27 ++ 3 files changed, 108 insertions(+) --
