From 5bc940ca65beef9bb79aaa83f6e976685fbe0a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Laleve=CC=81e?= Date: Fri, 30 Jun 2017 16:39:39 +0200 Subject: [PATCH] use highlightjs to put colors on the xml snipsets --- asciidoc/ant.adoc | 10 +++++----- asciidoc/ivyfile.adoc | 4 ++-- asciidoc/ivyfile/artifact-exclude.adoc | 4 +--- asciidoc/ivyfile/artifact.adoc | 8 ++++---- asciidoc/ivyfile/conf.adoc | 2 +- asciidoc/ivyfile/configurations.adoc | 6 +++--- asciidoc/ivyfile/dependency-artifact.adoc | 8 ++++---- asciidoc/ivyfile/dependency-include.adoc | 2 +- asciidoc/ivyfile/dependency.adoc | 14 +++++++------- asciidoc/ivyfile/include.adoc | 4 ++-- asciidoc/templates/document.html.slim | 3 +++ asciidoc/use/artifactproperty.adoc | 4 ++-- asciidoc/use/artifactreport.adoc | 6 +++--- asciidoc/use/buildlist.adoc | 10 +++++----- asciidoc/use/buildnumber.adoc | 12 ++++++------ asciidoc/use/buildobr.adoc | 8 ++++---- asciidoc/use/cachepath.adoc | 6 +++--- asciidoc/use/checkdepsupdate.adoc | 4 ++-- asciidoc/use/cleancache.adoc | 6 +++--- asciidoc/use/configure.adoc | 8 ++++---- asciidoc/use/convertmanifest.adoc | 2 +- asciidoc/use/convertpom.adoc | 2 +- asciidoc/use/deliver.adoc | 2 +- asciidoc/use/dependencytree.adoc | 2 +- asciidoc/use/findrevision.adoc | 4 ++-- asciidoc/use/fixdeps.adoc | 4 ++-- asciidoc/use/info.adoc | 12 ++++++------ asciidoc/use/install.adoc | 2 +- asciidoc/use/listmodules.adoc | 6 +++--- asciidoc/use/makepom.adoc | 4 ++-- asciidoc/use/postresolvetask.adoc | 2 +- asciidoc/use/publish.adoc | 2 +- asciidoc/use/report.adoc | 8 ++++---- asciidoc/use/repreport.adoc | 12 ++++++------ asciidoc/use/resolve.adoc | 14 +++++++------- asciidoc/use/resources.adoc | 14 +++++++------- asciidoc/use/retrieve.adoc | 16 ++++++++-------- asciidoc/use/settings.adoc | 12 ++++++------ build-release.xml | 4 +++- 39 files changed, 128 insertions(+), 125 deletions(-) diff --git a/asciidoc/ant.adoc b/asciidoc/ant.adoc index c4243334..836ecc05 100644 --- a/asciidoc/ant.adoc +++ b/asciidoc/ant.adoc @@ -23,7 +23,7 @@ If you use ant version *1.6.0* or superior, you just have to add Ivy's namespace If you want to make your build handle ivy.jar in either ant lib dir or a local lib dir, you can use a taskdef like this: -[source] +[source,xml] ---- @@ -36,7 +36,7 @@ Combined with the antlib definition in the project namespace, it will load Ivy c If you use ant *1.5.1* or superior, you have to define the tasks you use in your build file. For instance: -[source] +[source,xml] ---- @@ -55,14 +55,14 @@ If you use an ant version lower than 1.5.1, you can not use the ivy tasks... you Once your build file is ok to call ivy tasks, the simplest way to use ivy is to call the ivy retrieve task with no parameters: -[source] +[source,xml] ---- ---- This calls ivy with default values, which might be ok in several projects. In fact, it is equivalent to: -[source] +[source,xml] ---- @@ -134,7 +134,7 @@ image::images/main-tasks.png[] Here is a more complete example of build file using Ivy: -[source] +[source,xml] ---- diff --git a/asciidoc/ivyfile.adoc b/asciidoc/ivyfile.adoc index ff413a8e..3a662c9d 100644 --- a/asciidoc/ivyfile.adoc +++ b/asciidoc/ivyfile.adoc @@ -21,7 +21,7 @@ Ivy use is entirely based on _module descriptors_ known as "ivy files". Ivy file Here is the simplest ivy file you can write: -[source] +[source,xml] ---- @@ -38,7 +38,7 @@ Before beginning the reference itself, it is required to have in mind the termin For those familiar with xml schema, the schema used to validate ivy files can be found link:http://ant.apache.org/ivy/schemas/ivy.xsd[here]. For those using xsd aware IDE, you can declare the xsd in your ivy files to benefit from code completion / validation: -[source] +[source,xml] ---- diff --git a/asciidoc/ivyfile/artifact-exclude.adoc b/asciidoc/ivyfile/artifact-exclude.adoc index daa33159..5f92493f 100644 --- a/asciidoc/ivyfile/artifact-exclude.adoc +++ b/asciidoc/ivyfile/artifact-exclude.adoc @@ -29,13 +29,11 @@ Note that exclusion is always done AFTER inclusion has been done. *__since 1.3__* This exclude feature can also be used not only to exclude artifacts but also to exclude whole modules. Indeed when you exclude artifacts, it doesn't avoid ivy to search for the module itself, and to resolve the dependencies of the module. But you can also exclude the whole module, which means that the module will not be downloaded at all, and so its own dependencies will not be resolved. For sure, this is usually done to exclude not a direct dependency but an indirect one. To exclude a whole module, you just have to not specify any artifact name, type and ext in your exclude rule. For instance: -[source] +[source,xml] ---- - - ---- *__since 2.0__* A link:../ivyfile/exclude.html[module wide exclude] can also be used to exclude dependencies for the whole module (and not only in the context of one dependency as it is the case here). diff --git a/asciidoc/ivyfile/artifact.adoc b/asciidoc/ivyfile/artifact.adoc index 891aa55e..59ca2b32 100644 --- a/asciidoc/ivyfile/artifact.adoc +++ b/asciidoc/ivyfile/artifact.adoc @@ -31,7 +31,7 @@ The configurations in which an artifact is published can be configured in two wa The two are equivalent, it is only a matter of preference. However, do not mix both for one artifact. *__since 1.4__* The artifact element has default values for all its attributes, so if you want to declare a default artifact you can just declare it like that: -[source] +[source,xml] ---- @@ -76,7 +76,7 @@ If this is the only artifact declared, then it's equivalent to having no publica == Examples -[source] +[source,xml] ---- @@ -89,7 +89,7 @@ Declares an artifact with the name of the module as name, type and ext jar, and ''' -[source] +[source,xml] ---- @@ -102,7 +102,7 @@ Declares an artifact foo-src, of type 'source' with extension 'zip', and publish ''' -[source] +[source,xml] ---- diff --git a/asciidoc/ivyfile/conf.adoc b/asciidoc/ivyfile/conf.adoc index fe74d632..34540dfd 100644 --- a/asciidoc/ivyfile/conf.adoc +++ b/asciidoc/ivyfile/conf.adoc @@ -67,7 +67,7 @@ This is very useful to build a compile configuration, for instance, forcing the == Examples -[source] +[source,xml] ---- diff --git a/asciidoc/ivyfile/configurations.adoc b/asciidoc/ivyfile/configurations.adoc index 52a51b0e..0eba2fbb 100644 --- a/asciidoc/ivyfile/configurations.adoc +++ b/asciidoc/ivyfile/configurations.adoc @@ -66,7 +66,7 @@ See link:#defaultconfmapping[examples below] to clarify the behavior of these tw When Ivy parses your Ivy file, it will create (internally) modify the configuration mapping of your dependencies. For instance, say you have: -[source] +[source,xml] ---- @@ -81,7 +81,7 @@ For instance, say you have: When Ivy parses this file, it will construct the following dependency (in-memory only): -[source] +[source,xml] ---- ---- @@ -90,7 +90,7 @@ So, if you now resolve the conf2 configuration, you will only get the other1 dep But when you set confmappingoverride to true, Ivy will construct the following dependency in memory: -[source] +[source,xml] ---- ---- diff --git a/asciidoc/ivyfile/dependency-artifact.adoc b/asciidoc/ivyfile/dependency-artifact.adoc index 450c7cff..7a55144b 100644 --- a/asciidoc/ivyfile/dependency-artifact.adoc +++ b/asciidoc/ivyfile/dependency-artifact.adoc @@ -30,7 +30,7 @@ For instance, imagine you have A, B & C master configurations. If you specify ar Example: -[source] +[source,xml] ---- @@ -75,7 +75,7 @@ Example: == Examples -[source] +[source,xml] ---- @@ -90,7 +90,7 @@ Declares a dependency on module bar which only publish one artifact: baz.jar. ''' -[source] +[source,xml] ---- @@ -105,7 +105,7 @@ Same as above, except that if the artifact is not found at its standard location ''' -[source] +[source,xml] ---- diff --git a/asciidoc/ivyfile/dependency-include.adoc b/asciidoc/ivyfile/dependency-include.adoc index a7402793..6e23aa46 100644 --- a/asciidoc/ivyfile/dependency-include.adoc +++ b/asciidoc/ivyfile/dependency-include.adoc @@ -28,7 +28,7 @@ For instance, imagine you have A, B & C master configurations. If you restrict t Example: -[source] +[source,xml] ---- diff --git a/asciidoc/ivyfile/dependency.adoc b/asciidoc/ivyfile/dependency.adoc index eea96a5b..3378daae 100644 --- a/asciidoc/ivyfile/dependency.adoc +++ b/asciidoc/ivyfile/dependency.adoc @@ -180,7 +180,7 @@ where _att_ is the name of the attribute shared by the configurations of the gro For instance, if you have: -[source] +[source,xml] ---- @@ -195,7 +195,7 @@ For instance, if you have: Then you can do: -[source] +[source,xml] ---- @@ -299,7 +299,7 @@ See link:../ivyfile/conflicts.html[conflicts manager] for details. == Examples -[source] +[source,xml] ---- @@ -311,7 +311,7 @@ Declares a dependency on the module swtbinding from jayasoft in its revision 0.2 ''' -[source] +[source,xml] ---- @@ -323,7 +323,7 @@ Same as above except that it will take the latest revision on the branch 'fix-10 ''' -[source] +[source,xml] ---- @@ -341,7 +341,7 @@ from the same organisation as the module in which the dependency is declared. Th ''' -[source] +[source,xml] ---- @@ -395,7 +395,7 @@ from foo, in revision 3.0. The dependencies of bar will themselves not be includ ''' -[source] +[source,xml] ---- diff --git a/asciidoc/ivyfile/include.adoc b/asciidoc/ivyfile/include.adoc index 1c9f5058..3ed13a2a 100644 --- a/asciidoc/ivyfile/include.adoc +++ b/asciidoc/ivyfile/include.adoc @@ -41,7 +41,7 @@ When delivering an ivy file with such an inclusion, the included configuration f == Examples -[source] +[source,xml] ---- @@ -62,7 +62,7 @@ When delivering an ivy file with such an inclusion, the included configuration f with included-configurations.xml like this: -[source] +[source,xml] ---- diff --git a/asciidoc/templates/document.html.slim b/asciidoc/templates/document.html.slim index f85af804..5a8bd92f 100644 --- a/asciidoc/templates/document.html.slim +++ b/asciidoc/templates/document.html.slim @@ -25,8 +25,11 @@ html lang=(attr :lang, 'en' unless attr? :nolang) link rel="stylesheet" type="text/css" href="#{page.relativeRoot}style/style.css" script src="#{page.relativeRoot}js/jquery.pack.js" type="text/javascript" script src="#{page.relativeRoot}js/jquery.treeview.js" type="text/javascript" + link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" + script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript" javascript: $(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});}); + hljs.initHighlightingOnLoad(); body div id="body" table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%" diff --git a/asciidoc/use/artifactproperty.adoc b/asciidoc/use/artifactproperty.adoc index 19ab13c1..a962f826 100644 --- a/asciidoc/use/artifactproperty.adoc +++ b/asciidoc/use/artifactproperty.adoc @@ -49,7 +49,7 @@ _WARNING_: Before 2.0, the behavior was to overwrite the properties. Since 2.0, Suppose we have one dependency called `mydep` in revision 1.0 publishing two artifacts: `foo.jar` and `bar.jar`. Then: -[source] +[source,xml] ---- @@ -74,14 +74,14 @@ Here is an example of generate file: == Examples -[source] +[source,xml] ---- ---- Generates the artifact report for all configurations resolved during the last resolve call (in the same build). -[source] +[source,xml] ---- ---- diff --git a/asciidoc/use/buildlist.adoc b/asciidoc/use/buildlist.adoc index 8d55ab55..54a40556 100644 --- a/asciidoc/use/buildlist.adoc +++ b/asciidoc/use/buildlist.adoc @@ -82,7 +82,7 @@ FileSets are used to select sets of files to order. == Examples -[source] +[source,xml] ---- @@ -93,14 +93,14 @@ Builds a list of `build.xml` files sorted according to the `ivy.xml` files found This list can then be used like that: -[source] +[source,xml] ---- ---- ''' -[source] +[source,xml] ---- @@ -111,7 +111,7 @@ Builds a list of `build.xml` files sorted according to the `ivy.xml` files found ''' -[source] +[source,xml] ---- @@ -122,7 +122,7 @@ Builds a list of `build.xml` files sorted according to the `ivy.xml` files found ''' -[source] +[source,xml] ---- diff --git a/asciidoc/use/buildnumber.adoc b/asciidoc/use/buildnumber.adoc index cb53e938..52704708 100644 --- a/asciidoc/use/buildnumber.adoc +++ b/asciidoc/use/buildnumber.adoc @@ -73,7 +73,7 @@ Note that when asking for revision 1, you can get a revision 10.0. To avoid that Here is how it can be used (suppose 1.3.1 is the latest version of ivy in the repository): -[source] +[source,xml] ---- ---- @@ -82,7 +82,7 @@ will set 1.3.1 as revision, 1.3.2 as new revision, 1 as build number and 2 as ne ''' -[source] +[source,xml] ---- ---- @@ -91,7 +91,7 @@ will set 1.3.1 as revision, 1.3.2 as new revision, 1 as build number and 2 as ne ''' -[source] +[source,xml] ---- ---- @@ -100,7 +100,7 @@ will set 1.2 as revision, 1.2.1 as new revision, no build number and 1 as new bu ''' -[source] +[source,xml] ---- ---- @@ -109,7 +109,7 @@ will set 1.3.1 as revision, 1.4 as new revision, 3 as build number and 4 as new ''' -[source] +[source,xml] ---- ---- @@ -118,7 +118,7 @@ will set no revision, 3.0 as new revision, no build number and 0 as new build nu ''' -[source] +[source,xml] ---- ---- diff --git a/asciidoc/use/buildobr.adoc b/asciidoc/use/buildobr.adoc index b8ddc94f..ce746a06 100644 --- a/asciidoc/use/buildobr.adoc +++ b/asciidoc/use/buildobr.adoc @@ -47,7 +47,7 @@ NB: among every listed files or artifacts, only the actually OSGi bundles will b == Examples -[source] +[source,xml] ---- ---- @@ -56,7 +56,7 @@ Builds an indented OBR descriptor from an Eclipse install, with their path relat ''' -[source] +[source,xml] ---- @@ -66,7 +66,7 @@ Configure an Ivy settings and builds an OBR descriptor from jars resolved by the ''' -[source] +[source,xml] ---- @@ -76,7 +76,7 @@ Configure an Ivy settings and builds an OBR descriptor from jars contained in th ''' -[source] +[source,xml] ---- diff --git a/asciidoc/use/cachepath.adoc b/asciidoc/use/cachepath.adoc index 8ed8e9cf..99039937 100644 --- a/asciidoc/use/cachepath.adoc +++ b/asciidoc/use/cachepath.adoc @@ -38,7 +38,7 @@ Built path is registered in ant with a given id, and can thus be used like any o == Examples -[source] +[source,xml] ---- ---- @@ -47,7 +47,7 @@ Construct an Ant path composed of all artifacts being part of the default config ''' -[source] +[source,xml] ---- ---- @@ -56,7 +56,7 @@ Same as before but will use the original location for local artifacts, and the c ''' -[source] +[source,xml] ---- diff --git a/asciidoc/use/checkdepsupdate.adoc b/asciidoc/use/checkdepsupdate.adoc index 1ed6ce77..f418fab1 100644 --- a/asciidoc/use/checkdepsupdate.adoc +++ b/asciidoc/use/checkdepsupdate.adoc @@ -41,7 +41,7 @@ __mydep__ has a transitive dependency on __mytransitivedependency__ in revision Then: -[source] +[source,xml] ---- ---- @@ -57,7 +57,7 @@ Dependencies updates available : Same example with transitive dependencies : -[source] +[source,xml] ---- ---- diff --git a/asciidoc/use/cleancache.adoc b/asciidoc/use/cleancache.adoc index e4a05907..cca9fdba 100644 --- a/asciidoc/use/cleancache.adoc +++ b/asciidoc/use/cleancache.adoc @@ -22,7 +22,7 @@ Cleans the Ivy cache. This task is roughly equivalent to: -[source] +[source,xml] ---- ---- @@ -41,14 +41,14 @@ This task loads the Ivy settings as any other post settings task, and allows eas == Examples -[source] +[source,xml] ---- ---- Cleans the cache directory as defined in the loaded settings (by default `~/.ivy2/cache`) -[source] +[source,xml] ---- ---- diff --git a/asciidoc/use/configure.adoc b/asciidoc/use/configure.adoc index 7b19738e..1413ac50 100644 --- a/asciidoc/use/configure.adoc +++ b/asciidoc/use/configure.adoc @@ -56,7 +56,7 @@ It's also possible to configure authentication settings for multiple urls. This === Simplest settings -[source] +[source,xml] ---- ---- @@ -65,21 +65,21 @@ Use either `${ivy.settings.file}` if it exists, or the link:../samples/ivysettin === Configure with a file -[source] +[source,xml] ---- ---- === Configure with an url -[source] +[source,xml] ---- ---- === Configure multiple URLs which require autentication -[source] +[source,xml] ---- diff --git a/asciidoc/use/convertmanifest.adoc b/asciidoc/use/convertmanifest.adoc index 6bd6dd7c..29d8a279 100644 --- a/asciidoc/use/convertmanifest.adoc +++ b/asciidoc/use/convertmanifest.adoc @@ -30,7 +30,7 @@ == Examples -[source] +[source,xml] ---- ---- diff --git a/asciidoc/use/convertpom.adoc b/asciidoc/use/convertpom.adoc index 8f7e3cc6..52043179 100644 --- a/asciidoc/use/convertpom.adoc +++ b/asciidoc/use/convertpom.adoc @@ -30,7 +30,7 @@ == Examples -[source] +[source,xml] ---- ---- diff --git a/asciidoc/use/deliver.adoc b/asciidoc/use/deliver.adoc index 579f405b..6bb38c1a 100644 --- a/asciidoc/use/deliver.adoc +++ b/asciidoc/use/deliver.adoc @@ -94,7 +94,7 @@ It can also be useful if you want to trigger a recursive delivery and then ensur Deliver an ivy file without the private configurations: -[source] +[source,xml] ---- ---- diff --git a/asciidoc/use/dependencytree.adoc b/asciidoc/use/dependencytree.adoc index 75e039e4..99493d3a 100644 --- a/asciidoc/use/dependencytree.adoc +++ b/asciidoc/use/dependencytree.adoc @@ -43,7 +43,7 @@ __mydep__ has a transitive dependency on __mytransitivedependency__ in revision Then: -[source] +[source,xml] ---- ---- diff --git a/asciidoc/use/findrevision.adoc b/asciidoc/use/findrevision.adoc index 1bcca9fd..2ff3e49e 100644 --- a/asciidoc/use/findrevision.adoc +++ b/asciidoc/use/findrevision.adoc @@ -38,7 +38,7 @@ If the module is not found the property is not set. == Examples -[source] +[source,xml] ---- ---- @@ -47,7 +47,7 @@ finds the latest version of ivy available in the repository and sets the propert ''' -[source] +[source,xml] ---- ---- diff --git a/asciidoc/use/fixdeps.adoc b/asciidoc/use/fixdeps.adoc index 3f7ca7a5..51c553a8 100644 --- a/asciidoc/use/fixdeps.adoc +++ b/asciidoc/use/fixdeps.adoc @@ -56,7 +56,7 @@ These elements takes two attributes: + == Examples -[source] +[source,xml] ---- ---- @@ -65,7 +65,7 @@ Simple fix of some dependencies. ''' -[source] +[source,xml] ---- diff --git a/asciidoc/use/info.adoc b/asciidoc/use/info.adoc index 1cf7785a..385c1e5a 100644 --- a/asciidoc/use/info.adoc +++ b/asciidoc/use/info.adoc @@ -78,7 +78,7 @@ Yes, if you are retrieving information about a module from an ivy repository. Given this `ivy.xml` file: -[source] +[source,xml] ---- ---- -[source] +[source,xml] ---- ---- Parses `+++${basedir}/path/to/ivy.xml+++` and set properties as described above accordingly: -[source] +[source,properties] ---- ivy.organisation=apache ivy.module=info-all @@ -134,21 +134,21 @@ ivy.artifact.2.extra.data=client Given the same ivy module in a repository: -[source] +[source,xml] ---- ---- will set the exact same set of properties as above. Using: -[source] +[source,xml] ---- ---- will set: -[source] +[source,properties] ---- infotest.organisation=apache infotest.module=info-all diff --git a/asciidoc/use/install.adoc b/asciidoc/use/install.adoc index 8d9330d8..d8fbf690 100644 --- a/asciidoc/use/install.adoc +++ b/asciidoc/use/install.adoc @@ -49,7 +49,7 @@ For more details about this task and its usage see the link:../tutorial/build-re == Examples -[source] +[source,xml] ---- ---- diff --git a/asciidoc/use/listmodules.adoc b/asciidoc/use/listmodules.adoc index 659059cb..a94e824b 100644 --- a/asciidoc/use/listmodules.adoc +++ b/asciidoc/use/listmodules.adoc @@ -42,7 +42,7 @@ To know if a module matches the criteria ivy will use the configured link:../con == Examples -[source] +[source,xml] ---- ---- @@ -51,7 +51,7 @@ will find all revisions of the module ivy in the org apache, and create one prop ''' -[source] +[source,xml] ---- ---- @@ -59,7 +59,7 @@ will find all revisions of the module ivy in the org apache, and create one prop use the glob matcher to find all modules which name starts with ivy with revision 1.0, and sets for each a property with module name found and organisation for value. Example: -[source] +[source,properties] ---- modules.ivy=apache modules.ivyde=apache diff --git a/asciidoc/use/makepom.adoc b/asciidoc/use/makepom.adoc index 9991b7b2..1a03e379 100644 --- a/asciidoc/use/makepom.adoc +++ b/asciidoc/use/makepom.adoc @@ -47,7 +47,7 @@ Note that each property can be given a value manually in the Ant build file. In The default template that ships with Ivy looks like this: -[source] +[source,xml] ---- ${ivy.pom.license} ${ivy.pom.header} @@ -104,7 +104,7 @@ These elements takes the following attributes: + == Examples -[source] +[source,xml] ---- diff --git a/asciidoc/use/postresolvetask.adoc b/asciidoc/use/postresolvetask.adoc index d8001d90..232b9696 100644 --- a/asciidoc/use/postresolvetask.adoc +++ b/asciidoc/use/postresolvetask.adoc @@ -88,7 +88,7 @@ There is one important difference with the ivy.xml's link:../ivyfile/dependencie == Examples -[source] +[source,xml] ---- diff --git a/asciidoc/use/publish.adoc b/asciidoc/use/publish.adoc index d9ceb3ad..61f27dc8 100644 --- a/asciidoc/use/publish.adoc +++ b/asciidoc/use/publish.adoc @@ -72,7 +72,7 @@ The source artifact pattern can be specified either as an attribute on the task == Examples -[source] +[source,xml] ---- diff --git a/asciidoc/use/report.adoc b/asciidoc/use/report.adoc index 24edd053..fe16ee6e 100644 --- a/asciidoc/use/report.adoc +++ b/asciidoc/use/report.adoc @@ -52,7 +52,7 @@ Then following a few link:../yed.html[simple steps] you can obtain a graph like To generate a HTML and graphml report: -[source] +[source,xml] ---- ---- @@ -61,7 +61,7 @@ To generate a HTML and graphml report: To generate a HTML report only: -[source] +[source,xml] ---- ---- @@ -70,14 +70,14 @@ To generate a HTML report only: To generate an XML report using a custom stylesheet: -[source] +[source,xml] ---- ---- To generate an XML report using a custom stylesheet which needs some parameters: -[source] +[source,xml] ---- diff --git a/asciidoc/use/repreport.adoc b/asciidoc/use/repreport.adoc index 6cbd2ae6..b29e43a4 100644 --- a/asciidoc/use/repreport.adoc +++ b/asciidoc/use/repreport.adoc @@ -54,7 +54,7 @@ Moreover, to be able to list organizations, this task requires an [organisation] To generate a xml report for all the latest versions of all the modules in your repository: -[source] +[source,xml] ---- ---- @@ -63,7 +63,7 @@ To generate a xml report for all the latest versions of all the modules in your To generate a graphml report for all the latest versions of all the modules in your repository: -[source] +[source,xml] ---- ---- @@ -72,7 +72,7 @@ To generate a graphml report for all the latest versions of all the modules in y To generate a xml report for all the latest versions of the modules from the organisation foo in your repository: -[source] +[source,xml] ---- ---- @@ -81,7 +81,7 @@ To generate a xml report for all the latest versions of the modules from the org To generate a xml report for all the versions on the 1.x stream of the modules named bar* from the organisation foo in your repository: -[source] +[source,xml] ---- ---- @@ -90,7 +90,7 @@ To generate a xml report for all the versions on the 1.x stream of the modules n To generate an XML report using a custom stylesheet: -[source] +[source,xml] ---- ---- @@ -99,7 +99,7 @@ To generate an XML report using a custom stylesheet: To generate an XML report using a custom stylesheet which needs some parameters: -[source] +[source,xml] ---- diff --git a/asciidoc/use/resolve.adoc b/asciidoc/use/resolve.adoc index d9bf0ff1..4e3d9f3f 100644 --- a/asciidoc/use/resolve.adoc +++ b/asciidoc/use/resolve.adoc @@ -153,7 +153,7 @@ There is one important difference with the ivy.xml's link:../ivyfile/dependencie == Examples -[source] +[source,xml] ---- ---- @@ -162,7 +162,7 @@ Resolve all dependencies declared in path/to/ivy.xml file. ''' -[source] +[source,xml] ---- ---- @@ -171,7 +171,7 @@ Same as above, but with transitive dependencies disabled. ''' -[source] +[source,xml] ---- ---- @@ -180,7 +180,7 @@ Resolve the dependencies declared in the configuration `default` and `test` of t ''' -[source] +[source,xml] ---- ---- @@ -189,7 +189,7 @@ Resolve all dependencies declared in `path/to/ivy.xml` file, but download only ` ''' -[source] +[source,xml] ---- ---- @@ -198,7 +198,7 @@ Resolve the `commons-lang` module revision 2+ from the repository, with its depe ''' -[source] +[source,xml] ---- @@ -211,7 +211,7 @@ Resolve of both `commons-lang` and `commons-logging`, with their dependencies bu ''' -[source] +[source,xml] ---- diff --git a/asciidoc/use/resources.adoc b/asciidoc/use/resources.adoc index 657cb578..96fc53b4 100644 --- a/asciidoc/use/resources.adoc +++ b/asciidoc/use/resources.adoc @@ -24,7 +24,7 @@ This datatype share the same attributes, child elements and behaviour of a link: == Examples -[source] +[source,xml] ---- ---- @@ -33,7 +33,7 @@ Build a resource collection of every artifacts of all dependencies declared in ` ''' -[source] +[source,xml] ---- ---- @@ -42,7 +42,7 @@ Same as above, but with transitive dependencies disabled. ''' -[source] +[source,xml] ---- ---- @@ -51,7 +51,7 @@ Build a resource collection of every artifacts of the dependencies declared in t ''' -[source] +[source,xml] ---- ---- @@ -60,7 +60,7 @@ Build a resource collection of every `jar` artifact of all dependencies declared ''' -[source] +[source,xml] ---- ---- @@ -69,7 +69,7 @@ Build a resource collection of every artifacts of `commons-lang` module revision ''' -[source] +[source,xml] ---- @@ -82,7 +82,7 @@ Build a resource collection of every artifacts of both `commons-lang` and `commo ''' -[source] +[source,xml] ---- diff --git a/asciidoc/use/retrieve.adoc b/asciidoc/use/retrieve.adoc index b873aa85..024c7fec 100644 --- a/asciidoc/use/retrieve.adoc +++ b/asciidoc/use/retrieve.adoc @@ -71,7 +71,7 @@ Available options are the same as for link:../use/resolve.html[resolve] when use == Examples -[source] +[source,xml] ---- ---- @@ -80,7 +80,7 @@ Retrieves dependencies using default parameters. This usually retrieves all the ''' -[source] +[source,xml] ---- ---- @@ -102,7 +102,7 @@ Note that if a dependency is required in the two configurations, it will be copi ''' -[source] +[source,xml] ---- ---- @@ -136,7 +136,7 @@ With no synchronisation, commons-logging would not have been removed by the call ''' -[source] +[source,xml] ---- ---- @@ -157,7 +157,7 @@ lib ''' -[source] +[source,xml] ---- ---- @@ -174,7 +174,7 @@ lib junit-4.1.zip ---- -[source] +[source,xml] ---- ---- @@ -194,7 +194,7 @@ lib ''' -[source] +[source,xml] ---- ---- @@ -203,7 +203,7 @@ Resolves and retrieve the latest version of the module bar and its dependencies ''' -[source] +[source,xml] ---- diff --git a/asciidoc/use/settings.adoc b/asciidoc/use/settings.adoc index 10cf9856..b358d4c5 100644 --- a/asciidoc/use/settings.adoc +++ b/asciidoc/use/settings.adoc @@ -30,7 +30,7 @@ All Ivy variables set during the settings are available in the Ant project as lo Moreover, the variables are exposed under two names: the variable name, and the variable name suffixed by dot + the settings id. For instance, if you load a settings with the id `myid`, and define a variable `my.variable=my.value` in the Ivy settings, both `my.variable` and `my.variable.myid` will now be available as properties in Ant and equal to `my.value`. If you later load another settings with the id `yourid`, and in this settings assign the variable `my.variable` the value `your.value`, in the Ant project you will have: -[source] +[source,properties] ---- my.variable=my.value my.variable.myid=my.value @@ -67,7 +67,7 @@ A special attention should be applied when you have a multi-project build with ` === Simplest settings -[source] +[source,xml] ---- ---- @@ -78,21 +78,21 @@ This simplest setting is implicit. === Configure with a file -[source] +[source,xml] ---- ---- === Configure with an url -[source] +[source,xml] ---- ---- === Configure multiple realms which require autentication -[source] +[source,xml] ---- @@ -104,7 +104,7 @@ This simplest setting is implicit. You can use multiple ivy settings during a build. Then every ivy task should specify the settings it uses using the `settingsRef` attribute. -[source] +[source,xml] ---- diff --git a/build-release.xml b/build-release.xml index baf8f3f8..4b138d36 100644 --- a/build-release.xml +++ b/build-release.xml @@ -168,7 +168,9 @@ - +