pool/xmvn
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
afea959e7d
xmvn/0002-Allow-removing-plugins-during-model-validation.patch

501 lines
24 KiB
Diff
Raw Blame History

From e29ca4ddf36c1c9d7ebae6fb39a3ab57abaac864 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sat, 29 Jun 2019 11:43:26 +0200
Subject: [PATCH 2/7] Allow removing plugins during model validation
---
xmvn-api/pom.xml | 6 ++--
xmvn-api/src/main/mdo/config.mdo | 9 ++++++
.../connector/aether/XMvnModelValidator.java | 25 ++++++++++++++---
.../connector/aether/ModelValidatorTest.java | 28 +++++++++++++++++++
.../xmvn/deployer/BasicDeployerTest.java | 2 +-
.../xmvn-install/src/test/resources/alias.xml | 2 +-
.../src/test/resources/compat.xml | 2 +-
.../src/test/resources/metadata-uuid.xml | 2 +-
.../src/test/resources/namespace-dep.xml | 2 +-
.../src/test/resources/namespace.xml | 2 +-
.../src/test/resources/no-aid-dep.xml | 2 +-
.../src/test/resources/no-aid-excl.xml | 2 +-
.../src/test/resources/no-aid.xml | 2 +-
.../src/test/resources/no-file.xml | 2 +-
.../src/test/resources/no-gid-dep.xml | 2 +-
.../src/test/resources/no-gid-excl.xml | 2 +-
.../src/test/resources/no-gid.xml | 2 +-
.../src/test/resources/no-version-dep.xml | 2 +-
.../src/test/resources/no-version.xml | 2 +-
.../src/test/resources/nonexistent-file.xml | 2 +-
.../src/test/resources/nonreadable-file.xml | 2 +-
.../src/test/resources/nonregular-file.xml | 2 +-
.../src/test/resources/ns-bar.xml | 2 +-
.../src/test/resources/ns-foo.xml | 2 +-
.../src/test/resources/resolved-version.xml | 2 +-
.../src/test/resources/skipped.xml | 2 +-
.../src/test/resources/test-pkg-main.xml | 2 +-
.../src/test/resources/test-pkg-resolved.xml | 2 +-
.../src/test/resources/test-pkg-sub.xml | 2 +-
.../src/test/resources/test-pkg.xml | 2 +-
.../xmvn-install/src/test/resources/uuid.xml | 2 +-
.../xmvn-install/src/test/resources/valid.xml | 2 +-
32 files changed, 89 insertions(+), 35 deletions(-)
diff --git a/xmvn-api/pom.xml b/xmvn-api/pom.xml
index 348100d5..85d1be6a 100644
--- a/xmvn-api/pom.xml
+++ b/xmvn-api/pom.xml
@@ -37,7 +37,7 @@
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<configuration>
- <version>3.0.0</version>
+ <version>3.2.0</version>
<useJava5>true</useJava5>
<domAsXpp3>false</domAsXpp3>
<models>
@@ -87,12 +87,12 @@
<classifier>metadata</classifier>
</artifact>
<artifact>
- <file>${project.build.directory}/generated-site/resources/xsd/config-3.0.0.xsd</file>
+ <file>${project.build.directory}/generated-site/resources/xsd/config-3.2.0.xsd</file>
<type>xsd</type>
<classifier>config</classifier>
</artifact>
<artifact>
- <file>${project.build.directory}/generated-site/resources/xsd/metadata-3.0.0.xsd</file>
+ <file>${project.build.directory}/generated-site/resources/xsd/metadata-3.2.0.xsd</file>
<type>xsd</type>
<classifier>metadata</classifier>
</artifact>
diff --git a/xmvn-api/src/main/mdo/config.mdo b/xmvn-api/src/main/mdo/config.mdo
index 199ad649..74d82c0e 100644
--- a/xmvn-api/src/main/mdo/config.mdo
+++ b/xmvn-api/src/main/mdo/config.mdo
@@ -49,6 +49,15 @@
<description>Whether compilation and execution of unit and integration tests should be skipped.</description>
<type>Boolean</type>
</field>
+ <field>
+ <name>skippedPlugins</name>
+ <version>3.2.0+</version>
+ <description>List of plugins which will not be executed during build.</description>
+ <association xml.tagName="plugin" java.adder="false">
+ <type>Artifact</type>
+ <multiplicity>*</multiplicity>
+ </association>
+ </field>
</fields>
</class>
diff --git a/xmvn-connector-aether/src/main/java/org/fedoraproject/xmvn/connector/aether/XMvnModelValidator.java b/xmvn-connector-aether/src/main/java/org/fedoraproject/xmvn/connector/aether/XMvnModelValidator.java
index 90908df2..79ceecaf 100644
--- a/xmvn-connector-aether/src/main/java/org/fedoraproject/xmvn/connector/aether/XMvnModelValidator.java
+++ b/xmvn-connector-aether/src/main/java/org/fedoraproject/xmvn/connector/aether/XMvnModelValidator.java
@@ -34,7 +34,6 @@ import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.StringUtils;
import org.fedoraproject.xmvn.artifact.Artifact;
-import org.fedoraproject.xmvn.config.BuildSettings;
import org.fedoraproject.xmvn.config.Configurator;
/**
@@ -61,14 +60,13 @@ public class XMvnModelValidator
void customizeModel( Model model )
{
- BuildSettings settings = configurator.getConfiguration().getBuildSettings();
Build build = model.getBuild() != null ? model.getBuild() : new Build();
List<Dependency> dependencies = model.getDependencies();
List<Extension> extensions = build.getExtensions();
List<Plugin> plugins = build.getPlugins();
- if ( settings.isSkipTests() )
- dependencies.removeIf( d -> StringUtils.equals( d.getScope(), "test" ) );
+ dependencies.removeIf( this::isSkippedDependency );
+ plugins.removeIf( this::isSkippedPlugin );
dependencies.forEach( d -> d.setVersion( replaceVersion( d.getGroupId(), d.getArtifactId(),
d.getVersion() ) ) );
@@ -76,6 +74,25 @@ public class XMvnModelValidator
plugins.forEach( p -> p.setVersion( replaceVersion( p.getGroupId(), p.getArtifactId(), p.getVersion() ) ) );
}
+ private boolean matches( String field, String pattern )
+ {
+ return StringUtils.isEmpty( pattern ) || StringUtils.equals( field, pattern );
+ }
+
+ private boolean isSkippedDependency( Dependency d )
+ {
+ return matches( d.getScope(), "test" ) && configurator.getConfiguration().getBuildSettings().isSkipTests();
+ }
+
+ private boolean isSkippedPlugin( Plugin p )
+ {
+ return configurator.getConfiguration().getBuildSettings().getSkippedPlugins().stream() //
+ .anyMatch( sp -> matches( p.getGroupId(), sp.getGroupId() )
+ && matches( p.getArtifactId(), sp.getArtifactId() )
+ && StringUtils.isEmpty( sp.getExtension() ) && StringUtils.isEmpty( sp.getClassifier() )
+ && matches( p.getVersion(), sp.getVersion() ) );
+ }
+
private String replaceVersion( String groupId, String artifactId, String version )
{
String id = groupId + ":" + artifactId;
diff --git a/xmvn-connector-aether/src/test/java/org/fedoraproject/xmvn/connector/aether/ModelValidatorTest.java b/xmvn-connector-aether/src/test/java/org/fedoraproject/xmvn/connector/aether/ModelValidatorTest.java
index ccc789f7..f1b299ac 100644
--- a/xmvn-connector-aether/src/test/java/org/fedoraproject/xmvn/connector/aether/ModelValidatorTest.java
+++ b/xmvn-connector-aether/src/test/java/org/fedoraproject/xmvn/connector/aether/ModelValidatorTest.java
@@ -40,6 +40,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.fedoraproject.xmvn.config.Artifact;
import org.fedoraproject.xmvn.config.Configurator;
/**
@@ -216,4 +217,31 @@ public class ModelValidatorTest
assertEquals( 0, dl.size() );
}
+
+ @Test
+ public void testSkippedPlugins()
+ throws Exception
+ {
+ Artifact sp1 = new Artifact();
+ sp1.setArtifactId( "maven-compiler-plugin" );
+ configurator.getConfiguration().getBuildSettings().getSkippedPlugins().add( sp1 );
+ Artifact sp2 = new Artifact();
+ sp2.setGroupId( "org.apache.maven.plugins" );
+ sp2.setVersion( "starter edition" );
+ configurator.getConfiguration().getBuildSettings().getSkippedPlugins().add( sp2 );
+
+ EasyMock.expect( build.getExtensions() ).andReturn( new ArrayList<>() ).atLeastOnce();
+ EasyMock.expect( build.getPlugins() ).andReturn( pl ).atLeastOnce();
+ EasyMock.expect( model.getBuild() ).andReturn( build ).atLeastOnce();
+ EasyMock.expect( model.getDependencies() ).andReturn( new ArrayList<>() ).atLeastOnce();
+ EasyMock.replay( build, model );
+
+ ( (XMvnModelValidator) validator ).customizeModel( model );
+ EasyMock.verify( model );
+
+ assertEquals( 1, pl.size() );
+ Plugin plugin = pl.iterator().next();
+ assertEquals( "foobar", plugin.getGroupId() );
+ assertEquals( "bar", plugin.getArtifactId() );
+ }
}
diff --git a/xmvn-core/src/test/java/org/fedoraproject/xmvn/deployer/BasicDeployerTest.java b/xmvn-core/src/test/java/org/fedoraproject/xmvn/deployer/BasicDeployerTest.java
index dfb6c171..92c79c98 100644
--- a/xmvn-core/src/test/java/org/fedoraproject/xmvn/deployer/BasicDeployerTest.java
+++ b/xmvn-core/src/test/java/org/fedoraproject/xmvn/deployer/BasicDeployerTest.java
@@ -74,7 +74,7 @@ public class BasicDeployerTest
deployer.deploy( req2 );
XmlAssert.assertThat( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + //
- "<metadata xmlns=\"http://fedorahosted.org/xmvn/METADATA/3.0.0\">\n" + //
+ "<metadata xmlns=\"http://fedorahosted.org/xmvn/METADATA/3.2.0\">\n" + //
" <artifacts>\n" + //
" <artifact>\n" + //
" <groupId>g</groupId>\n" + //
diff --git a/xmvn-tools/xmvn-install/src/test/resources/alias.xml b/xmvn-tools/xmvn-install/src/test/resources/alias.xml
index a86d73e9..9f957f02 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/alias.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/alias.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<artifacts>
<artifact>
<groupId>com.example</groupId>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/compat.xml b/xmvn-tools/xmvn-install/src/test/resources/compat.xml
index 428177cb..4bbe8a4c 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/compat.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/compat.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<artifacts>
<artifact>
<groupId>com.example</groupId>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/metadata-uuid.xml b/xmvn-tools/xmvn-install/src/test/resources/metadata-uuid.xml
index 8f0898c6..8e9c3532 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/metadata-uuid.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/metadata-uuid.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<uuid>test-uuid</uuid>
<artifacts>
<artifact>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/namespace-dep.xml b/xmvn-tools/xmvn-install/src/test/resources/namespace-dep.xml
index 59e6767b..61ec57d7 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/namespace-dep.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/namespace-dep.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<artifacts>
<artifact>
<groupId>com.example</groupId>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/namespace.xml b/xmvn-tools/xmvn-install/src/test/resources/namespace.xml
index d4a62f68..2c74347f 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/namespace.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/namespace.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<artifacts>
<artifact>
<groupId>com.example</groupId>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-aid-dep.xml b/xmvn-tools/xmvn-install/src/test/resources/no-aid-dep.xml
index 44ec6a89..0bee4351 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/no-aid-dep.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/no-aid-dep.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<artifacts>
<artifact>
<groupId>com.example</groupId>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-aid-excl.xml b/xmvn-tools/xmvn-install/src/test/resources/no-aid-excl.xml
index 9aec70fb..c3c3d6e4 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/no-aid-excl.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/no-aid-excl.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<artifacts>
<artifact>
<groupId>com.example</groupId>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-aid.xml b/xmvn-tools/xmvn-install/src/test/resources/no-aid.xml
index 9dd5b97f..df9f2f61 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/no-aid.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/no-aid.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<artifacts>
<artifact>
<groupId>com.example</groupId>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-file.xml b/xmvn-tools/xmvn-install/src/test/resources/no-file.xml
index a77dd6cc..e6915005 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/no-file.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/no-file.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<artifacts>
<artifact>
<groupId>com.example</groupId>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-gid-dep.xml b/xmvn-tools/xmvn-install/src/test/resources/no-gid-dep.xml
index 53b829ad..cb9a8859 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/no-gid-dep.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/no-gid-dep.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<artifacts>
<artifact>
<groupId>com.example</groupId>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-gid-excl.xml b/xmvn-tools/xmvn-install/src/test/resources/no-gid-excl.xml
index c8e3e6c8..22961523 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/no-gid-excl.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/no-gid-excl.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<artifacts>
<artifact>
<groupId>com.example</groupId>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-gid.xml b/xmvn-tools/xmvn-install/src/test/resources/no-gid.xml
index ba36e50e..4a53cd70 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/no-gid.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/no-gid.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<artifacts>
<artifact>
<groupId>com.example</groupId>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-version-dep.xml b/xmvn-tools/xmvn-install/src/test/resources/no-version-dep.xml
index 49fe2922..9dc686c1 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/no-version-dep.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/no-version-dep.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<artifacts>
<artifact>
<groupId>com.example</groupId>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-version.xml b/xmvn-tools/xmvn-install/src/test/resources/no-version.xml
index 2a8322ab..73db2c58 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/no-version.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/no-version.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<artifacts>
<artifact>
<groupId>com.example</groupId>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/nonexistent-file.xml b/xmvn-tools/xmvn-install/src/test/resources/nonexistent-file.xml
index 400bf234..0ea8c3fa 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/nonexistent-file.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/nonexistent-file.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<artifacts>
<artifact>
<groupId>com.example</groupId>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/nonreadable-file.xml b/xmvn-tools/xmvn-install/src/test/resources/nonreadable-file.xml
index cff22643..f40da52d 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/nonreadable-file.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/nonreadable-file.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<artifacts>
<artifact>
<groupId>com.example</groupId>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/nonregular-file.xml b/xmvn-tools/xmvn-install/src/test/resources/nonregular-file.xml
index 76c34bc9..e440b059 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/nonregular-file.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/nonregular-file.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<artifacts>
<artifact>
<groupId>com.example</groupId>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/ns-bar.xml b/xmvn-tools/xmvn-install/src/test/resources/ns-bar.xml
index 833e44f5..5bfedd69 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/ns-bar.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/ns-bar.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<uuid>1e5b4990-c4e3-42b4-9145-5b7783ab91a2</uuid>
<artifacts>
<artifact>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/ns-foo.xml b/xmvn-tools/xmvn-install/src/test/resources/ns-foo.xml
index 71e4b168..f97fbdf8 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/ns-foo.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/ns-foo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<uuid>1e5b4990-c4e3-42b4-9145-5b7783ab91a2</uuid>
<artifacts>
<artifact>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/resolved-version.xml b/xmvn-tools/xmvn-install/src/test/resources/resolved-version.xml
index 9279d896..2b824426 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/resolved-version.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/resolved-version.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<artifacts>
<artifact>
<groupId>com.example</groupId>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/skipped.xml b/xmvn-tools/xmvn-install/src/test/resources/skipped.xml
index b08836a1..c4a42c05 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/skipped.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/skipped.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<artifacts>
<artifact>
<groupId>com.example</groupId>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/test-pkg-main.xml b/xmvn-tools/xmvn-install/src/test/resources/test-pkg-main.xml
index 0bd964fc..fc38c9ac 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/test-pkg-main.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/test-pkg-main.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<uuid>1e5b4990-c4e3-42b4-9145-5b7783ab91a2</uuid>
<artifacts>
<artifact>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/test-pkg-resolved.xml b/xmvn-tools/xmvn-install/src/test/resources/test-pkg-resolved.xml
index 9d3bbb67..55270861 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/test-pkg-resolved.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/test-pkg-resolved.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<uuid>1e5b4990-c4e3-42b4-9145-5b7783ab91a2</uuid>
<artifacts>
<artifact>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/test-pkg-sub.xml b/xmvn-tools/xmvn-install/src/test/resources/test-pkg-sub.xml
index 068f17f6..f6da1e41 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/test-pkg-sub.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/test-pkg-sub.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<uuid>1e5b4990-c4e3-42b4-9145-5b7783ab91a2</uuid>
<artifacts>
<artifact>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/test-pkg.xml b/xmvn-tools/xmvn-install/src/test/resources/test-pkg.xml
index 8b0d6223..4345c778 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/test-pkg.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/test-pkg.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<uuid>1e5b4990-c4e3-42b4-9145-5b7783ab91a2</uuid>
<artifacts>
<artifact>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/uuid.xml b/xmvn-tools/xmvn-install/src/test/resources/uuid.xml
index b57b9584..005b8f5c 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/uuid.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/uuid.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<artifacts>
<artifact>
<groupId>com.example</groupId>
diff --git a/xmvn-tools/xmvn-install/src/test/resources/valid.xml b/xmvn-tools/xmvn-install/src/test/resources/valid.xml
index f2fa0c24..5ed82dfe 100644
--- a/xmvn-tools/xmvn-install/src/test/resources/valid.xml
+++ b/xmvn-tools/xmvn-install/src/test/resources/valid.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
+<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.2.0">
<artifacts>
<artifact>
<groupId>com.example</groupId>
--
2.36.0
Reference in New Issue View Git Blame Copy Permalink