ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gin...@apache.org
Subject ant-ivy git commit: Changed contents of repo.jfrog.org broke a test; correct obsolete URL to Ivy file schema
Date Thu, 05 Oct 2017 17:54:43 GMT
Repository: ant-ivy
Updated Branches:
  refs/heads/master ade1bb484 -> 8054f746b


Changed contents of repo.jfrog.org broke a test;
correct obsolete URL to Ivy file schema

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

Branch: refs/heads/master
Commit: 8054f746bbd6191f5a297cf6f7f26f9fefaba307
Parents: ade1bb4
Author: Gintas Grigelionis <gintas@apache.org>
Authored: Thu Oct 5 19:53:53 2017 +0200
Committer: Gintas Grigelionis <gintas@apache.org>
Committed: Thu Oct 5 19:53:53 2017 +0200

----------------------------------------------------------------------
 .../parser/xml/test-update-excludedconfs1.xml       |  2 +-
 .../parser/xml/test-update-excludedconfs2.xml       |  2 +-
 .../parser/xml/test-update-excludedconfs3.xml       |  2 +-
 .../parser/xml/test-update-excludedconfs4.xml       |  2 +-
 .../parser/xml/test-update-excludedconfs5.xml       |  2 +-
 .../ivy/plugins/parser/xml/test-update-withvar.xml  | 16 ++++++++--------
 .../apache/ivy/plugins/parser/xml/test-update.xml   | 16 ++++++++--------
 .../org/apache/ivy/plugins/parser/xml/updated.xml   | 16 ++++++++--------
 .../apache/ivy/util/url/ArtifactoryListingTest.java |  2 +-
 9 files changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8054f746/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs1.xml
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs1.xml b/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs1.xml
index 62bd9d1..7b7db38 100644
--- a/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs1.xml
+++ b/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs1.xml
@@ -18,7 +18,7 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd">
+<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info organisation="myorg"
 	       module="mymodule"
 	       revision="myrev"

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8054f746/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs2.xml
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs2.xml b/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs2.xml
index 07e4edc..87f57d2 100644
--- a/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs2.xml
+++ b/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs2.xml
@@ -18,7 +18,7 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd">
+<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info organisation="myorg"
 	       module="mymodule"
 	       revision="myrev"

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8054f746/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs3.xml
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs3.xml b/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs3.xml
index 48b2d1c..966b7dd 100644
--- a/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs3.xml
+++ b/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs3.xml
@@ -18,7 +18,7 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd">
+<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info organisation="myorg"
 	       module="mymodule"
 	       revision="myrev"

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8054f746/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs4.xml
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs4.xml b/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs4.xml
index b93cb6a..932c236 100644
--- a/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs4.xml
+++ b/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs4.xml
@@ -18,7 +18,7 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd">
+<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info organisation="myorg"
 	       module="mymodule"
 	       revision="myrev"

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8054f746/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs5.xml
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs5.xml b/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs5.xml
index 35089e6..67a9356 100644
--- a/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs5.xml
+++ b/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs5.xml
@@ -18,7 +18,7 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd">
+<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info organisation="myorg"
 	       module="mymodule"
 	       revision="myrev"

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8054f746/test/java/org/apache/ivy/plugins/parser/xml/test-update-withvar.xml
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/xml/test-update-withvar.xml b/test/java/org/apache/ivy/plugins/parser/xml/test-update-withvar.xml
index d723dfb..f3230df 100644
--- a/test/java/org/apache/ivy/plugins/parser/xml/test-update-withvar.xml
+++ b/test/java/org/apache/ivy/plugins/parser/xml/test-update-withvar.xml
@@ -16,10 +16,10 @@
    "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.
 -->
 <!-- A comment before the first tag -->
-<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
xmlns:e="http://ant.apache.org/ivy/extra">
+<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
xmlns:e="http://ant.apache.org/ivy/extra">
 	<!-- A comment with accent � & special characters -->
 	<info organisation="${myorg}"
 	       module="${mymodule}"
@@ -27,15 +27,15 @@
 	       status="${mystatus}"
 	       e:myextra="myval"
 	       publication="{mypubdate}">
-	       
+
 		<license name="${mylicense}" url="${mylicenseurl}"/>
