ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gin...@apache.org
Subject [1/2] ant-ivyde git commit: Update Ivy version, sync checkstyle and tagsdoc
Date Mon, 30 Oct 2017 22:18:15 GMT
Repository: ant-ivyde
Updated Branches:
  refs/heads/master 0719b48ba -> 8d21ed209


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/8d21ed20/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/tagsdoc.properties
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/tagsdoc.properties b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/tagsdoc.properties
index cfc249b..77ff64f 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/tagsdoc.properties
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/tagsdoc.properties
@@ -16,110 +16,146 @@
 #	 * specific language governing permissions and limitations
 #	 * under the License.
 #	 ***************************************************************
-# This file is built using the generate-tagsdoc target of the ivy-site build.xml
+# This file is built using the tagsdoc target of the ivy build-release.xml
 
+##### ivysettings.resolvers.bintray
+ivysettings.resolvers.bintray = This resolver uses Bintray DaaS (Distribution as a Service) platform to retrieve artifacts.
+ivysettings.resolvers.bintray.@subject = Bintray username of a repository owner.
+ivysettings.resolvers.bintray.@repo = User’s repository name.
 ##### ivysettings.resolvers.chain
 ivysettings.resolvers.chain = This resolver is only a container of a chain of other resolvers.
 ivysettings.resolvers.chain.@returnFirst = true if the first found should be returned.
-ivysettings.resolvers.chain.@dual = true if the chain should behave like a dual chain. since 1.3
+ivysettings.resolvers.chain.@dual = true if the chain should behave like a dual chain. (since 1.3)
 ##### ivysettings.resolvers.dual
-ivysettings.resolvers.dual = This resolver delegates its job to one resolver for ivy files and another for artifacts.
-ivysettings.resolvers.dual.@allownomd = true if the absence of module descriptor (usually an ivy file) is authorised for this resolver, false to refuse modules without module descriptor since 1.4
+ivysettings.resolvers.dual = This resolver delegates its job to one resolver for Ivy files and another for artifacts.
 ##### ivysettings.resolvers.filesystem
-ivysettings.resolvers.filesystem = This resolver uses the file system to resolve ivy files and artifacts.
-ivysettings.resolvers.filesystem.@m2compatible = True if this resolver should be maven2 compatible, false otherwise since 1.3
-ivysettings.resolvers.filesystem.@local = True if this resolver should be considered local, false otherwise since 1.4. See useOrigin attribute on the caches element for details.
-ivysettings.resolvers.filesystem.@transactional = true to force the use of transaction, false to prevent the use of transaction, auto to get transaction when possible since 2.0. See above for details.
+ivysettings.resolvers.filesystem = This resolver uses the file system to resolve Ivy files and artifacts.
+ivysettings.resolvers.filesystem.@m2compatible = True if this resolver should be Maven 2 compatible, false otherwise (since 1.3)
+ivysettings.resolvers.filesystem.@local = True if this resolver should be considered local, false otherwise (since 1.4). See useOrigin attribute on the caches element for details.
+ivysettings.resolvers.filesystem.@transactional = true to force the use of transaction, false to prevent the use of transaction, auto to get transaction when possible (since 2.0). See above for details.
 ##### ivysettings.resolvers.ibiblio
 ivysettings.resolvers.ibiblio = This resolver usually uses ibiblio to find artifacts.
-ivysettings.resolvers.ibiblio.@root = the root of the artifacts repository.
-ivysettings.resolvers.ibiblio.@pattern = a pattern describing the layout of the artifacts repository.
-ivysettings.resolvers.ibiblio.@m2compatible = True if this resolver should be maven2 compatible, false otherwise since 1.3
-ivysettings.resolvers.ibiblio.@usepoms = True if this resolver should use maven poms when it is already in m2compatible mode, false otherwise since 1.4
-ivysettings.resolvers.ibiblio.@useMavenMetadata = True if this resolver should use maven-metadata.xml files to list available revisions, false to use directory listing since 2.0
+ivysettings.resolvers.ibiblio.@root = the root of the artifact repository.
+ivysettings.resolvers.ibiblio.@pattern = a pattern describing the layout of the artifact repository.
+ivysettings.resolvers.ibiblio.@m2compatible = True if this resolver should be Maven 2 compatible, false otherwise (since 1.3)
+ivysettings.resolvers.ibiblio.@usepoms = True if this resolver should use Maven POMs when it is already in m2compatible mode, false otherwise (since 1.4)
+ivysettings.resolvers.ibiblio.@useMavenMetadata = True if this resolver should use maven-metadata.xml files to list available revisions, false to use directory listing (since 2.0)
 ##### ivysettings.resolvers.ivyrep
-ivysettings.resolvers.ivyrep = This resolver usually uses an URL based repository usually similar in structure to ivyrep to find ivy files, and ibiblio to find artifacts.
-ivysettings.resolvers.ivyrep.@ivyroot = the root of the ivy repository.
-ivysettings.resolvers.ivyrep.@ivypattern = a pattern describing the layout of the ivy repository.
+ivysettings.resolvers.ivyrep = This resolver usually uses an URL based repository usually similar in structure to the, now defunct, http://ivyrep.jayasoft.org/ repo, to find Ivy files, and ibiblio to find artifacts.
+ivysettings.resolvers.ivyrep.@ivyroot = the root of the Ivy repository.
+ivysettings.resolvers.ivyrep.@ivypattern = a pattern describing the layout of the Ivy repository.
 ivysettings.resolvers.ivyrep.@artroot = the root of the artifacts repository.
 ivysettings.resolvers.ivyrep.@artpattern = a pattern describing the layout of the artifacts repository.
