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/10/25 20:55:09 UTC
ant-ivy git commit: More adjustments to Eclipse classpath (whitespace,
version.properties)
Repository: ant-ivy
Updated Branches:
refs/heads/master b76113fbc -> 876662329
More adjustments to Eclipse classpath (whitespace, version.properties)
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/87666232
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/87666232
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/87666232
Branch: refs/heads/master
Commit: 8766623295297f116a374c40f57a9a9bc407dbe6
Parents: b76113f
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Wed Oct 25 22:54:24 2017 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Wed Oct 25 22:54:24 2017 +0200
----------------------------------------------------------------------
.classpath.default | 4 ++--
.classpath.ivyde | 52 ++++++++++++++++++++++++-------------------------
build.xml | 4 ++--
3 files changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/87666232/.classpath.default
----------------------------------------------------------------------
diff --git a/.classpath.default b/.classpath.default
index a6c4781..c1762a9 100644
--- a/.classpath.default
+++ b/.classpath.default
@@ -15,7 +15,7 @@
"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.
-->
<classpath>
<classpathentry kind="src" path="src/java"/>
@@ -26,7 +26,7 @@
<classpathentry kind="lib" path="lib/commons-codec.jar"/>
<classpathentry kind="lib" path="lib/commons-logging.jar"/>
<classpathentry kind="lib" path="lib/commons-vfs2.jar"/>
- <classpathentry kind="lib" path="lib/hamcrest.jar"/>
+ <classpathentry kind="lib" path="lib/hamcrest-core.jar"/>
<classpathentry kind="lib" path="lib/httpclient.jar"/>
<classpathentry kind="lib" path="lib/httpcore.jar"/>
<classpathentry kind="lib" path="lib/jsch.jar"/>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/87666232/.classpath.ivyde
----------------------------------------------------------------------
diff --git a/.classpath.ivyde b/.classpath.ivyde
index 9682224..fdf789d 100644
--- a/.classpath.ivyde
+++ b/.classpath.ivyde
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<classpath>
- <classpathentry kind="src" path="src/java"/>
- <classpathentry kind="src" path="test/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/ivy.xml/*"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<classpath>
+ <classpathentry kind="src" path="src/java"/>
+ <classpathentry kind="src" path="test/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=ivy&ivyXmlPath=ivy.xml&confs=*&ivySettingsPath=&propertyFiles=version.properties"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/87666232/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 9736ed2..3452eb0 100644
--- a/build.xml
+++ b/build.xml
@@ -692,13 +692,13 @@
<target name="eclipse-default" depends="resolve,check-eclipse-classpath-overwrite"
unless="eclipse.classpath.abort"
- description="creates a default .classpath for eclipse, using jars resolved by this ant build">
+ description="creates a default .classpath for Eclipse using jars resolved by this Ant build">
<copy file="${basedir}/.classpath.default" tofile="${basedir}/.classpath" overwrite="true"/>
</target>
<target name="eclipse-ivyde" depends="check-eclipse-classpath-overwrite"
unless="eclipse.classpath.abort"
- description="creates a .classpath for eclipse using Apache IvyDE version">
+ description="creates a .classpath for Eclipse using Apache IvyDE plugin">
<copy file="${basedir}/.classpath.ivyde" tofile="${basedir}/.classpath" overwrite="true"/>
</target>
</project>