-		
+
 		<ivyauthor name="jayasoft" url="http://www.jayasoft.org/"/>
 		<ivyauthor name="${myorg}" url="${myorgurl}"/>
 
 		<repository name="${ivyrep}" url="${ivyrepurl}" pattern="${ivyreppattern}" ivys="${ivys}"
artifacts="${artifacts}"/>
 
-		<description homepage="${homepage}">	       
+		<description homepage="${homepage}">
 	This module is <b>great</b> !<br/>
 	You can use it especially with myconf1 &amp; myconf2, and myconf4 is not too bad too.
 		</description>
@@ -45,7 +45,7 @@
 		<conf name="${myvar}" description="${mydesc}"/>
 		<conf name="myconf2" description="desc 2" visibility="${visibility}"/>
 		<conf name="myconf3" description="desc 3" visibility="private"/>
-		<conf name="myconf4" description="desc 4" extends="${myvar}, myconf2"/>		
+		<conf name="myconf4" description="desc 4" extends="${myvar}, myconf2"/>
 		<conf name="myoldconf" description="my old desc" deprecated="${deprecated}"/>
 	</configurations>
 	<publications>
@@ -84,7 +84,7 @@
 		<dependency org="yourorg" name="yourmodule8" rev="8.1">
 			<artifact name="yourartifact8-1" type="jar"/>
 			<artifact name="yourartifact8-2" type="jar"/>
-		</dependency>		
+		</dependency>
 
 		<dependency org="yourorg" name="yourmodule9" rev="9.1" conf="myconf1,myconf2,myconf3->default">
 			<artifact name="${art9-1}" type="${mytype}" conf="${myvar},myconf2"/>
@@ -92,7 +92,7 @@
 				<conf name="myconf2"/>
 				<conf name="${conf3}"/>
 			</artifact>
-		</dependency>		
+		</dependency>
 
 		<dependency org="yourorg" name="yourmodule10" rev="10.1">
 			<include name="${includename}" type="${mytype}"/>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8054f746/test/java/org/apache/ivy/plugins/parser/xml/test-update.xml
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/xml/test-update.xml b/test/java/org/apache/ivy/plugins/parser/xml/test-update.xml
index d868d72..a1bb57b 100644
--- a/test/java/org/apache/ivy/plugins/parser/xml/test-update.xml
+++ b/test/java/org/apache/ivy/plugins/parser/xml/test-update.xml
@@ -16,10 +16,10 @@
    "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.
 -->
 <!-- A comment before the first tag -->
-<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
xmlns:e="http://ant.apache.org/ivy/extra">
+<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
xmlns:e="http://ant.apache.org/ivy/extra">
 	<!-- A comment with accent � & special characters -->
 	<info organisation="myorg"
 	       module="mymodule"
@@ -27,15 +27,15 @@
 	       status="integration"
 	       e:myextra="myval"
 	       publication="20041101110000">
-	       
+
 		<license name="MyLicense" url="http://www.my.org/mymodule/mylicense.html"/>
-		
+
 		<ivyauthor name="jayasoft" url="http://www.jayasoft.org/"/>
 		<ivyauthor name="myorg" url="http://www.myorg.org/"/>
 
 		<repository name="ivyrep" url="http://www.jayasoft.fr/org/ivyrep/" pattern="[organisation]/[module]/ivy-[revision].xml"
ivys="true" artifacts="false"/>
 
-		<description homepage="http://www.my.org/mymodule/">	       
+		<description homepage="http://www.my.org/mymodule/">
 	This module is <b>great</b> !<br/>
 	You can use it especially with myconf1 &amp; myconf2, and myconf4 is not too bad too.
 		</description>
@@ -45,7 +45,7 @@
 		<conf name="${myvar}" description="desc 1"/>
 		<conf name="myconf2" description="desc 2" visibility="public"/>
 		<conf name="myconf3" description="desc 3" visibility="private"/>
-		<conf name="myconf4" description="desc 4" extends="myconf1, myconf2"/>		
+		<conf name="myconf4" description="desc 4" extends="myconf1, myconf2"/>
 		<conf name="myoldconf" description="my old desc" deprecated="20050115"/>
 	</configurations>
 	<publications>
@@ -84,7 +84,7 @@
 		<dependency org="yourorg" name="yourmodule8" rev="8.1">
 			<artifact name="yourartifact8-1" type="jar"/>
 			<artifact name="yourartifact8-2" type="jar"/>