+##### ivysettings.resolvers.jar
+ivysettings.resolvers.jar = This resolver uses a specified jar resolve Ivy files and artifacts.
+ivysettings.resolvers.jar.@file = the absolute path of the jar
+ivysettings.resolvers.jar.@url = the URL of the jar
+##### ivysettings.resolvers.mirroredurl
+ivysettings.resolvers.mirroredurl = This resolver can resolve dependencies against several mirrors of the same repository.
+ivysettings.resolvers.mirroredurl.@m2compatible = True if this resolver should be Maven 2 compatible, false otherwise
+ivysettings.resolvers.mirroredurl.@mirrorListUrl = The URL where to retrieve the list of mirror URLs.
+##### ivysettings.resolvers.obr
+ivysettings.resolvers.obr = This resolver is one of the resolver which supports OSGi dependencies.
+ivysettings.resolvers.obr.@repoXmlURL = the URL of the obr.xml to load.
+ivysettings.resolvers.obr.@repoXmlFile = the local path of the obr.xml to load.
+ivysettings.resolvers.obr.@requirementStrategy = defines how strict should be the OSGi resolution. Can be one of first or noambiguity
+ivysettings.resolvers.obr.@metadataTtl = the time in milliseconds the obr.xml is considered up to date
+ivysettings.resolvers.obr.@forceMetadataUpdate = force the update of the obr.xml without checking its freshness
+##### ivysettings.resolvers.osgi-agg
+ivysettings.resolvers.osgi-agg = This resolver is like a classic chain resolver, but with better support for OSGi metadata.
 ##### ivysettings.resolvers.packager
-ivysettings.resolvers.packager = This resolver accesses ivy files and "packaging instructions" from an online "packager" repository.
+ivysettings.resolvers.packager = This resolver accesses Ivy files and "packaging instructions" from an online "packager" repository.
 ivysettings.resolvers.packager.@buildRoot = Defines the root of the temporary build directory hierarchy
 ivysettings.resolvers.packager.@resourceCache = Directory where downloaded resources should be cached
 ivysettings.resolvers.packager.@resourceURL = Ivy pattern that specifies a base URL to use for downloading all resources; overrides the URLs in the packaging instructions
-ivysettings.resolvers.packager.@verbose = True to run ant with the -verbose flag
-ivysettings.resolvers.packager.@quiet = True to run ant with the -quiet flag
+ivysettings.resolvers.packager.@restricted = True if this resolver should only allow "safe" Ant tasks in the packaging instructions. Warning: setting restricted to false creates a security problem due to Ant tasks like delete, exec, etc. Do not use this setting when your configuration points to an untrusted repository.
+ivysettings.resolvers.packager.@verbose = True to run Ant with the -verbose flag
+ivysettings.resolvers.packager.@quiet = True to run Ant with the -quiet flag
 ivysettings.resolvers.packager.@validate = True if this resolver should validate (via XSD) the downloaded XML packaging instructions
-ivysettings.resolvers.packager.@preserveBuildDirectories = True if this resolver should not delete the temporary build directories in which the ant tasks are executed (for debugging purposes)
+ivysettings.resolvers.packager.@preserveBuildDirectories = True if this resolver should not delete the temporary build directories in which the Ant tasks are executed (for debugging purposes)
 ##### ivysettings.resolvers.sftp
-ivysettings.resolvers.sftp = This resolver can be used when your ivy repository is located on a server accessible via sftp.
+ivysettings.resolvers.sftp = This resolver can be used when your Ivy repository is located on a server accessible via SFTP.
 ivysettings.resolvers.sftp.@user = The username to provide as credential
 ivysettings.resolvers.sftp.@userPassword = The password to provide as credential
 ivysettings.resolvers.sftp.@keyFile = Path to the keyfile to use for authentication
 ivysettings.resolvers.sftp.@keyFilePassword = the password used to protect the key file
 ivysettings.resolvers.sftp.@host = The host to connect to
 ivysettings.resolvers.sftp.@port = The port to connect to
+ivysettings.resolvers.sftp.@sshConfig = Path to an OpenSSH-style config file containing additional configuration
 ##### ivysettings.resolvers.ssh
-ivysettings.resolvers.ssh = This resolver can be used when your ivy repository is located on a server accessible via ssh.
+ivysettings.resolvers.ssh = This resolver can be used when your Ivy repository is located on a server accessible via SSH.
 ivysettings.resolvers.ssh.@user = The username to provide as credential
 ivysettings.resolvers.ssh.@userPassword = The password to provide as credential
 ivysettings.resolvers.ssh.@keyFile = Path to the keyfile to use for authentication
 ivysettings.resolvers.ssh.@keyFilePassword = the password used to protect the key file
 ivysettings.resolvers.ssh.@host = The host to connect to
 ivysettings.resolvers.ssh.@port = The port to connect to
+ivysettings.resolvers.ssh.@sshConfig = Path to an OpenSSH-style config file containing additional configuration
 ivysettings.resolvers.ssh.@publishPermissions = A four digit string (e.g., 0644, see "man chmod", "man open") specifying the permissions of the published files. (since 2.0)
-
+##### ivysettings.resolvers.updatesite
+ivysettings.resolvers.updatesite = This resolver is one of the resolvers which support OSGi dependencies. It resolves modules (OSGi bundles) which are hosted in an Eclipse update site.
+ivysettings.resolvers.updatesite.@url = the URL of the Eclipse updatesite
+ivysettings.resolvers.updatesite.@requirementStrategy = defines how strict should be the OSGi resolution. Can be one of first or noambiguity
+ivysettings.resolvers.updatesite.@metadataTtl = the time in milliseconds the updatesite metadata are considered up to date
+ivysettings.resolvers.updatesite.@forceMetadataUpdate = force the update of the updatesite metadata without checking their freshness
 ##### ivysettings.resolvers.url
-ivysettings.resolvers.url = This resolver is one of the most generic, in fact most of the previous resolvers can be obtained by a particular configuration of this one.
-ivysettings.resolvers.url.@m2compatible = True if this resolver should be maven2 compatible, false otherwise since 1.3
+ivysettings.resolvers.url = This resolver is one of the most generic. In fact, most of the previous resolvers can be obtained by a particular configuration of this one.
+ivysettings.resolvers.url.@m2compatible = True if this resolver should be Maven 2 compatible, false otherwise (since 1.3)
 ##### ivysettings.resolvers.vfs
