ant-ivy git commit: Checkstyle
Repository: ant-ivy Updated Branches: refs/heads/master a94425906 -> de130ad15 Checkstyle Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/de130ad1 Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/de130ad1 Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/de130ad1 Branch: refs/heads/master Commit: de130ad15e1bf48b6520e0f3033353f235b75765 Parents: a944259 Author: Gintas Grigelionis Authored: Mon Apr 9 01:02:32 2018 +0200 Committer: Gintas Grigelionis Committed: Mon Apr 9 01:02:32 2018 +0200 -- .../parser/m2/MavenVersionRangeParser.java | 25 ++-- .../util/url/TimeoutConstrainedURLHandler.java | 25 ++-- 2 files changed, 26 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/de130ad1/src/java/org/apache/ivy/plugins/parser/m2/MavenVersionRangeParser.java -- diff --git a/src/java/org/apache/ivy/plugins/parser/m2/MavenVersionRangeParser.java b/src/java/org/apache/ivy/plugins/parser/m2/MavenVersionRangeParser.java index 9e09a12..5587b5c 100644 --- a/src/java/org/apache/ivy/plugins/parser/m2/MavenVersionRangeParser.java +++ b/src/java/org/apache/ivy/plugins/parser/m2/MavenVersionRangeParser.java @@ -1,18 +1,19 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - *http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "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. * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "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. */ package org.apache.ivy.plugins.parser.m2; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/de130ad1/src/java/org/apache/ivy/util/url/TimeoutConstrainedURLHandler.java -- diff --git a/src/java/org/apache/ivy/util/url/TimeoutConstrainedURLHandler.java b/src/java/org/apache/ivy/util/url/TimeoutConstrainedURLHandler.java index db476ca..6e85241 100644 --- a/src/java/org/apache/ivy/util/url/TimeoutConstrainedURLHandler.java +++ b/src/java/org/apache/ivy/util/url/TimeoutConstrainedURLHandler.java @@ -1,18 +1,19 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - *http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * lim
[1/2] ant-ivy git commit: Checkstyle: trim trailing whitespace, replace tabs
Repository: ant-ivy Updated Branches: refs/heads/master 075134d7d -> 08e1d1cca http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/08e1d1cc/src/java/org/apache/ivy/core/settings/typedef.properties -- diff --git a/src/java/org/apache/ivy/core/settings/typedef.properties b/src/java/org/apache/ivy/core/settings/typedef.properties index b843ff4..e87af8f 100644 --- a/src/java/org/apache/ivy/core/settings/typedef.properties +++ b/src/java/org/apache/ivy/core/settings/typedef.properties @@ -1,70 +1,68 @@ -# *** -# * Licensed to the Apache Software Foundation (ASF) under one -# * or more contributor license agreements. See the NOTICE file -# * distributed with this work for additional information -# * regarding copyright ownership. The ASF licenses this file -# * to you under the Apache License, Version 2.0 (the -# * "License"); you may not use this file except in compliance -# * with the License. You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, -# * software distributed under the License is distributed on an -# * "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. -# *** -filesystem = org.apache.ivy.plugins.resolver.FileSystemResolver -chain = org.apache.ivy.plugins.resolver.ChainResolver -ibiblio= org.apache.ivy.plugins.resolver.IBiblioResolver -bintray = org.apache.ivy.plugins.resolver.BintrayResolver -url= org.apache.ivy.plugins.resolver.URLResolver -dual = org.apache.ivy.plugins.resolver.DualResolver -ivyrep = org.apache.ivy.plugins.resolver.IvyRepResolver -ssh = org.apache.ivy.plugins.resolver.SshResolver -sftp= org.apache.ivy.plugins.resolver.SFTPResolver -vsftp = org.apache.ivy.plugins.resolver.VsftpResolver -vfs = org.apache.ivy.plugins.resolver.VfsResolver -jar = org.apache.ivy.plugins.resolver.JarResolver -packager = org.apache.ivy.plugins.resolver.packager.PackagerResolver -obr = org.apache.ivy.osgi.obr.OBRResolver -mirroredurl = org.apache.ivy.plugins.resolver.MirroredURLResolver -updatesite = org.apache.ivy.osgi.updatesite.UpdateSiteResolver -osgi-agg= org.apache.ivy.osgi.repo.AggregatedOSGiResolver +# *** +# * Licensed to the Apache Software Foundation (ASF) under one +# * or more contributor license agreements. See the NOTICE file +# * distributed with this work for additional information +# * regarding copyright ownership. The ASF licenses this file +# * to you under the Apache License, Version 2.0 (the +# * "License"); you may not use this file except in compliance +# * with the License. You may obtain a copy of the License at +# * +# * http://www.apache.org/licenses/LICENSE-2.0 +# * +# * Unless required by applicable law or agreed to in writing, +# * software distributed under the License is distributed on an +# * "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. +# *** +filesystem = org.apache.ivy.plugins.resolver.FileSystemResolver +chain = org.apache.ivy.plugins.resolver.ChainResolver +ibiblio = org.apache.ivy.plugins.resolver.IBiblioResolver +bintray = org.apache.ivy.plugins.resolver.BintrayResolver +url = org.apache.ivy.plugins.resolver.URLResolver +dual= org.apache.ivy.plugins.resolver.DualResolver +ivyrep = org.apache.ivy.plugins.resolver.IvyRepResolver +ssh = org.apache.ivy.plugins.resolver.SshResolver +sftp= org.apache.ivy.plugins.resolver.SFTPResolver +vsftp = org.apache.ivy.plugins.resolver.VsftpResolver +vfs = org.apache.ivy.plugins.resolver.VfsResolver +jar = org.apache.ivy.plugins.resolver.JarResolver +packager= org.apache.ivy.plugins.resolver.packager.PackagerResolver +obr = org.apache.ivy.osgi.obr.OBRResolver +mirroredurl = org.apache.ivy.plugins.resolver.MirroredURLResolver +updatesite = org.apache.ivy.osgi.updatesite.UpdateSiteResolver +osgi-agg= org.apache.ivy.osgi.repo.AggregatedOSGiResolver latest-revision = org.apache.ivy.plugins.latest.LatestRevisionStrategy latest-lexico = org.apache.ivy.plugins.latest.LatestLexicographicStrategy latest-time = or
[2/2] ant-ivy git commit: Checkstyle: trim trailing whitespace, replace tabs
Checkstyle: trim trailing whitespace, replace tabs Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/08e1d1cc Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/08e1d1cc Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/08e1d1cc Branch: refs/heads/master Commit: 08e1d1cca882f2481c70fcf3530661084f881646 Parents: 075134d Author: Gintas Grigelionis Authored: Sat Mar 3 11:30:06 2018 +0100 Committer: Gintas Grigelionis Committed: Sat Mar 3 11:30:06 2018 +0100 -- src/etc/checkstyle/checkstyle-suppress.xml | 6 +- src/etc/checkstyle/checkstyle-text.xsl | 1 - src/etc/checkstyle/checkstyle-xdoc.xsl | 1 - src/etc/license/license-header.xml | 2 +- .../settings/ivysettings-advanced.xml | 268 --- .../settings/ivysettings-basic.xml | 22 +- .../chained-resolvers/settings/ivysettings.xml | 6 +- .../jdbc-example/src/dev.properties | 36 +- .../jdbc-example/src/prod.properties| 36 +- .../dependence/settings/ivysettings.properties | 36 +- src/example/dependence/settings/ivysettings.xml | 28 +- .../repository/commons-httpclient-ivy-2.0.2.xml | 13 +- src/example/dual/settings/ivysettings.xml | 6 +- src/example/go-ivy/build.xml| 20 +- src/example/multi-project/build.xml | 4 +- .../multi-project/common/build.properties | 36 +- .../projects/console/build.properties | 36 +- .../multi-project/projects/console/build.xml| 8 +- .../projects/find/build.properties | 36 +- .../multi-project/projects/find/build.xml | 8 +- .../projects/list/build.properties | 36 +- .../multi-project/projects/list/build.xml | 8 +- .../projects/size/build.properties | 36 +- .../multi-project/projects/size/build.xml | 8 +- .../projects/sizewhere/build.properties | 36 +- .../multi-project/projects/sizewhere/build.xml | 8 +- .../projects/version/build.properties | 36 +- .../multi-project/projects/version/build.xml| 8 +- src/example/packager-resolver/ivysettings.xml | 3 +- src/java/org/apache/ivy/ant/antlib.xml | 66 ++-- .../org/apache/ivy/core/module/id/package.html | 38 +-- .../org/apache/ivy/core/settings/ivy.properties | 38 +-- .../ivy/core/settings/ivysettings-1.4.xml | 18 +- .../core/settings/ivysettings-default-chain.xml | 14 +- .../ivy/core/settings/ivysettings-local.xml | 20 +- .../core/settings/ivysettings-main-chain.xml| 14 +- .../ivy/core/settings/ivysettings-public.xml| 8 +- .../ivy/core/settings/ivysettings-shared.xml| 20 +- .../apache/ivy/core/settings/ivysettings.xml| 14 +- .../ivy/core/settings/repository.properties | 36 +- .../apache/ivy/core/settings/typedef.properties | 106 +++--- .../ivy/osgi/core/jvm-packages.properties | 44 +-- .../circular/CircularDependencyException.java | 2 +- .../parser/m2/PomModuleDescriptorParser.java| 2 +- .../ivy/plugins/report/ivy-report-dot-all.xsl | 11 +- .../ivy/plugins/report/ivy-report-dot.xsl | 42 +-- .../ivy/plugins/report/ivy-report-graph-all.xsl | 17 +- .../ivy/plugins/report/ivy-report-graph.xsl | 19 +- .../apache/ivy/plugins/report/ivy-report.css| 259 +++--- .../apache/ivy/plugins/report/ivy-report.xsl| 341 +-- .../ivy/plugins/resolver/packager/build.xml | 2 +- 51 files changed, 949 insertions(+), 970 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/08e1d1cc/src/etc/checkstyle/checkstyle-suppress.xml -- diff --git a/src/etc/checkstyle/checkstyle-suppress.xml b/src/etc/checkstyle/checkstyle-suppress.xml index 2565f28..c531826 100644 --- a/src/etc/checkstyle/checkstyle-suppress.xml +++ b/src/etc/checkstyle/checkstyle-suppress.xml @@ -18,8 +18,8 @@ "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. --> - - \ No newline at end of file + + http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/08e1d1cc/src/etc/checkstyle/checkstyle-text.xsl -- diff --git a/src/etc/checkstyle/checkstyle-text.xsl b/src/etc/checkstyle/checkstyle-text.xsl index 333aecf..206f92d 100644 --- a/src/etc/checkstyle/checkstyle-text.xsl +++ b/src/etc/checkstyle/checkstyle-text.xsl @@ -30,4 +30,3 @@ - http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/08e1d1cc/src/etc/checkstyle/checkstyle-xdoc.xsl ---
[2/2] ant-ivy git commit: Checkstyle, continued
Checkstyle, continued
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/46c7cba7
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/46c7cba7
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/46c7cba7
Branch: refs/heads/master
Commit: 46c7cba7d0aabf179654a0a1c423343552e40210
Parents: 5c4da82
Author: Gintas Grigelionis
Authored: Mon Nov 13 15:56:43 2017 +0100
Committer: Gintas Grigelionis
Committed: Mon Nov 13 15:56:43 2017 +0100
--
.../org/apache/ivy/ant/IvyCacheFileset.java | 10 +--
.../cache/DefaultRepositoryCacheManager.java| 19 +++--
.../apache/ivy/core/deliver/DeliverOptions.java | 4 +-
.../ivy/core/retrieve/RetrieveOptions.java | 11 +--
.../ivy/plugins/repository/Repository.java | 4 +-
.../ivy/plugins/resolver/IBiblioResolver.java | 44 +-
.../plugins/resolver/LazyTimeoutConstraint.java | 33
.../org/apache/ivy/util/ChecksumHelper.java | 3 +-
src/java/org/apache/ivy/util/FileUtil.java | 29 +++
.../apache/ivy/util/url/HttpClientHandler.java | 5 +-
.../org/apache/ivy/util/url/URLHandler.java | 88 ++--
.../apache/ivy/util/url/URLHandlerRegistry.java | 5 +-
.../org/apache/ivy/LocalFileRepoOverHttp.java | 32 +++
test/java/org/apache/ivy/TestHelper.java| 63 +++---
.../ivy/ant/IvyAntSettingsBuildFileTest.java| 5 +-
.../org/apache/ivy/ant/IvyCachePathTest.java| 5 +-
.../org/apache/ivy/ant/IvyConfigureTest.java| 6 +-
.../ivy/ant/IvyDependencyUpdateCheckerTest.java | 4 +-
.../apache/ivy/ant/IvyPostResolveTaskTest.java | 7 +-
.../java/org/apache/ivy/ant/IvyResolveTest.java | 7 +-
.../core/module/descriptor/IvyMakePomTest.java | 32 +++
.../apache/ivy/core/module/id/ModuleIdTest.java | 6 +-
.../ivy/core/publish/PublishEventsTest.java | 4 +-
.../ivy/core/report/ResolveReportTest.java | 5 +-
.../apache/ivy/core/retrieve/RetrieveTest.java | 56 -
.../ivy/core/settings/IvySettingsTest.java | 6 +-
.../core/settings/XmlSettingsParserTest.java| 2 +-
.../ivy/osgi/core/OSGiManifestParserTest.java | 3 +-
.../m2/PomModuleDescriptorParserTest.java | 16 ++--
.../xml/XmlModuleDescriptorParserTest.java | 20 +++--
.../repository/vfs/VfsRepositoryTest.java | 5 +-
.../resolver/FileSystemResolverTest.java| 6 +-
.../IBiblioMavenSnapshotsResolutionTest.java| 56 -
.../plugins/resolver/PackagerResolverTest.java | 5 +-
.../plugins/resolver/ResolverTestHelper.java| 5 +-
.../ivy/plugins/resolver/URLResolverTest.java | 23 ++---
.../MavenTimedSnapshotVersionMatcherTest.java | 34
.../java/org/apache/ivy/util/TestXmlHelper.java | 37
.../ivy/util/url/HttpclientURLHandlerTest.java | 17 ++--
.../ivy/util/url/IvyAuthenticatorTest.java | 32 +++
40 files changed, 432 insertions(+), 322 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/46c7cba7/src/java/org/apache/ivy/ant/IvyCacheFileset.java
--
diff --git a/src/java/org/apache/ivy/ant/IvyCacheFileset.java
b/src/java/org/apache/ivy/ant/IvyCacheFileset.java
index 1707ddb..f610950 100644
--- a/src/java/org/apache/ivy/ant/IvyCacheFileset.java
+++ b/src/java/org/apache/ivy/ant/IvyCacheFileset.java
@@ -158,12 +158,12 @@ public class IvyCacheFileset extends IvyCacheTask {
*
*
* @param file1
- *One of the files, for which the common base directory is
being sought, may be null.
+ * One of the files, for which the common base directory is being
sought, may be null.
* @param file2
- *The other file for which the common base directory should be
returned, may be null.
- * @return the common base directory between a file1 and
file2. Returns
- * null if no common base directory could be determined or if
either file1
- * or file2 is null
+ * The other file for which the common base directory should be
returned, may be null.
+ * @return the common base directory between a file1 and
file2.
+ * Returns null if no common base directory could be determined or
if either
+ * file1 or file2 is null
*/
File getBaseDir(final File file1, final File file2) {
if (file1 == null || file2 == null) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/46c7cba7/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java
--
diff --git
a/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java
b/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java
index b2ca78c..8eda88e 100644
[1/2] ant-ivy git commit: Checkstyle, continued
Repository: ant-ivy
Updated Branches:
refs/heads/master 5c4da8278 -> 46c7cba7d
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/46c7cba7/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java
--
diff --git a/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java
b/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java
index a9dadbb..97e98b5 100644
--- a/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java
@@ -231,11 +231,12 @@ public class URLResolverTest extends
AbstractDependencyResolverTest {
assertTrue(repoRoot + " is not a directory",
Files.isDirectory(repoRoot));
final DependencyDescriptor dependency = new
DefaultDependencyDescriptor(ModuleRevisionId.newInstance("org1", "mod1.1",
"2.0"), false);
try (final AutoCloseable httpServer =
TestHelper.createHttpServerBackedRepository(fastServerBindAddr, contextRoot,
repoRoot)) {
-final String ivyPattern = "http://"; +
fastServerBindAddr.getHostName() + ":" + fastServerBindAddr.getPort() +
-
"/testTimeouts/[organisation]/[module]/ivys/ivy-[revision].xml";
-final String artifactPattern = "http://"; +
fastServerBindAddr.getHostName() + ":" + fastServerBindAddr.getPort() +
-
"/testTimeouts/[organisation]/[module]/[type]s/[artifact]-[revision].[type]";
-// first use a resolver with a high timeout to make sure it can
actually fetch the resources
+final String ivyPattern = "http://"; +
fastServerBindAddr.getHostName() + ":" + fastServerBindAddr.getPort()
++
"/testTimeouts/[organisation]/[module]/ivys/ivy-[revision].xml";
+final String artifactPattern = "http://"; +
fastServerBindAddr.getHostName() + ":" + fastServerBindAddr.getPort()
++
"/testTimeouts/[organisation]/[module]/[type]s/[artifact]-[revision].[type]";
+// first use a resolver with a high timeout to make sure
+// it can actually fetch the resources
final URLResolver highTimeoutResolver = new URLResolver();
highTimeoutResolver.setName("high-timeout-resolver");
highTimeoutResolver.setAllownomd(false);
@@ -256,18 +257,18 @@ public class URLResolverTest extends
AbstractDependencyResolverTest {
assertEquals("Unexpected dependency resolved by resolver " +
highTimeoutResolver.getName(), dependency.getDependencyRevisionId(),
resolvedModule.getId());
}
-// now test this whole fetch using a resolver with a very low
connection timeout and by starting the repo server
-// with a delay so that the connection request can timeout
+// now test this whole fetch using a resolver with a very low
connection timeout and
+// by starting the repo server with a delay so that the connection
request can timeout
// clean the cache before testing to ensure the resource isn't fetched
from cache
settings.getDefaultRepositoryCacheManager().clean();
settings.getResolutionCacheManager().clean();
final InetSocketAddress slowServerAddr = new
InetSocketAddress("localhost", 23456);
-final String ivyPattern = "http://"; + slowServerAddr.getHostName() +
":" + slowServerAddr.getPort() +
-
"/testTimeouts/[organisation]/[module]/ivys/ivy-[revision].xml";
-final String artifactPattern = "http://"; +
slowServerAddr.getHostName() + ":" + slowServerAddr.getPort() +
-
"/testTimeouts/[organisation]/[module]/[type]s/[artifact]-[revision].[type]";
+final String ivyPattern = "http://"; + slowServerAddr.getHostName() +
":" + slowServerAddr.getPort()
++
"/testTimeouts/[organisation]/[module]/ivys/ivy-[revision].xml";
+final String artifactPattern = "http://"; +
slowServerAddr.getHostName() + ":" + slowServerAddr.getPort()
++
"/testTimeouts/[organisation]/[module]/[type]s/[artifact]-[revision].[type]";
final URLResolver lowTimeoutResolver = new URLResolver();
lowTimeoutResolver.setAllownomd(false);
lowTimeoutResolver.setName("low-timeout-resolver");
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/46c7cba7/test/java/org/apache/ivy/plugins/version/MavenTimedSnapshotVersionMatcherTest.java
--
diff --git
a/test/java/org/apache/ivy/plugins/version/MavenTimedSnapshotVersionMatcherTest.java
b/test/java/org/apache/ivy/plugins/version/MavenTimedSnapshotVersionMatcherTest.java
index cf97ff5..f984a62 100644
---
a/test/java/org/apache/ivy/plugins/version/MavenTimedSnapshotVersionMatcherTest.java
+++
b/test/java/org/apache/ivy/plugins/version/MavenTimedSnapshotVersionMatcherTest.java
@@ -1,18 +1,19 @@
/*
- * Licensed to the Apache Software Foundation
ant-ivy git commit: Checkstyle
Repository: ant-ivy
Updated Branches:
refs/heads/master 102907855 -> 5c4da8278
Checkstyle
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/5c4da827
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/5c4da827
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/5c4da827
Branch: refs/heads/master
Commit: 5c4da82785513c3a904726e3207299e75e290d75
Parents: 1029078
Author: Gintas Grigelionis
Authored: Sun Nov 12 21:44:56 2017 +0100
Committer: Gintas Grigelionis
Committed: Sun Nov 12 21:44:56 2017 +0100
--
asciidoc/settings/timeout-constraint.adoc | 6 +-
.../core/settings/NamedTimeoutConstraint.java | 29
.../ivy/core/settings/TimeoutConstraint.java| 50 +++---
.../parser/m2/PomModuleDescriptorParser.java| 8 +--
.../parser/xml/XmlModuleDescriptorUpdater.java | 8 +--
.../ivy/plugins/resolver/AbstractResolver.java | 8 +--
.../MavenTimedSnapshotVersionMatcher.java | 71 +++-
.../java/org/apache/ivy/ant/IvyPublishTest.java | 5 +-
8 files changed, 101 insertions(+), 84 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5c4da827/asciidoc/settings/timeout-constraint.adoc
--
diff --git a/asciidoc/settings/timeout-constraint.adoc
b/asciidoc/settings/timeout-constraint.adoc
index 27c442b..1cd5090 100644
--- a/asciidoc/settings/timeout-constraint.adoc
+++ b/asciidoc/settings/timeout-constraint.adoc
@@ -53,9 +53,9 @@ A value less than `0` lets the users of this timeout
constraint decide what sema
Here we see 4 timeout constraints defined:
-- `test-timeout-1` uses a connection timeout of 200 milli seconds and read
timeout of 500 milli seconds.
-- `test-timeout-2` uses a read timeout of 20 milli seconds and lets the
connection timeout default to -1.
-- `test-timeout-3` uses a connection timeout of 400 milli seconds and lets
the read timeout default to -1.
+- `test-timeout-1` uses a connection timeout of 200 milliseconds and read
timeout of 500 milliseconds.
+- `test-timeout-2` uses a read timeout of 20 milliseconds and lets the
connection timeout default to -1.
+- `test-timeout-3` uses a connection timeout of 400 milliseconds and lets
the read timeout default to -1.
- `test-timeout-4` lets both the connection timeout and read timeout
default to -1.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5c4da827/src/java/org/apache/ivy/core/settings/NamedTimeoutConstraint.java
--
diff --git a/src/java/org/apache/ivy/core/settings/NamedTimeoutConstraint.java
b/src/java/org/apache/ivy/core/settings/NamedTimeoutConstraint.java
index 7c9d62c..6359530 100644
--- a/src/java/org/apache/ivy/core/settings/NamedTimeoutConstraint.java
+++ b/src/java/org/apache/ivy/core/settings/NamedTimeoutConstraint.java
@@ -1,18 +1,19 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- *http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "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.
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "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.
*/
package org.apache.ivy.core.settings;
@@ -62,7 +63,7 @@ public class NamedTimeoutConstraint implements
TimeoutConstraint {
/**
* Sets the connection timeout of this timeout constraint
- * @param connect
ant-ivy git commit: Checkstyle: modifiers in interfaces
Repository: ant-ivy
Updated Branches:
refs/heads/master ada0a22ac -> e292769f2
Checkstyle: modifiers in interfaces
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/e292769f
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/e292769f
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/e292769f
Branch: refs/heads/master
Commit: e292769f29748054e1e364ee3e7d442c709447b6
Parents: ada0a22
Author: Gintas Grigelionis
Authored: Tue Oct 31 21:52:58 2017 +0100
Committer: Gintas Grigelionis
Committed: Tue Oct 31 21:52:58 2017 +0100
--
.../apache/ivy/core/cache/DownloadListener.java | 6 ++--
.../core/cache/ModuleDescriptorProvider.java| 2 +-
.../ivy/core/cache/ModuleDescriptorWriter.java | 2 +-
.../org/apache/ivy/core/event/IvyListener.java | 2 +-
.../module/descriptor/ConfigurationAware.java | 4 +--
.../DependencyArtifactDescriptor.java | 12 +++
.../module/descriptor/DependencyDescriptor.java | 2 +-
.../ivy/core/module/descriptor/ExcludeRule.java | 6 ++--
.../module/descriptor/ExtendsDescriptor.java| 22 ++--
.../ivy/core/module/descriptor/IncludeRule.java | 6 ++--
.../core/module/descriptor/InheritableItem.java | 2 +-
.../module/descriptor/ModuleDescriptor.java | 8 ++---
.../RepositoryManagementEngineSettings.java | 2 +-
.../ivy/core/settings/IvyVariableContainer.java | 8 ++---
.../apache/ivy/core/settings/Validatable.java | 2 +-
.../core/sort/NonMatchingVersionReporter.java | 2 +-
.../ivy/core/sort/SortEngineSettings.java | 4 +--
.../org/apache/ivy/plugins/matcher/Matcher.java | 4 +--
.../ivy/plugins/matcher/PatternMatcher.java | 14
.../plugins/namespace/NamespaceTransformer.java | 4 +--
.../plugins/parser/ModuleDescriptorParser.java | 12 +++
.../ivy/plugins/parser/m2/PomDependencyMgt.java | 10 +++---
.../ivy/plugins/report/ReportOutputter.java | 8 ++---
.../repository/ArtifactResourceResolver.java| 2 +-
.../plugins/repository/LocalizableResource.java | 2 +-
.../apache/ivy/plugins/repository/Resource.java | 14
.../plugins/repository/ResourceDownloader.java | 2 +-
.../ivy/plugins/resolver/IBiblioResolver.java | 2 +-
.../resolver/util/HasLatestStrategy.java| 6 ++--
.../ivy/tools/analyser/DependencyAnalyser.java | 2 +-
src/java/org/apache/ivy/util/FileResolver.java | 2 +-
src/java/org/apache/ivy/util/MessageLogger.java | 38 ++--
32 files changed, 107 insertions(+), 107 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e292769f/src/java/org/apache/ivy/core/cache/DownloadListener.java
--
diff --git a/src/java/org/apache/ivy/core/cache/DownloadListener.java
b/src/java/org/apache/ivy/core/cache/DownloadListener.java
index 50f7741..2594fc4 100644
--- a/src/java/org/apache/ivy/core/cache/DownloadListener.java
+++ b/src/java/org/apache/ivy/core/cache/DownloadListener.java
@@ -24,11 +24,11 @@ import org.apache.ivy.core.report.ArtifactDownloadReport;
import org.apache.ivy.plugins.resolver.util.ResolvedResource;
public interface DownloadListener {
-public void needArtifact(RepositoryCacheManager cache, Artifact artifact);
+void needArtifact(RepositoryCacheManager cache, Artifact artifact);
-public void startArtifactDownload(RepositoryCacheManager cache,
ResolvedResource rres,
+void startArtifactDownload(RepositoryCacheManager cache, ResolvedResource
rres,
Artifact artifact, ArtifactOrigin origin);
-public void endArtifactDownload(RepositoryCacheManager cache, Artifact
artifact,
+void endArtifactDownload(RepositoryCacheManager cache, Artifact artifact,
ArtifactDownloadReport adr, File archiveFile);
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e292769f/src/java/org/apache/ivy/core/cache/ModuleDescriptorProvider.java
--
diff --git a/src/java/org/apache/ivy/core/cache/ModuleDescriptorProvider.java
b/src/java/org/apache/ivy/core/cache/ModuleDescriptorProvider.java
index 96cae4d..4f09717 100644
--- a/src/java/org/apache/ivy/core/cache/ModuleDescriptorProvider.java
+++ b/src/java/org/apache/ivy/core/cache/ModuleDescriptorProvider.java
@@ -26,6 +26,6 @@ import org.apache.ivy.plugins.parser.ParserSettings;
interface ModuleDescriptorProvider {
-public ModuleDescriptor provideModule(ParserSettings ivySettings, File
descriptorFile,
+ModuleDescriptor provideModule(ParserSettings ivySettings, File
descriptorFile,
boolean validate) throws ParseException, IOException;
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e292769f/src/java/org/apache/ivy/core/cache/ModuleDescriptorWriter.java
[08/18] ant-ivy git commit: Checkstyle-driven cleanup (whitespace, javadoc, JLS)
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java
--
diff --git a/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java
b/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java
index 914757f..f086822 100644
--- a/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java
+++ b/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java
@@ -120,6 +120,7 @@ public class VfsRepository extends AbstractRepository {
*
* @param vfsURI
*a String identifying a VFS Resource
+ * @return Resource
* @throws IOException on failure
* @see "Supported File Systems in the jakarta-commons-vfs documentation"
*/
@@ -162,6 +163,7 @@ public class VfsRepository extends AbstractRepository {
*
* @param vfsURI
*providing identifying a VFS provided resource
+ * @return List
* @throws IOException
* on failure.
* @see "Supported File Systems in the jakarta-commons-vfs documentation"
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java
--
diff --git
a/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java
b/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java
index ff99b8e..e493cce 100644
---
a/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java
+++
b/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java
@@ -272,7 +272,7 @@ public abstract class AbstractPatternsBasedResolver extends
BasicResolver {
/**
* example of pattern : ~/Workspace/[module]/[module].ivy.xml
- *
+ *
* @param pattern String
*/
public void addIvyPattern(String pattern) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java
--
diff --git a/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java
b/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java
index b310ed8..ed8a3d9 100644
--- a/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java
+++ b/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java
@@ -133,7 +133,7 @@ public abstract class AbstractResolver implements
DependencyResolver, HasLatestS
/**
* this method should remove sensitive information from a location to be
displayed in a log
- *
+ *
* @param name
*location
* @return location with sensitive data replaced by stars
@@ -206,6 +206,10 @@ public abstract class AbstractResolver implements
DependencyResolver, HasLatestS
/**
* Default implementation downloads the artifact without taking advantage
of its location
+ *
+ * @param artifact ArtifactOrigin
+ * @param options DownloadOptions
+ * @return ArtifactDownloadReport
*/
public ArtifactDownloadReport download(ArtifactOrigin artifact,
DownloadOptions options) {
DownloadReport r = download(new Artifact[] {artifact.getArtifact()},
options);
@@ -219,6 +223,9 @@ public abstract class AbstractResolver implements
DependencyResolver, HasLatestS
/**
* Default implementation actually download the artifact Subclasses should
overwrite this to
* avoid the download
+ *
+ * @param artifact ArtifactOrigin
+ * @return ArtifactOrigin
*/
public ArtifactOrigin locate(Artifact artifact) {
DownloadReport dr = download(new Artifact[] {artifact}, new
DownloadOptions());
@@ -498,7 +505,7 @@ public abstract class AbstractResolver implements
DependencyResolver, HasLatestS
/**
* Returns true if rmr1 is after rmr2, using the latest strategy to
determine which is the
* latest
- *
+ *
* @param rmr1 ResolvedModuleRevision
* @param rmr2 ResolvedModuleRevision
* @param date Date
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/plugins/resolver/AbstractWorkspaceResolver.java
--
diff --git
a/src/java/org/apache/ivy/plugins/resolver/AbstractWorkspaceResolver.java
b/src/java/org/apache/ivy/plugins/resolver/AbstractWorkspaceResolver.java
index 5444ab0..016bd99 100644
--- a/src/java/org/apache/ivy/plugins/resolver/AbstractWorkspaceResolver.java
+++ b/src/java/org/apache/ivy/plugins/resolver/AbstractWorkspaceResolver.java
@@ -226,7 +226,7 @@ public abstract class AbstractWorkspaceResolver extends
AbstractResolver {
return newMd;
}
-abstract protected List
createWorkspaceArtifacts(ModuleDescriptor md);
+protected abstract List
[09/18] ant-ivy git commit: Checkstyle-driven cleanup (whitespace, javadoc, JLS)
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/core/event/resolve/EndResolveDependencyEvent.java
--
diff --git
a/src/java/org/apache/ivy/core/event/resolve/EndResolveDependencyEvent.java
b/src/java/org/apache/ivy/core/event/resolve/EndResolveDependencyEvent.java
index 3f01d10..66a8843 100644
--- a/src/java/org/apache/ivy/core/event/resolve/EndResolveDependencyEvent.java
+++ b/src/java/org/apache/ivy/core/event/resolve/EndResolveDependencyEvent.java
@@ -65,7 +65,7 @@ public class EndResolveDependencyEvent extends
ResolveDependencyEvent {
* dependency management. It's basically the time elapsed since the
corresponding
* {@link StartResolveDependencyEvent}
*
- *
+ *
* @return the time elapsed to resolve the dependency.
*/
public long getDuration() {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/core/event/retrieve/EndRetrieveEvent.java
--
diff --git a/src/java/org/apache/ivy/core/event/retrieve/EndRetrieveEvent.java
b/src/java/org/apache/ivy/core/event/retrieve/EndRetrieveEvent.java
index ad0514b..b38781f 100644
--- a/src/java/org/apache/ivy/core/event/retrieve/EndRetrieveEvent.java
+++ b/src/java/org/apache/ivy/core/event/retrieve/EndRetrieveEvent.java
@@ -47,7 +47,7 @@ public class EndRetrieveEvent extends RetrieveEvent {
/**
* Duration of the retrieve operation, in ms.
- *
+ *
* @return Duration of the retrieve operation, in ms.
*/
public long getDuration() {
@@ -56,7 +56,7 @@ public class EndRetrieveEvent extends RetrieveEvent {
/**
* Number of artifacts which were copied (or symlinked) during the retrieve
- *
+ *
* @return Number of artifacts which were copied during the retrieve.
*/
public int getNbCopied() {
@@ -65,7 +65,7 @@ public class EndRetrieveEvent extends RetrieveEvent {
/**
* Number of artifacts which were not copied since they were already
present and up to date.
- *
+ *
* @return Number of artifacts which were not copied since they were
already present and up to
* date.
*/
@@ -75,7 +75,7 @@ public class EndRetrieveEvent extends RetrieveEvent {
/**
* Total size of all copied (or symlinked) artifacts, in bytes.
- *
+ *
* @return Total size of all copied (or symlinked) artifacts, in bytes.
*/
public long getTotalCopiedSize() {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/core/module/descriptor/AbstractIncludeExcludeRule.java
--
diff --git
a/src/java/org/apache/ivy/core/module/descriptor/AbstractIncludeExcludeRule.java
b/src/java/org/apache/ivy/core/module/descriptor/AbstractIncludeExcludeRule.java
index 607690c..6c29ad2 100644
---
a/src/java/org/apache/ivy/core/module/descriptor/AbstractIncludeExcludeRule.java
+++
b/src/java/org/apache/ivy/core/module/descriptor/AbstractIncludeExcludeRule.java
@@ -69,7 +69,7 @@ public abstract class AbstractIncludeExcludeRule extends
UnmodifiableExtendableI
/**
* Add a configuration for this rule
- *
+ *
* @param conf String
*/
public void addConfiguration(String conf) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/core/module/descriptor/Artifact.java
--
diff --git a/src/java/org/apache/ivy/core/module/descriptor/Artifact.java
b/src/java/org/apache/ivy/core/module/descriptor/Artifact.java
index 3797839..648e374 100644
--- a/src/java/org/apache/ivy/core/module/descriptor/Artifact.java
+++ b/src/java/org/apache/ivy/core/module/descriptor/Artifact.java
@@ -33,28 +33,28 @@ public interface Artifact extends ExtendableItem {
/**
* Returns the resolved module revision id for this artifact
- *
+ *
* @return the resolved module revision id.
*/
ModuleRevisionId getModuleRevisionId();
/**
* Returns the resolved publication date for this artifact
- *
+ *
* @return the resolved publication date. Never null.
*/
Date getPublicationDate();
/**
* Return the name of the artifact, generally 'part' of the basename of
the file.
- *
+ *
* @return the name of the artifact. Never null.
*/
String getName();
/**
* Returns the type of the artifact, typically 'jar', 'source', 'javadoc',
'debian', ...
- *
+ *
* @return the type of the artifact. Never null.
*/
String getType();
@@ -62,7 +62,7 @@ public interface Artifact extends ExtendableItem {
/**
* Retrieve the extension of the artifact. The extension is without dot
(ie. 'jar' and not
[10/18] ant-ivy git commit: Checkstyle-driven cleanup (whitespace, javadoc, JLS)
Checkstyle-driven cleanup (whitespace, javadoc, JLS) Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/ef719aca Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/ef719aca Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/ef719aca Branch: refs/heads/master Commit: ef719acab90fdda24427d058d5d8aa15d13c7ced Parents: 57ee0f2 Author: twogee Authored: Sat Jun 3 11:42:00 2017 +0200 Committer: twogee Committed: Sat Jun 3 11:47:51 2017 +0200 -- build-release.xml | 266 +-- .../src/example/Hello.java | 8 +- .../src/example/ConfigurationsExample.java | 8 +- .../src/filter/FilterProvider.java | 4 +- .../src/filter/ccimpl/CCFilter.java | 2 +- .../src/filter/hmimpl/HMFilter.java | 2 +- .../test/filter/AbstractTestFilter.java | 4 +- .../multi-projects/myapp/src/myapp/Main.java| 4 +- .../dependee/src/standalone/Main.java | 8 +- .../dependence/depender/src/depending/Main.java | 6 +- src/example/dual/project/src/example/Hello.java | 14 +- src/example/hello-ivy/src/example/Hello.java| 10 +- .../projects/console/src/console/Main.java | 10 +- .../projects/find/src/find/FindFile.java| 8 +- .../projects/find/src/find/Main.java| 14 +- .../projects/list/src/list/ListFile.java| 8 +- .../projects/list/src/list/Main.java| 14 +- .../projects/size/src/size/FileSize.java| 6 +- .../projects/sizewhere/src/sizewhere/Main.java | 14 +- .../sizewhere/src/sizewhere/SizeWhere.java | 4 +- .../projects/version/src/version/Version.java | 6 +- src/java/org/apache/ivy/Main.java | 2 +- src/java/org/apache/ivy/ant/AntCallTrigger.java | 6 +- .../org/apache/ivy/ant/AntMessageLogger.java| 4 +- .../apache/ivy/ant/IvyAntVariableContainer.java | 4 +- .../org/apache/ivy/ant/IvyCacheFileset.java | 4 +- src/java/org/apache/ivy/ant/IvyCheck.java | 2 +- src/java/org/apache/ivy/ant/IvyCleanCache.java | 4 +- src/java/org/apache/ivy/core/IvyThread.java | 2 +- .../apache/ivy/core/cache/ArtifactOrigin.java | 4 +- .../org/apache/ivy/core/cache/CacheUtil.java| 4 +- .../cache/DefaultResolutionCacheManager.java| 4 +- .../core/cache/ModuleDescriptorMemoryCache.java | 2 +- .../ivy/core/cache/RepositoryCacheManager.java | 65 +++-- .../PublishingDependencyRevisionResolver.java | 2 +- .../event/publish/EndArtifactPublishEvent.java | 2 +- .../ivy/core/event/publish/PublishEvent.java| 2 +- .../publish/StartArtifactPublishEvent.java | 2 +- .../resolve/EndResolveDependencyEvent.java | 2 +- .../core/event/retrieve/EndRetrieveEvent.java | 8 +- .../descriptor/AbstractIncludeExcludeRule.java | 2 +- .../ivy/core/module/descriptor/Artifact.java| 18 +- .../core/module/descriptor/Configuration.java | 6 +- .../module/descriptor/ConfigurationAware.java | 4 +- .../module/descriptor/ConfigurationGroup.java | 4 +- .../descriptor/ConfigurationIntersection.java | 4 +- .../DefaultDependencyArtifactDescriptor.java| 2 +- .../descriptor/DefaultDependencyDescriptor.java | 11 +- .../descriptor/DefaultModuleDescriptor.java | 5 +- .../DependencyDescriptorMediator.java | 2 +- .../ivy/core/module/descriptor/ExcludeRule.java | 6 +- .../ivy/core/module/descriptor/IncludeRule.java | 6 +- .../core/module/descriptor/InheritableItem.java | 2 +- .../module/descriptor/ModuleDescriptor.java | 10 +- .../OverrideDependencyDescriptorMediator.java | 6 +- .../ivy/core/module/id/ArtifactRevisionId.java | 2 +- .../org/apache/ivy/core/module/id/ModuleId.java | 22 +- .../ivy/core/module/id/ModuleRevisionId.java| 8 +- .../apache/ivy/core/module/id/ModuleRules.java | 20 +- .../apache/ivy/core/publish/PublishOptions.java | 2 +- .../ivy/core/report/ArtifactDownloadReport.java | 4 +- .../report/MetadataArtifactDownloadReport.java | 4 +- .../repository/RepositoryManagementEngine.java | 8 +- .../apache/ivy/core/resolve/ResolveData.java| 10 +- .../core/resolve/ResolvedModuleRevision.java| 14 +- .../ivy/core/retrieve/RetrieveOptions.java | 2 +- .../apache/ivy/core/settings/IvySettings.java | 4 + .../ivy/core/settings/IvyVariableContainer.java | 2 +- .../core/settings/IvyVariableContainerImpl.java | 4 +- .../apache/ivy/core/settings/Validatable.java | 2 +- .../org/apache/ivy/core/sort/ModuleInSort.java | 10 +- .../core/sort/NonMatchingVersionReporter.java | 2 +- .../org/apache/ivy/core/sort/SortEngine.java| 4 +- .../org/apache/ivy/osgi/core/BundleInfo.java| 4 +- .../ivy/osgi/core/ManifestHeaderValue.java | 6 +- .../apache/ivy/osgi/core/Man
