You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2018/07/01 12:52:03 UTC
[1/2] ant-ivyde git commit: Keep IvyDE compatible with Ivy 2.1,
as stated on the doc.
Repository: ant-ivyde
Updated Branches:
refs/heads/master 307e362ca -> 829b80263
Keep IvyDE compatible with Ivy 2.1, as stated on the doc.
Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/7716af8f
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/7716af8f
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/7716af8f
Branch: refs/heads/master
Commit: 7716af8fe10f3809cc1ec0e77f59cffb396a1f52
Parents: 307e362
Author: Nicolas Lalevée <ni...@hibnet.org>
Authored: Sun Jul 1 14:27:10 2018 +0200
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Sun Jul 1 14:27:10 2018 +0200
----------------------------------------------------------------------
org.apache.ivyde.eclipse.resolvevisualizer.feature/feature.xml | 2 +-
org.apache.ivyde.eclipse.resolvevisualizer/META-INF/MANIFEST.MF | 2 +-
org.apache.ivyde.eclipse/META-INF/MANIFEST.MF | 2 +-
org.apache.ivyde.feature/feature.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/7716af8f/org.apache.ivyde.eclipse.resolvevisualizer.feature/feature.xml
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse.resolvevisualizer.feature/feature.xml b/org.apache.ivyde.eclipse.resolvevisualizer.feature/feature.xml
index 4c78fd4..1abca74 100644
--- a/org.apache.ivyde.eclipse.resolvevisualizer.feature/feature.xml
+++ b/org.apache.ivyde.eclipse.resolvevisualizer.feature/feature.xml
@@ -49,7 +49,7 @@
<import plugin="org.eclipse.jdt.core" version="3.9.0" match="compatible"/>
<import plugin="org.eclipse.core.resources" version="3.8.0" match="compatible"/>
<import plugin="org.eclipse.ui.forms" version="3.6.0" match="compatible"/>
- <import plugin="org.apache.ivy" version="2.5.0" match="compatible"/>
+ <import plugin="org.apache.ivy" version="2.1.0" match="compatible"/>
</requires>
<plugin
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/7716af8f/org.apache.ivyde.eclipse.resolvevisualizer/META-INF/MANIFEST.MF
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse.resolvevisualizer/META-INF/MANIFEST.MF b/org.apache.ivyde.eclipse.resolvevisualizer/META-INF/MANIFEST.MF
index f87fc00..1ff258a 100644
--- a/org.apache.ivyde.eclipse.resolvevisualizer/META-INF/MANIFEST.MF
+++ b/org.apache.ivyde.eclipse.resolvevisualizer/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.105.0,4.0.0)",
org.apache.ivyde.eclipse;bundle-version="[2.3.0,2.4.0)",
org.eclipse.zest.core;bundle-version="[1.5.0,2.0.0)",
org.eclipse.zest.layouts;bundle-version="[1.1.0,2.0.0)",
- org.apache.ivy;bundle-version="[2.5.0,3.0.0)",
+ org.apache.ivy;bundle-version="[2.1.0,3.0.0)",
org.eclipse.jdt.core;bundle-version="[3.9.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.8.0,4.0.0)",
org.eclipse.ui.forms;bundle-version="[3.6.0,4.0.0)"
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/7716af8f/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF b/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF
index b3cd307..66c1280 100644
--- a/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF
+++ b/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF
@@ -27,7 +27,7 @@ Require-Bundle: org.apache.xerces;bundle-version="[2.9.0,3.0.0)";resolution:=opt
org.eclipse.jdt.core;bundle-version="[3.9.0,4.0.0)",
org.eclipse.jdt.ui;bundle-version="[3.9.0,4.0.0)",
org.eclipse.ui.console;bundle-version="[3.5.0,4.0.0)",
- org.apache.ivy;bundle-version="[2.5.0,3.0.0)",
+ org.apache.ivy;bundle-version="[2.1.0,3.0.0)",
org.eclipse.help;bundle-version="[3.6.0,4.0.0)",
org.eclipse.wst.xml.core;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
org.eclipse.debug.core;bundle-version="[3.8.0,4.0.0)",
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/7716af8f/org.apache.ivyde.feature/feature.xml
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.feature/feature.xml b/org.apache.ivyde.feature/feature.xml
index 28aa987..9762ddf 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.9.0" match="compatible"/>
<import plugin="org.eclipse.jdt.ui" version="3.9.0" match="compatible"/>
<import plugin="org.eclipse.ui.console" version="3.5.0" match="compatible"/>
- <import plugin="org.apache.ivy" version="2.5.0" match="compatible"/>
+ <import plugin="org.apache.ivy" version="2.1.0" match="compatible"/>
<import plugin="org.eclipse.help" version="3.6.0" match="compatible"/>
<import plugin="org.eclipse.debug.core" version="3.8.0" match="compatible"/>
<import plugin="org.eclipse.jdt.launching" version="3.7.0" match="compatible"/>
[2/2] ant-ivyde git commit: Restore the gathering of artifacts on
resolve
Posted by hi...@apache.org.
Restore the gathering of artifacts on resolve
Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/829b8026
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/829b8026
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/829b8026
Branch: refs/heads/master
Commit: 829b802638dca482062ea40f691918b40e79f378
Parents: 7716af8
Author: Nicolas Lalevée <ni...@hibnet.org>
Authored: Sun Jul 1 14:50:34 2018 +0200
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Sun Jul 1 14:50:34 2018 +0200
----------------------------------------------------------------------
.../internal/eclipse/resolve/IvyResolver.java | 24 +++++++++++---------
1 file changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/829b8026/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolver.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolver.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolver.java
index 7dddf15..ba6bfc8 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolver.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolver.java
@@ -260,21 +260,23 @@ public class IvyResolver {
ResolveResult result = new ResolveResult(report);
- Map<Artifact, ArtifactDownloadReport> workspaceArtifacts = IvyContext.getContext()
- .get(WorkspaceResolver.IVYDE_WORKSPACE_ARTIFACT_REPORTS);
+ ArtifactDownloadReport[] artifactReports = report.getArtifactsReports(null, false);
+
+ Map<Artifact, ArtifactDownloadReport> workspaceArtifacts = IvyContext
+ .getContext().get(WorkspaceResolver.IVYDE_WORKSPACE_ARTIFACT_REPORTS);
if (workspaceArtifacts != null) {
- // some artifacts were 'forced' by the dependency declaration, whereas they should be
- // changed to the eclipse project reference
- for (ArtifactDownloadReport artifactReport : report.getArtifactsReports(null, false)) {
- ArtifactDownloadReport eclipseArtifactReport = workspaceArtifacts.get(artifactReport.getArtifact());
- if (eclipseArtifactReport == null) {
- result.addArtifactReport(artifactReport);
- } else {
- // let's change
- result.addArtifactReport(eclipseArtifactReport);
+ // some artifact were 'forced' by the dependency declaration, whereas they should be
+ // switch by the eclipse project reference
+ for (int i = 0; i < artifactReports.length; i++) {
+ ArtifactDownloadReport eclipseArtifactReport = (ArtifactDownloadReport) workspaceArtifacts
+ .get(artifactReports[i].getArtifact());
+ if (eclipseArtifactReport != null) {
+ // let's switch.
+ artifactReports[i] = eclipseArtifactReport;
}
}
}
+ result.addArtifactReports(artifactReports);
collectArtifactsByDependency(report, result);