-ivysettings.resolvers.vfs = This resolver is certainly the most capable, since it relies on Apache commons VFS, which gives an uniform access to a good number of file systems, including ftp, webdav, zip, ...
+ivysettings.resolvers.vfs = This resolver is certainly the most capable, since it relies on Apache Commons VFS, which gives an uniform access to a good number of file systems, including FTP, WebDAV, zip, …
 ##### ivysettings.caches
 ivysettings.caches = Configures the Ivy cache system.
 ivysettings.caches.@default = the name of the default cache to use on all resolvers not defining the cache instance to use
 ivysettings.caches.@defaultCacheDir = a path to a directory to use as default basedir for both resolution and repository cache(s)
 ivysettings.caches.@resolutionCacheDir = the path of the directory to use for all resolution cache data
 ivysettings.caches.@repositoryCacheDir = the path of the default directory to use for repository cache data. This should not point to a directory used as a repository!
-ivysettings.caches.@ivyPattern = default pattern used to indicate where ivy files should be put in the repository cache(s)
+ivysettings.caches.@ivyPattern = default pattern used to indicate where Ivy files should be put in the repository cache(s)
 ivysettings.caches.@artifactPattern = default pattern used to indicate where artifact files should be put in the repository cache(s)
-ivysettings.caches.@checkUpToDate = Indicates if date should be checked before retrieving artifacts from cache
-ivysettings.caches.@useOrigin = the default value to use for useOrigin for caches in which it isn't specifically defined.    	Use true to avoid the copy of local artifacts to the cache and use directly their original location.
+ivysettings.caches.@checkUpToDate = Deprecated, we recommend using overwriteMode on the retrieve task instead. Indicates if date should be checked before retrieving artifacts from cache.
+ivysettings.caches.@useOrigin = the default value to use for useOrigin for caches in which it isn’t specifically defined. Use true to avoid the copy of local artifacts to the cache and use directly their original location.
 ivysettings.caches.@lockStrategy = the name of the default lock strategy to use when accessing repository cache(s)
 ##### ivysettings.caches.cache
 ivysettings.caches.cache = Defines a repository cache instance based on the default repository cache implementation.
 ivysettings.caches.cache.@name = name of the cache instance
 ivysettings.caches.cache.@basedir = the path of the base directory to use to put repository cache data. This should not point to a directory used as a repository!
-ivysettings.caches.cache.@ivyPattern = the pattern to use to store cached ivy files
+ivysettings.caches.cache.@ivyPattern = the pattern to use to store cached Ivy files
 ivysettings.caches.cache.@artifactPattern = the pattern to use to store cached artifacts
-ivysettings.caches.cache.@useOrigin = true to avoid the copy of local artifacts to the cache and use directly their original location, false otherwise. To know if an artifact is local ivy asks to the resolver. Only filesystem resolver is considered local by default, but this can be disabled if you want to force the copy on one filesystem resolver and use the original location on another. Note that it is safe to use useOrigin even if you use the cache for some non local resolvers. In this case the cache will behave as usual, copying files to the cache. Note also that this only applies to artifacts, not to ivy files, which are still copied in the cache.
+ivysettings.caches.cache.@useOrigin = true to avoid the copy of local artifacts to the cache and use directly their original location, false otherwise. To know if an artifact is local, Ivy asks the resolver. Only filesystem resolver is considered local by default, but this can be disabled if you want to force the copy on one filesystem resolver and use the original location on another. Note that it is safe to use useOrigin even if you use the cache for some non local resolvers. In this case the cache will behave as usual, copying files to the cache. Note also that this only applies to artifacts, not to Ivy files, which are still copied in the cache.
 ivysettings.caches.cache.@lockStrategy = the name of the lock strategy to use for this cache
 ivysettings.caches.cache.@defaultTTL = the default TTL to use when no specific one is defined
+ivysettings.caches.cache.@memorySize = the number of parsed module descriptors to keep in a memory cache.
 ##### ivysettings.caches.cache.TTL
 ivysettings.caches.cache.TTL = Defines a TTL (Time To Live) rule for resolved revision caching.
 ivysettings.caches.cache.TTL.@organisation = the organisation to match to apply the rule.
-ivysettings.caches.cache.TTL.@module = the module's name to match to apply the rule.
-ivysettings.caches.cache.TTL.@revision = the module's revision to match to apply the rule. Note that the version is not resolved when evaluating the rule ('latest.integration' for instance).
-ivysettings.caches.cache.TTL.@any extra attribute = an extra attribute to match to apply the rule.
+ivysettings.caches.cache.TTL.@module = the module’s name to match to apply the rule.
+ivysettings.caches.cache.TTL.@revision = the module’s revision to match to apply the rule. Note that the version is not resolved when evaluating the rule ('latest.integration', for instance).
+ivysettings.caches.cache.TTL.@attribute = an extra attribute to match to apply the rule.
 ivysettings.caches.cache.TTL.@matcher = the matcher to use to match the modules to which the resolver should be applied
-ivysettings.caches.cache.TTL.@duration = the TTL to apply
+ivysettings.caches.cache.TTL.@duration = the TTL to apply (see above for format)
 ##### ivysettings.classpath
 ivysettings.classpath = Includes a jar in the classpath used to load plugins.
 ivysettings.classpath.@url = the url of a jar to add to the classpath
 ivysettings.classpath.@file = a jar to add to the classpath
 ##### ivysettings.conflict-managers
-ivysettings.conflict-managers = Defines a list of conflicts managers usable in ivy.
+ivysettings.conflict-managers = Defines a list of conflict managers usable in Ivy.
+##### ivysettings.credentials
+ivysettings.credentials = Configures HTTP authentication credentials.
+ivysettings.credentials.@host = the name of the host
+ivysettings.credentials.@realm = the name of the realm
+ivysettings.credentials.@username = the username
+ivysettings.credentials.@passwd = the password
 ##### ivysettings.include
