[Bug 62544] New: includesfile ignores entries starting with ./

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=62544

Bug ID: 62544
   Summary: includesfile ignores entries starting with ./
   Product: Ant
   Version: 1.10.5
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Core tasks
  Assignee: notifications@ant.apache.org
  Reporter: ebo...@apache.org
  Target Milestone: ---

It looks like a fileset using the includesfile attribute skips the entries with
a relative path starting with "./".

Here is an example illustrating the issue, a simple class importing an Ant
package is compiled. The elements of the classpath are defined in a
'dependencies' file. The first compilation uses a relative path starting
directly with the name of the jar, and the second compilation uses a relative
path prefixed by "./". The first compilation works but the second one fails:





  

import org.apache.tools.ant.types.*; public class
Test {}

ant.jar

  

  




./ant.jar

  

  

  



-- 
You are receiving this mail because:
You are the assignee for the bug.

[4/6] ant-ivyde git commit: fix the retreieve-var test project

[hibou]

fix the retreieve-var test project


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

Branch: refs/heads/master
Commit: 98c32c85208da641296c2fa295d78e4632c60593
Parents: 56493ab
Author: Nicolas Lalevée 
Authored: Mon Jul 16 13:13:16 2018 +0200
Committer: Nicolas Lalevée 
Committed: Mon Jul 16 13:13:16 2018 +0200

--
 test/retrieve-var/.settings/org.apache.ivyde.eclipse.prefs | 2 +-
 test/retrieve-var/lib/.gitignore   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/98c32c85/test/retrieve-var/.settings/org.apache.ivyde.eclipse.prefs
--
diff --git a/test/retrieve-var/.settings/org.apache.ivyde.eclipse.prefs 
b/test/retrieve-var/.settings/org.apache.ivyde.eclipse.prefs
index 59e12b2..7762317 100644
--- a/test/retrieve-var/.settings/org.apache.ivyde.eclipse.prefs
+++ b/test/retrieve-var/.settings/org.apache.ivyde.eclipse.prefs
@@ -17,4 +17,4 @@
 #   * under the License.
 #   ***
 eclipse.preferences.version=1
-org.apache.ivyde.eclipse.standaloneretrieve=
+org.apache.ivyde.eclipse.standaloneretrieve=

http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/98c32c85/test/retrieve-var/lib/.gitignore
--
diff --git a/test/retrieve-var/lib/.gitignore b/test/retrieve-var/lib/.gitignore
new file mode 100644
index 000..f23b948
--- /dev/null
+++ b/test/retrieve-var/lib/.gitignore
@@ -0,0 +1 @@
+*.jar
\ No newline at end of file

[5/6] ant-ivyde git commit: ignore retrieved jars in test project

[hibou]

ignore retrieved jars in test project


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

Branch: refs/heads/master
Commit: 59af84643660c8f573e538689c752cc2084f6ecb
Parents: 98c32c8
Author: Nicolas Lalevée 
Authored: Mon Jul 16 13:22:41 2018 +0200
Committer: Nicolas Lalevée 
Committed: Mon Jul 16 13:22:41 2018 +0200

--
 test/retrieve-root/.gitignore | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/59af8464/test/retrieve-root/.gitignore
--
diff --git a/test/retrieve-root/.gitignore b/test/retrieve-root/.gitignore
new file mode 100644
index 000..f23b948
--- /dev/null
+++ b/test/retrieve-root/.gitignore
@@ -0,0 +1 @@
+*.jar
\ No newline at end of file

[3/6] ant-ivyde git commit: Do not use absolute path, so it resolve properly everywhere

[hibou]

Do not use absolute path, so it resolve properly everywhere


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

Branch: refs/heads/master
Commit: 56493ab23a85a3b1faa10beee82c9985a25eca56
Parents: 649544a
Author: Nicolas Lalevée 
Authored: Mon Jul 16 12:06:00 2018 +0200
Committer: Nicolas Lalevée 
Committed: Mon Jul 16 12:06:00 2018 +0200

--
 test/launch-main/launcher-with-container.launch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/56493ab2/test/launch-main/launcher-with-container.launch
