You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2017/11/10 18:04:38 UTC

[1/6] ant-ivy git commit: FindBugs: iterate entry sets

Repository: ant-ivy
Updated Branches:
  refs/heads/master f36294048 -> 896daf14e


FindBugs: iterate entry sets

Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/c9476769
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/c9476769
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/c9476769

Branch: refs/heads/master
Commit: c947676916c99f2feb5e183aef9629a1b21d863f
Parents: f362940
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Fri Nov 10 18:59:01 2017 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Fri Nov 10 18:59:01 2017 +0100

----------------------------------------------------------------------
 .../org/apache/ivy/core/resolve/IvyNodeEviction.java    |  4 +---
 .../org/apache/ivy/core/settings/XmlSettingsParser.java |  4 ++--
 src/java/org/apache/ivy/util/Configurator.java          | 12 +++++-------
 3 files changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c9476769/src/java/org/apache/ivy/core/resolve/IvyNodeEviction.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/resolve/IvyNodeEviction.java b/src/java/org/apache/ivy/core/resolve/IvyNodeEviction.java
index abd135c..c3957ad 100644
--- a/src/java/org/apache/ivy/core/resolve/IvyNodeEviction.java
+++ b/src/java/org/apache/ivy/core/resolve/IvyNodeEviction.java
@@ -309,9 +309,7 @@ public class IvyNodeEviction {
         // check if it was evicted by a node that we are now the real node for
         Iterator<String> iter = evicted.keySet().iterator();
         while (iter.hasNext()) {
-            String rootModuleConf = iter.next();
-            EvictionData ed = evicted.get(rootModuleConf);
-            Collection<IvyNode> sel = ed.getSelected();
+            Collection<IvyNode> sel = evicted.get(iter.next()).getSelected();
             if (sel != null) {
                 for (IvyNode n : sel) {
                     if (n.getRealNode().equals(node)) {

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c9476769/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java b/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java
index 6f0631c..7cdaf26 100644
--- a/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java
+++ b/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java
@@ -595,8 +595,8 @@ public class XmlSettingsParser extends DefaultHandler {
             configurator.addChild(qName, child);
         } else {
             configurator.startCreateChild(qName);
-            for (String attName : attributes.keySet()) {
-                configurator.setAttribute(attName, attributes.get(attName));
+            for (Map.Entry<String, String> attribute : attributes.entrySet()) {
+                configurator.setAttribute(attribute.getKey(), attribute.getValue());
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c9476769/src/java/org/apache/ivy/util/Configurator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/Configurator.java b/src/java/org/apache/ivy/util/Configurator.java
index 961f3c6..b0a45c3 100644
--- a/src/java/org/apache/ivy/util/Configurator.java
+++ b/src/java/org/apache/ivy/util/Configurator.java
@@ -224,10 +224,8 @@ public class Configurator {
                 return macroRecord.getObject();
             }
             conf.startCreateChild(macroRecord.getName());
-            Map<String, String> attributes = macroRecord.getAttributes();
-            for (String attName : attributes.keySet()) {
-                String attValue = replaceParam(attributes.get(attName), attValues);
-                conf.setAttribute(attName, attValue);
+            for (Map.Entry<String, String> attribute : macroRecord.getAttributes().entrySet()) {
+                conf.setAttribute(attribute.getKey(), replaceParam(attribute.getValue(), attValues));
             }
             for (MacroRecord child : macroRecord.getChildren()) {
                 Element elt = elements.get(child.getName());
@@ -405,9 +403,9 @@ public class Configurator {
             if (m != null) {
                 return m;
             }
-            for (Class<?> clazz : typeMethods.keySet()) {
-                if (clazz.isAssignableFrom(type)) {
-                    return typeMethods.get(clazz);
+            for (Map.Entry<Class<?>, Method> method : typeMethods.entrySet()) {
+                if (method.getKey().isAssignableFrom(type)) {
+                    return method.getValue();
                 }
             }
             return null;


[4/6] ant-ivy git commit: FindBugs: deprecate static DateFormat

Posted by gi...@apache.org.
FindBugs: deprecate static DateFormat

Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/06005610
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/06005610
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/06005610

Branch: refs/heads/master
Commit: 06005610265c342b52051b997a43ad6e963c5a0f
Parents: ca7f64f
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Fri Nov 10 19:02:19 2017 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Fri Nov 10 19:02:19 2017 +0100

----------------------------------------------------------------------
 src/java/org/apache/ivy/plugins/resolver/BasicResolver.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/06005610/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java b/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java
index 81344d4..c2f24d2 100644
--- a/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java
+++ b/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java
@@ -77,6 +77,7 @@ import org.apache.ivy.plugins.resolver.util.ResourceMDParser;
 import org.apache.ivy.plugins.version.VersionMatcher;
 import org.apache.ivy.util.Checks;
 import org.apache.ivy.util.ChecksumHelper;
+import org.apache.ivy.util.DateUtil;
 import org.apache.ivy.util.HostUtil;
 import org.apache.ivy.util.Message;
 
@@ -130,7 +131,9 @@ public abstract class BasicResolver extends AbstractResolver {
         }
     }
 
-    public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyyMMddHHmmss");
+    @Deprecated
+    public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat(
+            DateUtil.DATE_FORMAT_PATTERN);
 
     private String workspaceName;
 


[5/6] ant-ivy git commit: Refactor append()

Posted by gi...@apache.org.
Refactor append()

Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/0c0845e9
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/0c0845e9
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/0c0845e9

Branch: refs/heads/master
Commit: 0c0845e95cfc5d4bf0909e4ad86be9da5b00b277
Parents: 0600561
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Fri Nov 10 19:03:13 2017 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Fri Nov 10 19:03:13 2017 +0100

----------------------------------------------------------------------
 .../apache/ivy/osgi/core/BundleInfoAdapter.java | 21 +++------
 .../org/apache/ivy/osgi/util/VersionRange.java  | 23 ++++------
 .../ivy/plugins/resolver/BasicResolver.java     | 46 +++++++++++---------
 src/java/org/apache/ivy/util/HexEncoder.java    |  3 +-
 4 files changed, 41 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c0845e9/src/java/org/apache/ivy/osgi/core/BundleInfoAdapter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/core/BundleInfoAdapter.java b/src/java/org/apache/ivy/osgi/core/BundleInfoAdapter.java
index b8607d5..ee56614 100644
--- a/src/java/org/apache/ivy/osgi/core/BundleInfoAdapter.java
+++ b/src/java/org/apache/ivy/osgi/core/BundleInfoAdapter.java
@@ -224,30 +224,21 @@ public class BundleInfoAdapter {
     private static URI asIvyURI(String org, String name, String branch, String rev, String type,
             String art, String ext) {
         StringBuilder builder = new StringBuilder();
-        builder.append("ivy:///");
-        builder.append(org);
-        builder.append('/');
-        builder.append(name);
-        builder.append('?');
+        builder.append("ivy:///").append(org).append('/').append(name).append('?');
         if (branch != null) {
-            builder.append("branch=");
-            builder.append(branch);
+            builder.append("branch=").append(branch);
         }
         if (rev != null) {
-            builder.append("&rev=");
-            builder.append(rev);
+            builder.append("&rev=").append(rev);
         }
         if (type != null) {
-            builder.append("&type=");
-            builder.append(type);
+            builder.append("&type=").append(type);
         }
         if (art != null) {
-            builder.append("&art=");
-            builder.append(art);
+            builder.append("&art=").append(art);
         }
         if (ext != null) {
-            builder.append("&ext=");
-            builder.append(ext);
+            builder.append("&ext=").append(ext);
         }
         try {
             return new URI(builder.toString());

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c0845e9/src/java/org/apache/ivy/osgi/util/VersionRange.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/util/VersionRange.java b/src/java/org/apache/ivy/osgi/util/VersionRange.java
index abf9c74..9af6213 100644
--- a/src/java/org/apache/ivy/osgi/util/VersionRange.java
+++ b/src/java/org/apache/ivy/osgi/util/VersionRange.java
@@ -264,26 +264,21 @@ public class VersionRange {
     }
 
     public String toString() {
-        return (startExclusive ? "(" : "[") + startVersion + ","
+        return (startExclusive ? "(" : "[") + startVersion.toString() + ","
                 + (endVersion == null ? "" : endVersion.toString()) + (endExclusive ? ")" : "]");
     }
 
     public String toIvyRevision() {
         StringBuilder buffer = new StringBuilder();
-        buffer.append(startExclusive ? "(" : "[");
-        buffer.append(startVersion);
-        if (endVersion == null) {
-            buffer.append(",)");
-        } else if (!endExclusive || startVersion.equals(endVersion)) {
-            buffer.append(",");
-            buffer.append(endVersion.withNudgedPatch());
-            buffer.append(")");
-        } else {
-            buffer.append(",");
-            buffer.append(endVersion);
-            buffer.append(")");
+        buffer.append(startExclusive ? "(" : "[").append(startVersion).append(",");
+        if (endVersion != null) {
+            if (!endExclusive || startVersion.equals(endVersion)) {
+                buffer.append(endVersion.withNudgedPatch());
+            } else {
+                buffer.append(endVersion);
+            }
         }
-        return buffer.toString();
+        return buffer.append(")").toString();
     }
 
     public boolean isEndExclusive() {

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c0845e9/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java b/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java
index c2f24d2..8ddfc7d 100644
--- a/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java
+++ b/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java
@@ -585,50 +585,54 @@ public abstract class BasicResolver extends AbstractResolver {
         boolean ok = true;
         StringBuilder errors = new StringBuilder();
         if (!mrid.getOrganisation().equals(md.getModuleRevisionId().getOrganisation())) {
-            Message.error("\t" + getName() + ": bad organisation found in " + ivyRef.getResource()
-                    + ": expected='" + mrid.getOrganisation() + "' found='"
-                    + md.getModuleRevisionId().getOrganisation() + "'");
-            errors.append("bad organisation: expected='").append(mrid.getOrganisation()).append("' found='").append(md.getModuleRevisionId().getOrganisation()).append("'; ");
+            Message.error(String.format("\t%s: bad organisation found in %s: expected='%s' found='%s'",
+                    getName(), ivyRef.getResource(), mrid.getOrganisation(),
+                    md.getModuleRevisionId().getOrganisation()));
+            errors.append("bad organisation: expected='").append(mrid.getOrganisation())
+                    .append("' found='").append(md.getModuleRevisionId().getOrganisation()).append("'; ");
             ok = false;
         }
         if (!mrid.getName().equals(md.getModuleRevisionId().getName())) {
-            Message.error("\t" + getName() + ": bad module name found in " + ivyRef.getResource()
-                    + ": expected='" + mrid.getName() + " found='"
-                    + md.getModuleRevisionId().getName() + "'");
-            errors.append("bad module name: expected='").append(mrid.getName()).append("' found='").append(md.getModuleRevisionId().getName()).append("'; ");
+            Message.error(String.format("\t%s: bad module name found in %s: expected='%s found='%s'",
+                    getName(), ivyRef.getResource(), mrid.getName(),
+                    md.getModuleRevisionId().getName()));
+            errors.append("bad module name: expected='").append(mrid.getName()).append("' found='")
+                    .append(md.getModuleRevisionId().getName()).append("'; ");
             ok = false;
         }
         if (mrid.getBranch() != null
                 && !mrid.getBranch().equals(md.getModuleRevisionId().getBranch())) {
-            Message.error("\t" + getName() + ": bad branch name found in " + ivyRef.getResource()
-                    + ": expected='" + mrid.getBranch() + " found='"
-                    + md.getModuleRevisionId().getBranch() + "'");
-            errors.append("bad branch name: expected='").append(mrid.getBranch()).append("' found='").append(md.getModuleRevisionId().getBranch()).append("'; ");
+            Message.error(String.format("\t%s: bad branch name found in %s: expected='%s found='%s'",
+                    getName(), ivyRef.getResource(), mrid.getBranch(),
+                    md.getModuleRevisionId().getBranch()));
+            errors.append("bad branch name: expected='").append(mrid.getBranch()).append("' found='")
+                    .append(md.getModuleRevisionId().getBranch()).append("'; ");
             ok = false;
         }
         if (ivyRef.getRevision() != null && !ivyRef.getRevision().startsWith("working@")
                 && !mrid.getRevision().equals(md.getModuleRevisionId().getRevision())) {
             ModuleRevisionId expectedMrid = ModuleRevisionId.newInstance(mrid, mrid.getRevision());
             if (!getSettings().getVersionMatcher().accept(expectedMrid, md)) {
-                Message.error("\t" + getName() + ": bad revision found in " + ivyRef.getResource()
-                        + ": expected='" + ivyRef.getRevision() + " found='"
-                        + md.getModuleRevisionId().getRevision() + "'");
-                errors.append("bad revision: expected='").append(ivyRef.getRevision()).append("' found='").append(md.getModuleRevisionId().getRevision()).append("'; ");
+                Message.error(String.format("\t%s: bad revision found in %s: expected='%s found='%s'",
+                        getName(), ivyRef.getResource(), ivyRef.getRevision(),
+                        md.getModuleRevisionId().getRevision()));
+                errors.append("bad revision: expected='").append(ivyRef.getRevision())
+                        .append("' found='").append(md.getModuleRevisionId().getRevision()).append("'; ");
                 ok = false;
             }
         }
         if (!getSettings().getStatusManager().isStatus(md.getStatus())) {
-            Message.error("\t" + getName() + ": bad status found in " + ivyRef.getResource()
-                    + ": '" + md.getStatus() + "'");
+            Message.error(String.format("\t%s: bad status found in %s: '%s'",
+                    getName(), ivyRef.getResource(), md.getStatus()));
             errors.append("bad status: '").append(md.getStatus()).append("'; ");
             ok = false;
         }
         for (Map.Entry<String, String> extra : mrid.getExtraAttributes().entrySet()) {
             if (extra.getValue() != null
                     && !extra.getValue().equals(md.getExtraAttribute(extra.getKey()))) {
-                String errorMsg = "bad " + extra.getKey() + " found in " + ivyRef.getResource()
-                        + ": expected='" + extra.getValue() + "' found='"
-                        + md.getExtraAttribute(extra.getKey()) + "'";
+                String errorMsg = String.format("bad %s found in %s: expected='%s' found='%s'",
+                        extra.getKey(), ivyRef.getResource(), extra.getValue(),
+                        md.getExtraAttribute(extra.getKey()));
                 Message.error("\t" + getName() + ": " + errorMsg);
                 errors.append(errorMsg).append(";");
                 ok = false;

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c0845e9/src/java/org/apache/ivy/util/HexEncoder.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/HexEncoder.java b/src/java/org/apache/ivy/util/HexEncoder.java
index 5b6f78d..c4eb27e 100644
--- a/src/java/org/apache/ivy/util/HexEncoder.java
+++ b/src/java/org/apache/ivy/util/HexEncoder.java
@@ -30,8 +30,7 @@ public class HexEncoder {
         for (byte bt : packet) {
             int highBits = (bt & 0xF0) >> 4;
             int lowBits = bt & 0x0F;
-            chars.append(ALPHABET[highBits]);
-            chars.append(ALPHABET[lowBits]);
+            chars.append(ALPHABET[highBits]).append(ALPHABET[lowBits]);
         }
         return chars.toString();
     }


[6/6] ant-ivy git commit: Check spelling

Posted by gi...@apache.org.
Check spelling

Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/896daf14
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/896daf14
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/896daf14

Branch: refs/heads/master
Commit: 896daf14e88408108dad26fa6ee92766bdbfb77e
Parents: 0c0845e
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Fri Nov 10 19:04:13 2017 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Fri Nov 10 19:04:13 2017 +0100

----------------------------------------------------------------------
 .../ivy/plugins/conflict/LatestCompatibleConflictManager.java      | 2 +-
 src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/896daf14/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java b/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java
index 48821af..c8d968e 100644
--- a/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java
+++ b/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java
@@ -224,7 +224,7 @@ public class LatestCompatibleConflictManager extends LatestConflictManager {
                 conflictParent, selectedNode, evictedNode, callerStack);
             callerStack.pop();
             if (sub == null) {
-                // propagate the fact that a path with unblacklistable caller has been found
+                // propagate the fact that a path with nonblacklistable caller has been found
                 return false;
             } else {
                 blacklisted.addAll(sub);

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/896daf14/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java b/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java
index ec01e5f..10c4483 100644
--- a/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java
+++ b/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java
@@ -103,7 +103,7 @@ public class RepositoryResolver extends AbstractPatternsBasedResolver {
                     } else {
                         if ("ivy".equals(artifact.getType()) || "pom".equals(artifact.getType())) {
                             // we can't determine the revision from the pattern, get it
-                            // from the moduledescriptor itself
+                            // from the module descriptor itself
                             File temp = File.createTempFile("ivy", artifact.getExt());
                             temp.deleteOnExit();
                             repository.get(res.getName(), temp);


[2/6] ant-ivy git commit: FindBugs: make currentLockHolders final

Posted by gi...@apache.org.
FindBugs: make currentLockHolders final

Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/1f3dd9ff
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/1f3dd9ff
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/1f3dd9ff

Branch: refs/heads/master
Commit: 1f3dd9ff8a4f8302eb4c0bf4072d2bb7d8aeddd9
Parents: c947676
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Fri Nov 10 19:00:17 2017 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Fri Nov 10 19:00:17 2017 +0100

----------------------------------------------------------------------
 src/java/org/apache/ivy/plugins/lock/FileBasedLockStrategy.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1f3dd9ff/src/java/org/apache/ivy/plugins/lock/FileBasedLockStrategy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/lock/FileBasedLockStrategy.java b/src/java/org/apache/ivy/plugins/lock/FileBasedLockStrategy.java
index 2e31b2f..7c6767d 100644
--- a/src/java/org/apache/ivy/plugins/lock/FileBasedLockStrategy.java
+++ b/src/java/org/apache/ivy/plugins/lock/FileBasedLockStrategy.java
@@ -42,7 +42,7 @@ public abstract class FileBasedLockStrategy extends AbstractLockStrategy {
      * Lock counter list must be static: locks are implicitly shared to the entire process, so the
      * list too much be.
      */
-    private static ConcurrentMap<File, ConcurrentMap<Thread, Integer>> currentLockHolders = new ConcurrentHashMap<>();
+    private static final ConcurrentMap<File, ConcurrentMap<Thread, Integer>> currentLockHolders = new ConcurrentHashMap<>();
 
     protected FileBasedLockStrategy() {
         this(new CreateFileLocker(false), false);


[3/6] ant-ivy git commit: FindBugs: use native line breaks

Posted by gi...@apache.org.
FindBugs: use native line breaks

Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/ca7f64f0
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/ca7f64f0
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/ca7f64f0

Branch: refs/heads/master
Commit: ca7f64f016d8354aecd38ef73405e1b3267ca791
Parents: 1f3dd9f
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Fri Nov 10 19:01:05 2017 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Fri Nov 10 19:01:05 2017 +0100

----------------------------------------------------------------------
 .../org/apache/ivy/core/repository/RepositoryManagementEngine.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ca7f64f0/src/java/org/apache/ivy/core/repository/RepositoryManagementEngine.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/repository/RepositoryManagementEngine.java b/src/java/org/apache/ivy/core/repository/RepositoryManagementEngine.java
index c700b02..5c71181 100644
--- a/src/java/org/apache/ivy/core/repository/RepositoryManagementEngine.java
+++ b/src/java/org/apache/ivy/core/repository/RepositoryManagementEngine.java
@@ -158,7 +158,7 @@ public class RepositoryManagementEngine {
             }
         }
         long endTime = System.currentTimeMillis();
-        Message.info(String.format("\nrepository loaded: %d modules; %d revisions; %s%ss",
+        Message.info(String.format("%nrepository loaded: %d modules; %d revisions; %s%ss",
                 modules.size(), revisions.size(), settings.dumpMemoryUsage()
                         ? (MemoryUtil.getUsedMemory() - startingMemoryUse) / KILO + "kB; " : "",
                 (endTime - startTime) / THOUSAND));