-ivysettings.include = Includes another ivysettings file as if it were part of this one.
-ivysettings.include.@url = a URL to the ivysettings file to include
-ivysettings.include.@file = a path to the ivysettings file to include
+ivysettings.include = Includes another Ivy settings file as if it were part of this one.
+ivysettings.include.@url = a URL to the Ivy settings file to include
+ivysettings.include.@file = a path to the Ivy settings file to include
+ivysettings.include.@optional = indicates whether Ivy should throw an error if the specified file doesn’t exist (since 2.4).
 ##### ivysettings.latest-strategies
-ivysettings.latest-strategies = Defines a list of latest strategies usable in ivy.
+ivysettings.latest-strategies = Defines a list of latest strategies usable in Ivy.
 ##### ivysettings.lock-strategies
 ivysettings.lock-strategies = Defines a list of lock strategies usable in Ivy.
 ##### ivysettings.macrodef
-ivysettings.macrodef = Defines a new dependency resolver type based upon an other one.
-ivysettings.macrodef.@name = name of the resover type created
+ivysettings.macrodef = Defines a new dependency resolver type based upon another.
+ivysettings.macrodef.@name = name of the resolver type created
 ##### ivysettings.macrodef.attribute
 ivysettings.macrodef.attribute = Defines a macrodef attribute.
 ivysettings.macrodef.attribute.@name = the name of the attribute
@@ -127,18 +163,18 @@ ivysettings.macrodef.attribute.@default = the default value of the attribute if
 ##### ivysettings.modules.module
 ivysettings.modules.module = Define a module set rule.
 ivysettings.modules.module.@organisation = the organisation to match to apply the rule.
-ivysettings.modules.module.@name = the module's name to match to apply the rule.
-ivysettings.modules.module.@revision = the module's revision to match to apply the rule. Note that the version may not be resolved yet (be latest.integration for instance), so be very careful when using this attribute. since 2.0
-ivysettings.modules.module.@any extra attribute = an extra attribute to match to apply the rule. since 2.0
-ivysettings.modules.module.@matcher = the matcher to use to match the modules to which the resolver should be applied since 1.3
-ivysettings.modules.module.@resolver = the name of the resolver to apply. The resolver must have been defined in the resolvers section of the configuration file.
-ivysettings.modules.module.@conflict-manager = the name of the conflict manager to apply. since 1.4
-ivysettings.modules.module.@branch = the default branch to apply. since 1.4
-ivysettings.modules.module.@resolveMode = the resolve mode to use. since 2.0
+ivysettings.modules.module.@name = the module’s name to match to apply the rule.
+ivysettings.modules.module.@revision = the module’s revision to match to apply the rule. Note that the version may not be resolved yet (be latest.integration, for instance), so be very careful when using this attribute (since 2.0).
+ivysettings.modules.module.@attribute = an extra attribute to match to apply the rule (since 2.0).
+ivysettings.modules.module.@matcher = the matcher to use to match the modules to which the resolver should be applied (since 1.3).
+ivysettings.modules.module.@resolver = the name of the resolver to apply. The resolver must have been defined in the resolvers section of the settings file.
+ivysettings.modules.module.@conflict-manager = the name of the conflict manager to apply (since 1.4).
+ivysettings.modules.module.@branch = the default branch to apply (since 1.4).
+ivysettings.modules.module.@resolveMode = the resolve mode to use (since 2.0).
 ##### ivysettings.modules
 ivysettings.modules = Defines per module or module set settings.
 ##### ivysettings.namespaces.namespace
-ivysettings.namespaces.namespace = Defines a new namespace. A namespace is identified by a name, which is used to reference the namespace in the resolvers using the namespace.
+ivysettings.namespaces.namespace = Defines a new namespace. A namespace is identified by a name, which can be referenced by one of the resolvers.
 ivysettings.namespaces.namespace.@name = the namespace name
 ivysettings.namespaces.namespace.@chainrules = true to indicate that namespaces rules should be chained, false otherwise
 ##### ivysettings.namespaces.namespace.rule.fromsystem.dest
@@ -149,69 +185,92 @@ ivysettings.namespaces.namespace.rule.fromsystem.dest.@rev = the new revision
 ##### ivysettings.namespaces.namespace.fromsystem
 ivysettings.namespaces.namespace.fromsystem = Defines a one way translation rule, i.e. a translation from system namespace to the defined namespace or vice versa.
 ##### ivysettings.namespaces.namespace.rule
-ivysettings.namespaces.namespace.rule = Defines a new namespace rule. A rule defines a translation between system namespace and the defined namespace, and vice versa.
+ivysettings.namespaces.namespace.rule = Defines a new namespace rule.
 ##### ivysettings.namespaces.namespace.rule.fromsystem.src
-ivysettings.namespaces.namespace.rule.fromsystem.src = Defines the acceptation part of a translation rule.
+ivysettings.namespaces.namespace.rule.fromsystem.src = Defines the matching part of a translation rule.
 ivysettings.namespaces.namespace.rule.fromsystem.src.@org = the organisation to match as a regexp
 ivysettings.namespaces.namespace.rule.fromsystem.src.@module = the module name to match as a regexp
 ivysettings.namespaces.namespace.rule.fromsystem.src.@rev = the revision to match as a regexp
 ##### ivysettings.namespaces
 ivysettings.namespaces = Namespaces are an advanced feature of Ivy which let you use resolvers in which module names and organisations are not consistent between each other.
 ##### ivysettings.outputters
-ivysettings.outputters = Defines a list of report outputters usable in ivy.
+ivysettings.outputters = Defines a list of report outputters usable in Ivy.
 ##### ivysettings.parsers
-ivysettings.parsers = Defines a list of module descriptor parsers usable in ivy.
+ivysettings.parsers = Defines a list of module descriptor parsers usable in Ivy. Each parser defines which resources (which descriptor file) it accepts.
 ##### ivysettings.properties