--
diff --git a/test/launch-main/launcher-with-container.launch 
b/test/launch-main/launcher-with-container.launch
index f466f1f..6f9abea 100644
--- a/test/launch-main/launcher-with-container.launch
+++ b/test/launch-main/launcher-with-container.launch
@@ -27,7 +27,7 @@
 
 
 
-
+
 
 
 

[6/6] ant-ivyde git commit: make the test project 'retrieved-classpath' actualy configured to retrieve dependencies

[hibou]

make the test project 'retrieved-classpath' actualy configured to retrieve 
dependencies


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

Branch: refs/heads/master
Commit: 122b5a2f71836e49fb582ff57c638964f967695e
Parents: 59af846
Author: Nicolas Lalevée 
Authored: Mon Jul 16 13:27:02 2018 +0200
Committer: Nicolas Lalevée 
Committed: Mon Jul 16 13:27:02 2018 +0200

--
 test/retrieved-classpath/.classpath | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/122b5a2f/test/retrieved-classpath/.classpath
--
diff --git a/test/retrieved-classpath/.classpath 
b/test/retrieved-classpath/.classpath
index f1d8a83..acd2140 100644
--- a/test/retrieved-classpath/.classpath
+++ b/test/retrieved-classpath/.classpath
@@ -20,6 +20,6 @@
 


-   
+   

 

[1/6] ant-ivyde git commit: Make the action 'Remove Ivy dependency management' work on a container too

[hibou]

Repository: ant-ivyde
Updated Branches:
  refs/heads/master 0e984f6a3 -> 122b5a2f7


Make the action 'Remove Ivy dependency management' work on a container too


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

Branch: refs/heads/master
Commit: f726a9797756e627d9c228253ff1565c4881f0d1
Parents: 0e984f6
Author: Nicolas Lalevée 
Authored: Mon Jul 16 11:16:22 2018 +0200
Committer: Nicolas Lalevée 
Committed: Mon Jul 16 11:16:22 2018 +0200

--
 .../handlers/RemoveIvyNatureHandler.java| 57 +---
 1 file changed, 14 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f726a979/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/handlers/RemoveIvyNatureHandler.java
--
diff --git 
a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/handlers/RemoveIvyNatureHandler.java
 
b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/handlers/RemoveIvyNatureHandler.java
index 9906ef9..d485c26 100644
--- 
a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/handlers/RemoveIvyNatureHandler.java
+++ 
b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/handlers/RemoveIvyNatureHandler.java
@@ -17,60 +17,31 @@
  */
 package org.apache.ivyde.internal.eclipse.handlers;
 
-import java.util.LinkedList;
-import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import org.apache.ivyde.eclipse.IvyNatureHelper;
+import org.apache.ivyde.eclipse.cp.IvyClasspathContainer;
 import org.apache.ivyde.internal.eclipse.IvyPlugin;
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.handlers.HandlerUtil;
 
