Repository: ant-ivy
Updated Branches:
refs/heads/master a9dd1573e -> 186fd1077
inline variables; adjust exceptions, annotations, and formatting
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/186fd107
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/186fd107
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/186fd107
Branch: refs/heads/master
Commit: 186fd10776a0fd576d5deb733af654c7e20b3f30
Parents: a9dd157
Author: Gintas Grigelionis
Authored: Thu Aug 17 14:10:42 2017 +0200
Committer: Gintas Grigelionis
Committed: Thu Aug 17 14:10:42 2017 +0200
--
asciidoc/concept.adoc | 2 +-
src/java/org/apache/ivy/Ivy.java| 4 +--
src/java/org/apache/ivy/Main.java | 1 +
src/java/org/apache/ivy/ant/BuildOBRTask.java | 5 ++-
.../org/apache/ivy/ant/IvyArtifactReport.java | 6 ++--
src/java/org/apache/ivy/ant/IvyCacheTask.java | 3 +-
src/java/org/apache/ivy/ant/IvyRetrieve.java| 1 +
.../cache/DefaultRepositoryCacheManager.java| 32 +++-
.../ivy/core/module/id/ModuleRevisionId.java| 5 ++-
.../apache/ivy/core/publish/PublishEngine.java | 4 +--
.../core/report/ConfigurationResolveReport.java | 6 ++--
.../ivy/core/retrieve/RetrieveOptions.java | 4 +--
.../apache/ivy/core/settings/IvySettings.java | 3 +-
.../core/settings/NamedTimeoutConstraint.java | 2 --
.../ivy/core/settings/XmlSettingsParser.java| 9 --
.../org/apache/ivy/core/sort/ModuleInSort.java | 2 +-
.../apache/ivy/osgi/core/BundleCapability.java | 2 +-
.../apache/ivy/osgi/core/BundleRequirement.java | 2 +-
.../org/apache/ivy/osgi/core/ExportPackage.java | 2 +-
.../ivy/osgi/repo/AbstractOSGiResolver.java | 3 +-
.../repo/ArtifactReportManifestIterable.java| 2 +-
.../osgi/repo/BundleCapabilityAndLocation.java | 2 +-
.../ivy/osgi/repo/FSManifestIterable.java | 5 +--
.../ivy/osgi/repo/ResolverManifestIterable.java | 2 +-
.../org/apache/ivy/osgi/util/VersionRange.java | 4 +--
.../plugins/latest/WorkspaceLatestStrategy.java | 2 +-
.../ivy/plugins/parser/m2/PomDependencyMgt.java | 2 +-
.../parser/m2/PomModuleDescriptorBuilder.java | 8 ++---
.../parser/xml/XmlModuleDescriptorUpdater.java | 2 +-
.../ivy/plugins/repository/url/URLResource.java | 1 +
.../resolver/AbstractPatternsBasedResolver.java | 3 +-
.../ivy/plugins/resolver/CacheResolver.java | 1 +
.../ivy/plugins/resolver/ChainResolver.java | 4 ---
.../ivy/plugins/resolver/IBiblioResolver.java | 2 +-
.../resolver/packager/PackagerResolver.java | 5 +--
src/java/org/apache/ivy/util/Configurator.java | 2 --
.../org/apache/ivy/util/EncrytedProperties.java | 2 +-
.../apache/ivy/util/cli/CommandLineParser.java | 6 ++--
.../apache/ivy/util/url/BasicURLHandler.java| 2 +-
.../org/apache/ivy/LocalFileRepoOverHttp.java | 1 +
test/java/org/apache/ivy/TestHelper.java| 1 +
test/java/org/apache/ivy/ant/FileUtilTest.java | 2 --
.../apache/ivy/ant/IvyDependencyTreeTest.java | 1 -
.../java/org/apache/ivy/ant/IvyInstallTest.java | 1 -
.../apache/ivy/core/retrieve/RetrieveTest.java | 2 +-
.../WarnCircularDependencyStrategyTest.java | 2 --
.../xml/XmlModuleDescriptorParserTest.java | 2 --
.../ivy/util/url/HttpclientURLHandlerTest.java | 2 ++
.../ivy/util/url/IvyAuthenticatorTest.java | 1 -
49 files changed, 71 insertions(+), 99 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/asciidoc/concept.adoc
--
diff --git a/asciidoc/concept.adoc b/asciidoc/concept.adoc
index 456021b..02aaeaa 100644
--- a/asciidoc/concept.adoc
+++ b/asciidoc/concept.adoc
@@ -91,7 +91,7 @@ the organisation name
`[orgPath]`::
*__(since 2.3)__* +
-the organisation name where '.' has been replaced by '/'. This can be used to
configure maven2-like repositories.
+the organisation name where '.' has been replaced by '/'. This can be used to
configure Maven 2-like repositories.
`[module]`::
the module name
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/Ivy.java
--
diff --git a/src/java/org/apache/ivy/Ivy.java b/src/java/org/apache/ivy/Ivy.java
index 424f010..d8f859b 100644
--- a/src/java/org/apache/ivy/Ivy.java
+++ b/src/java/org/apache/ivy/Ivy.java
@@ -118,7 +118,7 @@ public class Ivy {
*
* @see Ivy#execute(org.apache.ivy.Ivy.IvyCallback)
*/
-public static interface IvyCallback {
+public interface IvyCallback {
/**
* Executes Ivy related job within an {@link IvyContext}
*
@@