-ivysettings.properties = Loads a properties file into ivy variables.
+ivysettings.properties = Loads a properties file into Ivy variables.
 ivysettings.properties.@file = a path to a properties file to load
 ivysettings.properties.@environment = the prefix to use when retrieving environment variables (since 2.0)
-ivysettings.properties.@override = indicates if the variable found in the properties file should override their previous value, if any (since 1.3)
+ivysettings.properties.@override = indicates if the variable found in the properties file should override its previous value, if any (since 1.3)
 ##### ivysettings.property
-ivysettings.property = Defines an ivy variable.
+ivysettings.property = Defines an Ivy variable.
 ivysettings.property.@name = the name of the variable to define
 ivysettings.property.@value = the new value the variable must take
-ivysettings.property.@override = true if the previous value (if any) of the variable should overriden, false otherwise
+ivysettings.property.@override = true if the previous value (if any) of the variable should overridden, false otherwise
+ivysettings.property.@ifset = the variable will be set only if the provided 'ifset' variable is already set (since 2.4)
+ivysettings.property.@unlessset = the variable will not be set unless the provided 'unlessset' variable is set (since 2.4)
 ##### ivysettings.resolvers
-ivysettings.resolvers = Defines a list of dependency resolvers usable in ivy.
-ivysettings.resolvers.@IvyRep = Standard
-ivysettings.resolvers.@IBiblio = Standard
-ivysettings.resolvers.@Packager = Standard
-ivysettings.resolvers.@FileSystem = Standard
-ivysettings.resolvers.@Url = Standard
-ivysettings.resolvers.@Vfs = Standard
+ivysettings.resolvers = Defines a list of dependency resolvers usable in Ivy.
+ivysettings.resolvers.@ivyrep = Standard
+ivysettings.resolvers.@ibiblio = Standard
+ivysettings.resolvers.@bintray = Standard
+ivysettings.resolvers.@packager = Standard
+ivysettings.resolvers.@filesystem = Standard
+ivysettings.resolvers.@url = Standard
+ivysettings.resolvers.@mirroredurl = Standard
+ivysettings.resolvers.@vfs = Standard
 ivysettings.resolvers.@ssh = Standard
 ivysettings.resolvers.@sftp = Standard
-ivysettings.resolvers.@Chain = Composite
-ivysettings.resolvers.@Dual = Composite
+ivysettings.resolvers.@jar = Standard
+ivysettings.resolvers.@chain = Composite
+ivysettings.resolvers.@dual = Composite
+ivysettings.resolvers.@obr = Standard
+ivysettings.resolvers.@updatesite = Standard
+ivysettings.resolvers.@osgi-agg = Composite
 ##### ivysettings.settings
-ivysettings.settings = Configures some important ivy info: default resolver, latest strategy, conflict manager...
+ivysettings.settings = Configures some important Ivy behaviour: default resolver, latest strategy, conflict manager and some others.
 ivysettings.settings.@defaultResolver = the name of the default resolver to use
 ivysettings.settings.@defaultLatestStrategy = the name of the default latest strategy to use
 ivysettings.settings.@defaultConflictManager = the name of the default conflict manager to use
-ivysettings.settings.@defaultBranch = the default branch to use for all modules, except if they have a module specific branch setting. since 1.4
-ivysettings.settings.@defaultResolveMode = the default resolve mode to use for all modules, except if they have a module specific resolve mode setting. since 2.0
-ivysettings.settings.@circularDependencyStrategy = the name of the circular dependency strategy to use since 1.4
-ivysettings.settings.@validate = Indicates if ivy files should be validated against ivy.xsd or not.
-ivysettings.settings.@useRemoteConfig = true to configure ivyrep and ibiblio resolver from a remote configuration file (updated with changes in those repository structure if any) (since 1.2)
-ivysettings.settings.@defaultCache = a path to a directory to use as default basedir for both resolution and repository cache(s).	    Deprecated, we recommend using defaultCacheDir on the caches tag instead
-ivysettings.settings.@checkUpToDate = Indicates if date should be checked before retrieving artifacts from cache.    	Deprecated, we recommend using checkUpToDate on the caches tag instead
-ivysettings.settings.@cacheIvyPattern = a pattern to indicate where ivy files should be put in cache.    	Deprecated, we recommend using ivyPattern on the caches tag instead
-ivysettings.settings.@cacheArtifactPattern = a pattern to indicate where artifact files should be put in cache.    	Deprecated, we recommend using artifactPattern on the caches tag instead
+ivysettings.settings.@defaultBranch = the default branch to use for all modules, except if they have a module specific branch setting. (since 1.4)
+ivysettings.settings.@defaultResolveMode = the default resolve mode to use for all modules, except if they have a module specific resolve mode setting. (since 2.0)
+ivysettings.settings.@circularDependencyStrategy = the name of the circular dependency strategy to use (since 1.4)
+ivysettings.settings.@validate = Indicates if Ivy files should be validated against ivy.xsd or not.
+ivysettings.settings.@useRemoteConfig = true to configure ivyrep and ibiblio resolver from a remote settings file (updated with changes in those repository structure if any) (since 1.2)
+ivysettings.settings.@httpRequestMethod = specifies the HTTP method to use to retrieve information about an URL. Possible values are 'GET' and 'HEAD'. This setting can be used to solve problems with firewalls and proxies. (since 2.0)
+ivysettings.settings.@defaultCache = a path to a directory to use as default basedir for both resolution and repository cache(s). Deprecated, we recommend using defaultCacheDir on the caches tag instead
+ivysettings.settings.@checkUpToDate = Indicates if date should be checked before retrieving artifacts from cache. Deprecated, we recommend using overwriteMode on the retrieve task instead
+ivysettings.settings.@cacheIvyPattern = a pattern to indicate where Ivy files should be put in cache. Deprecated, we recommend using ivyPattern on the caches tag instead
+ivysettings.settings.@cacheArtifactPattern = a pattern to indicate where artifact files should be put in cache. Deprecated, we recommend using artifactPattern on the caches tag instead
+##### ivysettings.signers
+ivysettings.signers = Defines a list of detached signature generators usable in Ivy. Each generator is identified by its name, given as an attribute.
+ivysettings.signers.@name = The name of the signature generator.
+ivysettings.signers.@secring = The location of the secret keyring.
+ivysettings.signers.@keyId = The identifier of the key to use. The keyword auto can be used to indicate a key will be selected automatically.
+ivysettings.signers.@password = The password of the private key.
 ##### ivysettings.statuses.status
 ivysettings.statuses.status = Define one available module status.
 ivysettings.statuses.status.@name = name of status defined
 ivysettings.statuses.status.@integration = true if this is an integration status, false otherwise
 ##### ivysettings.statuses
 ivysettings.statuses = Defines the list of available statuses.