-public class RemoveIvyNatureHandler extends AbstractHandler {
+public class RemoveIvyNatureHandler extends AbstractIvyDEHandler {
 
 public static final String COMMAND_ID = 
"org.apache.ivyde.commands.removeivynature";
 
-public Object execute(ExecutionEvent event) throws ExecutionException {
-ISelection selection = HandlerUtil.getCurrentSelection(event);
-if (!(selection instanceof IStructuredSelection)) {
-return null;
-}
-
-List projects = new LinkedList<>();
-for (Object object : ((IStructuredSelection) selection).toList()) {
-if (!(object instanceof IAdaptable)) {
-return null;
-}
-IProject project = (IProject) ((IAdaptable) 
object).getAdapter(IProject.class);
-if (project == null) {
-return null;
-}
-if (IvyNatureHelper.hasNature(project)) {
-projects.add(project);
+@Override
+protected void handleProjects(Map> 
projects) {
+Shell shell = IvyPlugin.getActiveWorkbenchShell();
+boolean doRemove = MessageDialog.openQuestion(shell, "Remove Ivy 
dependency management",
+"Do you want to remove the Ivy dependency management ?\n\n"
++ "The configuration of the classpath containers will be 
lost.\n"
++ "This operation cannot be undone.");
+if (doRemove) {
+for (IProject project : projects.keySet()) {
+IvyNatureHelper.removeNature(project);
 }
 }
-
-if (projects.size() > 0) {
-Shell shell = IvyPlugin.getActiveWorkbenchShell();
-boolean doRemove = MessageDialog.openQuestion(shell,
-"Remove Ivy dependency management",
-"Do you want to remove the Ivy dependency management ?\n\n"
-+ "The configuration of the classpath containers will 
be lost.\n"
-+ "This operation cannot be undone.");
-if (doRemove) {
-for (IProject project : projects) {
-IvyNatureHelper.removeNature(project);
-}
-}
-}
-
-return null;
 }
 }

[2/6] ant-ivyde git commit: make the fake jars of the tests actual jars

[hibou]

make the fake jars of the tests actual jars


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

Branch: refs/heads/master
Commit: 649544aa1a9a914d9648a1b77b7b469fa5ac4c64
Parents: f726a97
Author: Nicolas Lalevée 
Authored: Mon Jul 16 11:58:40 2018 +0200
Committer: Nicolas Lalevée 
Committed: Mon Jul 16 11:58:40 2018 +0200

--
 .../myorg/mymodule/trunk/1.2/jars/mymodule.jar   | Bin 0 -> 334 bytes
 .../myorg/mybluemodule/sources/mybluemodule-1.1.jar  | Bin 0 -> 334 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/649544aa/test/fakerepo-branch/myorg/mymodule/trunk/1.2/jars/mymodule.jar
--
diff --git a/test/fakerepo-branch/myorg/mymodule/trunk/1.2/jars/mymodule.jar 
b/test/fakerepo-branch/myorg/mymodule/trunk/1.2/jars/mymodule.jar
index e69de29..7f79ffd 100644
Binary files a/test/fakerepo-branch/myorg/mymodule/trunk/1.2/jars/mymodule.jar 
and b/test/fakerepo-branch/myorg/mymodule/trunk/1.2/jars/mymodule.jar differ

http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/649544aa/test/fakerepo/myorg/mybluemodule/sources/mybluemodule-1.1.jar
--
diff --git a/test/fakerepo/myorg/mybluemodule/sources/mybluemodule-1.1.jar 
b/test/fakerepo/myorg/mybluemodule/sources/mybluemodule-1.1.jar
index e69de29..7f79ffd 100644
Binary files a/test/fakerepo/myorg/mybluemodule/sources/mybluemodule-1.1.jar 
and b/test/fakerepo/myorg/mybluemodule/sources/mybluemodule-1.1.jar differ

Jenkins build is back to stable : Ant-Build-Matrix-master-Linux » xenial,JDK 11 b19 (early access build) #1355

[Apache Jenkins Server]

See 

Jenkins build is back to stable : Ant-Build-Matrix-master-Windows » JDK 10 b46 (Windows Only),Windows #460

[Apache Jenkins Server]

See 

ant git commit: Remove unintentional "echo" in test case for "sourcefile" attribute of java task

[jaikiran]

Repository: ant
Updated Branches:
  refs/heads/master d57727856 -> 377935d2a


Remove unintentional "echo" in test case for "sourcefile" attribute of java task


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

Branch: refs/heads/master
Commit: 377935d2a443587fa5234949839935a694c16deb
Parents: d577278
Author: Jaikiran Pai 
Authored: Mon Jul 16 12:34:26 2018 +0530
Committer: Jaikiran Pai 
Committed: Mon Jul 16 12:36:03 2018 +0530

--
 src/etc/testcases/taskdefs/java.xml | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/377935d2/src/etc/testcases/taskdefs/java.xml
--
diff --git a/src/etc/testcases/taskdefs/java.xml 
b/src/etc/testcases/taskdefs/java.xml
index 4d87fd1..9c58c38 100644
--- a/src/etc/testcases/taskdefs/java.xml
+++ b/src/etc/testcases/taskdefs/java.xml
@@ -427,7 +427,6 @@ redirect.err="${redirect.err}" should be 
empty
 
 
-
 
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -455,7 +454,6 @@ redirect.err="${redirect.err}" should be 
empty
 
 
 
-
 
 public class ThrowsException {
 public static void main(String[] args) throws Exception {