-		</dependency>		
+		</dependency>
 
 		<dependency org="yourorg" name="yourmodule9" rev="9.1" conf="myconf1,myconf2,myconf3->default">
 			<artifact name="yourartifact9-1" type="jar" conf="myconf1,myconf2"/>
@@ -92,7 +92,7 @@
 				<conf name="myconf2"/>
 				<conf name="myconf3"/>
 			</artifact>
-		</dependency>		
+		</dependency>
 
 		<dependency org="yourorg" name="yourmodule10" rev="10.1">
 			<include name="your.*" type="jar"/>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8054f746/test/java/org/apache/ivy/plugins/parser/xml/updated.xml
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/xml/updated.xml b/test/java/org/apache/ivy/plugins/parser/xml/updated.xml
index 45ae2f4..8eeec37 100644
--- a/test/java/org/apache/ivy/plugins/parser/xml/updated.xml
+++ b/test/java/org/apache/ivy/plugins/parser/xml/updated.xml
@@ -16,21 +16,21 @@
    "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.
 -->
 <!-- A comment before the first tag -->
-<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
xmlns:e="http://ant.apache.org/ivy/extra">
+<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
xmlns:e="http://ant.apache.org/ivy/extra">
 	<!-- A comment with accent é & special characters -->
 	<info organisation="myorg" module="mymodule" revision="mynewrev" status="release" publication="20050322143254"
e:myextra="myval">
-	       
+
 		<license name="MyLicense" url="http://www.my.org/mymodule/mylicense.html"/>
-		
+
 		<ivyauthor name="jayasoft" url="http://www.jayasoft.org/"/>
 		<ivyauthor name="myorg" url="http://www.myorg.org/"/>
 
 		<repository name="ivyrep" url="http://www.jayasoft.fr/org/ivyrep/" pattern="[organisation]/[module]/ivy-[revision].xml"
ivys="true" artifacts="false"/>
 
-		<description homepage="http://www.my.org/mymodule/">	       
+		<description homepage="http://www.my.org/mymodule/">
 	This module is <b>great</b> !<br/>
 	You can use it especially with myconf1 &amp; myconf2, and myconf4 is not too bad too.
 		</description>
@@ -41,7 +41,7 @@
 		<conf name="myconf1" description="desc 1"/>
 		<conf name="myconf2" description="desc 2" visibility="public"/>
 		<conf name="myconf3" description="desc 3" visibility="private"/>
-		<conf name="myconf4" description="desc 4" extends="myconf1, myconf2"/>		
+		<conf name="myconf4" description="desc 4" extends="myconf1, myconf2"/>
 		<conf name="myoldconf" description="my old desc" deprecated="20050115"/>
 	</configurations>
 	<publications>
@@ -80,7 +80,7 @@
 		<dependency org="yourorg" name="yourmodule8" rev="8.1">
 			<artifact name="yourartifact8-1" type="jar"/>
 			<artifact name="yourartifact8-2" type="jar"/>
-		</dependency>		
+		</dependency>
 
 		<dependency org="yourorg" name="yourmodule9" rev="9.1" conf="myconf1,myconf2,myconf3->default">
 			<artifact name="yourartifact9-1" type="jar" conf="myconf1,myconf2"/>
@@ -88,7 +88,7 @@
 				<conf name="myconf2"/>
 				<conf name="myconf3"/>
 			</artifact>
-		</dependency>		
+		</dependency>
 
 		<dependency org="yourorg" name="yourmodule10" rev="10.1">
 			<include name="your.*" type="jar"/>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8054f746/test/java/org/apache/ivy/util/url/ArtifactoryListingTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/util/url/ArtifactoryListingTest.java b/test/java/org/apache/ivy/util/url/ArtifactoryListingTest.java
index dec8746..6dedd16 100644
--- a/test/java/org/apache/ivy/util/url/ArtifactoryListingTest.java
+++ b/test/java/org/apache/ivy/util/url/ArtifactoryListingTest.java
@@ -35,6 +35,6 @@ public class ArtifactoryListingTest {
         List<URL> content = lister.listAll(new URL(
                 "http://repo.jfrog.org/artifactory/libs-releases-local/org/apache/wicket/wicket/"));
         assertNotNull(content);
-        assertEquals(5, content.size());
+        assertEquals(3, content.size());
     }
 }


Mime
View raw message