-ivysettings.statuses.@default = the name of the status to use when none is declared in an ivy file
+ivysettings.statuses.@default = the name of the status to use when none is declared in an Ivy file
+##### ivysettings.timeout-constraint
+ivysettings.timeout-constraint = Defines a named timeout constraint that can then be referenced from other places of the Ivy settings file, like the resolvers.
+ivysettings.timeout-constraint.@name = name of timeout constraint
+ivysettings.timeout-constraint.@connectionTimeout = An integer value, in milliseconds, that will be used as the timeout while establishing a connection. A value greater than 0 is used literally as the timeout. A value of 0 indicates no timeout and typically translates to wait-forever kind of semantics. A value less than 0 lets the users of this timeout constraint decide what semantics to use. That effectively, implies implementation specific semantics
+ivysettings.timeout-constraint.@readTimeout = An integer value, in milliseconds, that will be used as the timeout while reading content from a resource to which an connection has been established. A value greater than 0 is used literally as the timeout. A value of 0 indicates no timeout and typically translates to wait-forever kind of semantics. A value less than 0 lets the users of this timeout constraint decide what semantics to use. That effectively, implies implementation specific semantics
+##### ivysettings.timeout-constraints
+ivysettings.timeout-constraints = timeout-constraints in Ivy settings allows you to configure timeouts that can then be used by Ivy while communicating with remote systems.
 ##### ivysettings.triggers
 ivysettings.triggers = Defines a list of triggers to activate on some Ivy events.
-ivysettings.triggers.@ant-build = Triggers an ant build.
-ivysettings.triggers.@ant-call = Calls a target in the current ant build.
-ivysettings.triggers.@log = Logs a message on the console or in a log file.
+ivysettings.triggers.@name = the name of the trigger for identification purpose only
+ivysettings.triggers.@event = the name of the event on which the trigger should be performed
+ivysettings.triggers.@filter = a filter expression used to restrict when the trigger should be performed
 ##### ivysettings.typedef
-ivysettings.typedef = Defines a new type in ivy. Useful to define new dependency resolvers, in particular, but also latest strategies.
+ivysettings.typedef = Defines a new type in Ivy. Useful to define new dependency resolvers, in particular, but also latest strategies.
 ivysettings.typedef.@name = the name of the type to define. This name is then used as an xml tag.
 ivysettings.typedef.@classname = the fully qualified class name of the type to define.
 ##### ivysettings.version-matchers
 ivysettings.version-matchers = Defines a list of version matchers.
+ivysettings.version-matchers.@usedefaults = when set to true, includes the built-in version matchers (Latest, Sub Revision, and Version Ranger Matcher). Exact Revision Matcher is always included

http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/8d21ed20/org.apache.ivyde.eclipse/xsd/ivy.xsd
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/xsd/ivy.xsd b/org.apache.ivyde.eclipse/xsd/ivy.xsd
index 0583595..1e41781 100644
--- a/org.apache.ivyde.eclipse/xsd/ivy.xsd
+++ b/org.apache.ivyde.eclipse/xsd/ivy.xsd
@@ -15,10 +15,9 @@
    "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.    
+   under the License.
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-
     <xs:complexType name="configurations-conf">
         <xs:attribute name="name" type="xs:string" use="required"/>
         <xs:attribute name="transitive" type="xs:boolean"/>
@@ -33,7 +32,7 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:anyAttribute namespace="##other" processContents="lax" />
+        <xs:anyAttribute namespace="##other" processContents="lax"/>
     </xs:complexType>
 
     <xs:complexType name="global-exclude">
@@ -51,87 +50,87 @@
         <xs:attribute name="ext" type="xs:string"/>
         <xs:attribute name="conf" type="xs:string"/>
         <xs:attribute name="matcher" type="xs:string"/>
-        <xs:anyAttribute namespace="##other" processContents="lax" />
+        <xs:anyAttribute namespace="##other" processContents="lax"/>
     </xs:complexType>
 
-  <xs:element name="ivy-module">
-      <xs:complexType>
-        <xs:sequence>
-            <xs:element name="info">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element name="extends" minOccurs="0" maxOccurs="unbounded">
-                        <xs:complexType>
-                            <xs:attribute name="organisation" type="xs:string" use="required"/>
-                            <xs:attribute name="module" type="xs:string" use="required"/>
-                            <xs:attribute name="revision" type="xs:string" use="required"/>
-                            <xs:attribute name="location" type="xs:string" />
-                            <xs:attribute name="extendType" type="xs:string" />
-                            </xs:complexType>
-                        </xs:element>
-                        <xs:element name="license" minOccurs="0" maxOccurs="unbounded">
-                            <xs:complexType>
-                                <xs:attribute name="name" type="xs:string" use="required"/>
-                                <xs:attribute name="url" type="xs:string"/>
-                            </xs:complexType>
-                        </xs:element>
-                        <xs:element name="ivyauthor" minOccurs="0" maxOccurs="unbounded">
-                            <xs:complexType>
-                                <xs:attribute name="name" type="xs:string" use="required"/>
-                                <xs:attribute name="url" type="xs:string"/>
-                            </xs:complexType>
-                        </xs:element>
-                        <xs:element name="repository" minOccurs="0" maxOccurs="unbounded">
-                            <xs:complexType>
-                                <xs:attribute name="name" type="xs:string" use="required"/>
-                                <xs:attribute name="url" type="xs:string"/>
-                                <xs:attribute name="pattern" type="xs:string"/>
-                                <xs:attribute name="ivys" type="xs:boolean"/>
-                                <xs:attribute name="artifacts" type="xs:boolean"/>
-                            </xs:complexType>
-                        </xs:element>
-                        <xs:element name="description" minOccurs="0" maxOccurs="1">
-                            <xs:complexType mixed="true">
+    <xs:element name="ivy-module">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="info">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="extends" minOccurs="0" maxOccurs="unbounded">
+                                <xs:complexType>
+                                    <xs:attribute name="organisation" type="xs:string" use="required"/>
+                                    <xs:attribute name="module" type="xs:string" use="required"/>
+                                    <xs:attribute name="revision" type="xs:string" use="required"/>
+                                    <xs:attribute name="location" type="xs:string"/>
+                                    <xs:attribute name="extendType" type="xs:string"/>
+                                </xs:complexType>
+                            </xs:element>
+                            <xs:element name="license" minOccurs="0" maxOccurs="unbounded">
+                                <xs:complexType>
+                                    <xs:attribute name="name" type="xs:string" use="required"/>
+                                    <xs:attribute name="url" type="xs:string"/>
+                                </xs:complexType>
+                            </xs:element>
+                            <xs:element name="ivyauthor" minOccurs="0" maxOccurs="unbounded">
+                                <xs:complexType>
+                                    <xs:attribute name="name" type="xs:string" use="required"/>
+                                    <xs:attribute name="url" type="xs:string"/>
+                                </xs:complexType>
+                            </xs:element>
+                            <xs:element name="repository" minOccurs="0" maxOccurs="unbounded">
+                                <xs:complexType>
+                                    <xs:attribute name="name" type="xs:string" use="required"/>
+                                    <xs:attribute name="url" type="xs:string"/>
+                                    <xs:attribute name="pattern" type="xs:string"/>
+                                    <xs:attribute name="ivys" type="xs:boolean"/>
+                                    <xs:attribute name="artifacts" type="xs:boolean"/>
+                                </xs:complexType>
+                            </xs:element>
+                            <xs:element name="description" minOccurs="0" maxOccurs="1">
+                                <xs:complexType mixed="true">
                                     <xs:sequence>
                                         <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
                                     </xs:sequence>
-                                <xs:attribute name="homepage" type="xs:string"/>
-                            </xs:complexType>
-                        </xs:element>
-                        <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax"/>
-                    </xs:sequence>
-                    <xs:attribute name="organisation" type="xs:string"/>
-                    <xs:attribute name="module" type="xs:string" use="required"/>
-                    <xs:attribute name="branch" type="xs:string"/>
-                    <xs:attribute name="revision" type="xs:string"/>
-                    <xs:attribute name="status" type="xs:string"/>
-                    <xs:attribute name="publication" type="xs:string"/>
-                    <xs:attribute name="resolver" type="xs:string"/>
-                    <xs:attribute name="namespace" type="xs:string"/>
-                    <xs:attribute name="default" type="xs:boolean"/>
-                    <xs:anyAttribute namespace="##other" processContents="lax" />
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="configurations" minOccurs="0">
-                  <xs:complexType>
+                                    <xs:attribute name="homepage" type="xs:string"/>
+                                </xs:complexType>
+                            </xs:element>
+                            <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax"/>
+                        </xs:sequence>
+                        <xs:attribute name="organisation" type="xs:string"/>
+                        <xs:attribute name="module" type="xs:string" use="required"/>
+                        <xs:attribute name="branch" type="xs:string"/>
+                        <xs:attribute name="revision" type="xs:string"/>
+                        <xs:attribute name="status" type="xs:string"/>
+                        <xs:attribute name="publication" type="xs:string"/>
+                        <xs:attribute name="resolver" type="xs:string"/>
+                        <xs:attribute name="namespace" type="xs:string"/>
+                        <xs:attribute name="default" type="xs:boolean"/>
+                        <xs:anyAttribute namespace="##other" processContents="lax"/>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element name="configurations" minOccurs="0">
+                    <xs:complexType>
                         <xs:sequence>
                             <xs:choice minOccurs="0" maxOccurs="unbounded">
                                 <xs:element name="conf" type="configurations-conf"/>
                                 <xs:element name="include">
                                     <xs:complexType>
                                         <xs:attribute name="file" type="xs:string"/>
-                                        <xs:attribute name="url"  type="xs:string"/>
+                                        <xs:attribute name="url" type="xs:string"/>
                                     </xs:complexType>
                                 </xs:element>
                             </xs:choice>
                         </xs:sequence>
                         <xs:attribute name="defaultconf" type="xs:string"/>
-                        <xs:attribute name="defaultconfmapping" type="xs:string"/>                
-                        <xs:attribute name="confmappingoverride" type="xs:boolean" />      
-                  </xs:complexType>
-            </xs:element>
-            <xs:element name="publications" minOccurs="0">
-                  <xs:complexType>
+                        <xs:attribute name="defaultconfmapping" type="xs:string"/>
+                        <xs:attribute name="confmappingoverride" type="xs:boolean"/>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element name="publications" minOccurs="0">
+                    <xs:complexType>
                         <xs:sequence>
                             <xs:element name="artifact" minOccurs="0" maxOccurs="unbounded">
                                 <xs:complexType>
@@ -147,15 +146,16 @@
                                     <xs:attribute name="ext" type="xs:string"/>
                                     <xs:attribute name="conf" type="xs:string"/>
                                     <xs:attribute name="url" type="xs:string"/>
-                                    <xs:anyAttribute namespace="##other" processContents="lax" />
+                                    <xs:attribute name="packaging" type="xs:string"/>
+                                    <xs:anyAttribute namespace="##other" processContents="lax"/>
                                 </xs:complexType>
                             </xs:element>
                         </xs:sequence>
-                        <xs:attribute name="defaultconf" type="xs:string"/>               
-                  </xs:complexType>
-            </xs:element>
-            <xs:element name="dependencies" minOccurs="0">
-                  <xs:complexType>
+                        <xs:attribute name="defaultconf" type="xs:string"/>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element name="dependencies" minOccurs="0">
+                    <xs:complexType>
                         <xs:sequence>
                             <xs:element name="dependency" minOccurs="0" maxOccurs="unbounded">
                                 <xs:complexType>
@@ -187,7 +187,7 @@
                                                 <xs:attribute name="ext" type="xs:string"/>
                                                 <xs:attribute name="conf" type="xs:string"/>
                                                 <xs:attribute name="url" type="xs:string"/>
-                                                <xs:anyAttribute namespace="##other" processContents="lax" />
+                                                <xs:anyAttribute namespace="##other" processContents="lax"/>
                                             </xs:complexType>
                                         </xs:element>
                                         <xs:element name="include" minOccurs="0" maxOccurs="unbounded">
@@ -204,7 +204,7 @@
                                                 <xs:attribute name="ext" type="xs:string"/>
                                                 <xs:attribute name="conf" type="xs:string"/>
                                                 <xs:attribute name="matcher" type="xs:string"/>
-                                                <xs:anyAttribute namespace="##other" processContents="lax" />
+                                                <xs:anyAttribute namespace="##other" processContents="lax"/>
                                             </xs:complexType>
                                         </xs:element>
                                         <xs:element name="exclude" minOccurs="0" maxOccurs="unbounded">
@@ -223,7 +223,7 @@
                                                 <xs:attribute name="ext" type="xs:string"/>
                                                 <xs:attribute name="conf" type="xs:string"/>
                                                 <xs:attribute name="matcher" type="xs:string"/>
-                                                <xs:anyAttribute namespace="##other" processContents="lax" />
+                                                <xs:anyAttribute namespace="##other" processContents="lax"/>
                                             </xs:complexType>
                                         </xs:element>
                                     </xs:sequence>
@@ -237,10 +237,10 @@
                                     <xs:attribute name="changing" type="xs:boolean" default="false"/>
                                     <xs:attribute name="transitive" type="xs:boolean" default="true"/>
                                     <xs:attribute name="conf" type="xs:string"/>
-                                    <xs:anyAttribute namespace="##other" processContents="lax" />
+                                    <xs:anyAttribute namespace="##other" processContents="lax"/>
                                 </xs:complexType>
                             </xs:element>
-                            <xs:element name="exclude" type="global-exclude" minOccurs="0" maxOccurs="unbounded" />
+                            <xs:element name="exclude" type="global-exclude" minOccurs="0" maxOccurs="unbounded"/>
                             <xs:element name="override" minOccurs="0" maxOccurs="unbounded">
                                 <xs:complexType>
                                     <xs:attribute name="org" type="xs:string"/>
@@ -257,17 +257,17 @@
                                     <xs:attribute name="manager" type="xs:string"/>
                                     <xs:attribute name="rev" type="xs:string"/>
                                     <xs:attribute name="matcher" type="xs:string"/>
-                                    <xs:anyAttribute namespace="##other" processContents="lax" />
+                                    <xs:anyAttribute namespace="##other" processContents="lax"/>
                                 </xs:complexType>
                             </xs:element>
                         </xs:sequence>
-                        <xs:attribute name="defaultconf" type="xs:string"/>                     
-                        <xs:attribute name="defaultconfmapping" type="xs:string"/>                      
-                        <xs:attribute name="confmappingoverride" type="xs:boolean" />
-                  </xs:complexType>
-            </xs:element>
-            <xs:element name="conflicts" minOccurs="0">
-                  <xs:complexType>
+                        <xs:attribute name="defaultconf" type="xs:string"/>
+                        <xs:attribute name="defaultconfmapping" type="xs:string"/>
+                        <xs:attribute name="confmappingoverride" type="xs:boolean"/>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element name="conflicts" minOccurs="0">
+                    <xs:complexType>
                         <xs:sequence>
                             <xs:element name="manager" maxOccurs="unbounded">
                                 <xs:complexType>
@@ -276,15 +276,14 @@
                                     <xs:attribute name="name" type="xs:string"/>
                                     <xs:attribute name="rev" type="xs:string"/>
                                     <xs:attribute name="matcher" type="xs:string"/>
-                                    <xs:anyAttribute namespace="##other" processContents="lax" />
+                                    <xs:anyAttribute namespace="##other" processContents="lax"/>
                                 </xs:complexType>
                             </xs:element>
                         </xs:sequence>
-                  </xs:complexType>
-            </xs:element>
-        </xs:sequence>
-        <xs:attribute name="version" type="xs:string" use="required"/>
-      </xs:complexType>
-  </xs:element>
-
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+            <xs:attribute name="version" type="xs:string" use="required"/>
+        </xs:complexType>
+    </xs:element>
 </xs:schema>

http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/8d21ed20/org.apache.ivyde.feature/feature.xml
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.feature/feature.xml b/org.apache.ivyde.feature/feature.xml
index 89eecea..1aa3dee 100644
--- a/org.apache.ivyde.feature/feature.xml
+++ b/org.apache.ivyde.feature/feature.xml
@@ -54,7 +54,7 @@
       <import plugin="org.eclipse.jdt.core" version="3.4.0" match="compatible"/>
       <import plugin="org.eclipse.jdt.ui" version="3.4.0" match="compatible"/>
       <import plugin="org.eclipse.ui.console" version="3.4.0" match="compatible"/>
-      <import plugin="org.apache.ivy" version="2.1.0" match="compatible"/>
+      <import plugin="org.apache.ivy" version="2.5.0" match="compatible"/>
       <import plugin="org.eclipse.help" version="3.4.0" match="compatible"/>
       <import plugin="org.eclipse.debug.core" version="3.4.0" match="compatible"/>
       <import plugin="org.eclipse.jdt.launching" version="3.4.0" match="compatible"/>


Mime
View raw message