pool/xmvn
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=45

Browse Source
This commit is contained in:
Fridrich Strba 2022-05-05 11:00:06 +00:00 committed by Git OBS Bridge
parent 2fe6b4e3b4
commit c45538960e
15 changed files with 723 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
0001-Prefer-namespaced-metadata-when-duplicates-are-found.patch
View File

@ -1,7 +1,7 @@
From 1474fd57e606bdb00417524a7b648f7841b014c8 Mon Sep 17 00:00:00 2001
From ae0780c88f5bb3dbf833a662de1bcc5f37246b48 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 28 Jun 2019 12:15:23 +0200
Subject: [PATCH 1/3] Prefer namespaced metadata when duplicates are found
Subject: [PATCH 1/7] Prefer namespaced metadata when duplicates are found
---
.../metadata/impl/DefaultMetadataResult.java | 33 +++++++++++--------
@ -55,5 +55,5 @@ index c8b63214..67bafef5 100644
}
--
2.21.0
2.36.0

500
0002-Allow-removing-plugins-during-model-validation.patch Normal file
View File

@ -0,0 +1,500 @@
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

6
0002-Make-xmvn-subst-honor-settings-for-ignoring-duplicat.patch → 0003-Make-xmvn-subst-honor-settings-for-ignoring-duplicat.patch
View File

@ -1,7 +1,7 @@
From 4957492864d6a88a814bfd6f21798b52a4e70515 Mon Sep 17 00:00:00 2001
From b6c776590067fcef584097ac6e984b6380d0421a Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sat, 29 Jun 2019 14:00:13 +0200
Subject: [PATCH 2/3] Make xmvn-subst honor settings for ignoring duplicate
Subject: [PATCH 3/7] Make xmvn-subst honor settings for ignoring duplicate
metadata
---
@ -77,5 +77,5 @@ index 423b5e61..30b1ac63 100644
visitor.setTypes( cliRequest.getTypes() );
visitor.setFollowSymlinks( cliRequest.isFollowSymlinks() );
--
2.21.0
2.36.0

10
0003-Fix-requires-generation-for-self-depending-packages.patch → 0004-Fix-requires-generation-for-self-depending-packages.patch
View File

@ -1,7 +1,7 @@
From a07c7079d6e7ed3f799454a827836b3ca3033e45 Mon Sep 17 00:00:00 2001
From e32481606ae9ac683cea6e9e9cd4a19cd8a3a54e Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 1 Jul 2019 12:22:04 +0200
Subject: [PATCH 3/3] Fix requires generation for self-depending packages
Subject: [PATCH 4/7] Fix requires generation for self-depending packages
---
.../tools/install/impl/DefaultInstaller.java | 5 ++++
@ -50,12 +50,12 @@ index 48db907d..ccbbf63d 100644
throws Exception
diff --git a/xmvn-tools/xmvn-install/src/test/resources/self-requires-resolved.xml b/xmvn-tools/xmvn-install/src/test/resources/self-requires-resolved.xml
new file mode 100644
index 00000000..59e8ad61
index 00000000..c800b8d7
--- /dev/null
+++ b/xmvn-tools/xmvn-install/src/test/resources/self-requires-resolved.xml
@@ -0,0 +1,25 @@
+<?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>bfb4d47f-4bf2-49bc-bd85-1d3528e97746</uuid>
+ <artifacts>
+ <artifact>
@ -111,5 +111,5 @@ index 00000000..16a78328
+</metadata>
\ No newline at end of file
--
2.21.0
2.36.0

6
0001-Fix-resolution-of-aliases-registered-by-add_maven_de.patch → 0005-Fix-resolution-of-aliases-registered-by-add_maven_de.patch
View File

@ -1,7 +1,7 @@
From 2f1be92ecb3cc227dd4a6957165b4c6c9268400c Mon Sep 17 00:00:00 2001
From 357fc767ff395226f5ca758761aaef9feb90ebe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Sun, 6 Oct 2019 16:31:51 +0200
Subject: [PATCH] Fix resolution of aliases registered by %add_maven_depmap
Subject: [PATCH 5/7] Fix resolution of aliases registered by %add_maven_depmap
---
.../fedoraproject/xmvn/connector/gradle/GradleResolver.java | 4 ++--
@ -23,5 +23,5 @@ index 90b07eb1..7f292e00 100644
String classifier = artifact.getName().getClassifier();
String version = moduleId.getVersion();
--
2.23.0
2.36.0

34
xmvn-gradle_4_4_1.patch → 0006-Revert-port-to-gradle-4.5.1.patch
View File

@ -1,6 +1,19 @@
--- xmvn-3.1.0/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java 2019-06-14 13:04:11.000000000 +0200
+++ xmvn-3.1.0/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java 2019-11-21 14:38:15.619695681 +0100
@@ -25,7 +25,6 @@
From e580ac067b147c56e4d330915ff52429bc4ab4c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Tue, 3 May 2022 16:38:31 +0200
Subject: [PATCH 6/7] Revert "port to gradle 4.5.1"
This reverts commit be50418df8808e46ee2695da281f95497f5cf179.
---
.../xmvn/connector/gradle/GradleResolver.java | 23 +++----------------
xmvn-parent/pom.xml | 2 +-
2 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java b/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java
index 7f292e00..ac6a7883 100644
--- a/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java
+++ b/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java
@@ -25,7 +25,6 @@ import org.gradle.api.artifacts.ComponentMetadataSupplier;
import org.gradle.api.artifacts.ModuleVersionIdentifier;
import org.gradle.api.artifacts.component.ComponentArtifactIdentifier;
import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
@ -8,7 +21,7 @@
import org.gradle.api.internal.artifacts.ImmutableModuleIdentifierFactory;
import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ConfiguredModuleComponentRepository;
import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleComponentRepositoryAccess;
@@ -35,13 +34,10 @@
@@ -35,13 +34,10 @@ import org.gradle.api.internal.artifacts.ivyservice.resolveengine.artifact.Resol
import org.gradle.api.internal.artifacts.repositories.AbstractArtifactRepository;
import org.gradle.api.internal.artifacts.repositories.ResolutionAwareRepository;
import org.gradle.api.internal.artifacts.repositories.resolver.MetadataFetchingCost;
@ -22,7 +35,7 @@
import org.gradle.internal.component.external.model.ModuleComponentArtifactMetadata;
import org.gradle.internal.component.external.model.ModuleComponentResolveMetadata;
import org.gradle.internal.component.external.model.ModuleDependencyMetadata;
@@ -84,27 +80,17 @@
@@ -84,27 +80,17 @@ public class GradleResolver
{
public GradleResolver( MetaDataParser<MutableMavenModuleResolveMetadata> pomParser,
ImmutableModuleIdentifierFactory moduleIdentifierFactory,
@ -51,7 +64,7 @@
private FileResourceRepository fileRepository;
private final Logger logger = LoggerFactory.getLogger( GradleResolver.class );
@@ -233,11 +219,8 @@
@@ -233,11 +219,8 @@ public class GradleResolver
logger.debug( "Artifact {} found, returning minimal model", artifact3 );
ModuleVersionIdentifier mvi =
moduleIdentifierFactory.moduleWithVersion( id.getGroup(), id.getModule(), id.getVersion() );
@ -65,8 +78,10 @@
result.resolved( metaData.asImmutable() );
return;
}
--- xmvn-3.1.0/xmvn-parent/pom.xml 2019-06-14 13:04:11.000000000 +0200
+++ xmvn-3.1.0/xmvn-parent/pom.xml 2019-11-21 14:36:19.831099473 +0100
diff --git a/xmvn-parent/pom.xml b/xmvn-parent/pom.xml
index 7ea1d9b1..67b25fbc 100644
--- a/xmvn-parent/pom.xml
+++ b/xmvn-parent/pom.xml
@@ -84,7 +84,7 @@
<atinjectVersion>1</atinjectVersion>
<ivyVersion>2.5.0-rc1</ivyVersion>
@ -76,3 +91,6 @@
<groovyVersion>2.4.12</groovyVersion>
<mavenInvokerVersion>3.0.1</mavenInvokerVersion>
<mavenResolverVersion>1.3.1</mavenResolverVersion>
--
2.36.0

40
0007-Fixes-56-Honour-source-parameter-in-javadoc-mojo.patch Normal file
View File

@ -0,0 +1,40 @@
From 626864e576ef1466cd84a044fddd1881770a3160 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Thu, 9 Jul 2020 17:52:47 +0100
Subject: [PATCH 7/7] Fixes #56 - Honour source parameter in javadoc mojo
This parameter is used by maven-javadoc-plugin to handle assert
and enum keywords that are used as identifiers in old code.
---
.../java/org/fedoraproject/xmvn/mojo/JavadocMojo.java | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java
index 3d6ef5ef..c1e61617 100644
--- a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java
+++ b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java
@@ -84,6 +84,9 @@ public class JavadocMojo
@Parameter( defaultValue = "${project.build.directory}", required = true )
private File buildDirectory;
+ @Parameter( property = "source" )
+ private String source;
+
private static String quoted( Object obj )
{
String arg = obj.toString();
@@ -226,6 +229,11 @@ public class JavadocMojo
opts.add( quoted( docencoding ) );
opts.add( "-doctitle" );
opts.add( quoted( "Javadoc for package XXX" ) );
+ if ( source != null )
+ {
+ opts.add( "-source" );
+ opts.add( quoted( source ) );
+ }
for ( Path file : files )
opts.add( quoted( file ) );
--
2.36.0

78
0008-Mimic-maven-javadoc-plugin-for-source-and-release.patch Normal file
View File

@ -0,0 +1,78 @@
From ebba7d4d4534d8e1d8c0d8e31b92269e62adea8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Wed, 4 May 2022 13:26:00 +0200
Subject: [PATCH 8/8] Mimic maven-javadoc-plugin for -source and --release
Consider the maven.compiler.sourceand maven.compiler.release
properties. Skip module-info.java if source level is specified
and it is < 9.
---
.../fedoraproject/xmvn/mojo/JavadocMojo.java | 37 +++++++++++++++++--
1 file changed, 34 insertions(+), 3 deletions(-)
diff --git a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java
index c1e61617..a2582057 100644
--- a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java
+++ b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java
@@ -84,9 +84,12 @@ public class JavadocMojo
@Parameter( defaultValue = "${project.build.directory}", required = true )
private File buildDirectory;
- @Parameter( property = "source" )
+ @Parameter( property = "source", defaultValue = "${maven.compiler.source}" )
private String source;
+ @Parameter( defaultValue = "${maven.compiler.release}" )
+ private String release;
+
private static String quoted( Object obj )
{
String arg = obj.toString();
@@ -229,14 +232,42 @@ public class JavadocMojo
opts.add( quoted( docencoding ) );
opts.add( "-doctitle" );
opts.add( quoted( "Javadoc for package XXX" ) );
- if ( source != null )
+
+ String sourceLevel = null;
+ if ( release != null )
+ {
+ opts.add( "--release" );
+ opts.add( quoted( release ) );
+ sourceLevel = release;
+
+ }
+ else if ( source != null )
{
opts.add( "-source" );
opts.add( quoted( source ) );
+ sourceLevel = source;
+ }
+
+ boolean skipModuleInfo = false;
+ if ( sourceLevel != null )
+ {
+ try
+ {
+ float f = Float.parseFloat(sourceLevel);
+ if (f < 9)
+ skipModuleInfo = true;
+ }
+ catch ( Exception e )
+ {
+ // pass, we assume that we use modular Java
+ }
}
for ( Path file : files )
- opts.add( quoted( file ) );
+ {
+ if ( !skipModuleInfo || !file.endsWith( "module-info.java" ) )
+ opts.add( quoted( file ) );
+ }
Files.write( outputDir.resolve( "args" ), opts, StandardOpenOption.CREATE );
--
2.36.0

12
xmvn-connector-aether.spec
View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -28,6 +28,14 @@ Group: Development/Tools/Building
URL: https://fedora-java.github.io/xmvn/
Source0: https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz
Source1: %{parent}-build.tar.xz
Patch1: 0001-Prefer-namespaced-metadata-when-duplicates-are-found.patch
Patch2: 0002-Allow-removing-plugins-during-model-validation.patch
Patch3: 0003-Make-xmvn-subst-honor-settings-for-ignoring-duplicat.patch
Patch4: 0004-Fix-requires-generation-for-self-depending-packages.patch
Patch5: 0005-Fix-resolution-of-aliases-registered-by-add_maven_de.patch
Patch6: 0006-Revert-port-to-gradle-4.5.1.patch
Patch7: 0007-Fixes-56-Honour-source-parameter-in-javadoc-mojo.patch
Patch8: 0008-Mimic-maven-javadoc-plugin-for-source-and-release.patch
BuildRequires: %{parent}-api = %{version}
BuildRequires: %{parent}-core = %{version}
BuildRequires: ant
@ -61,6 +69,8 @@ This package provides %{summary}.
%prep
%setup -q -n %{parent}-%{version} -a1
%autopatch -p1
# Bisect IT has no chances of working in local, offline mode, without
# network access - it needs to access remote repositories.
find -name BisectIntegrationTest.java -delete

16
xmvn-connector-gradle.spec
View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -26,9 +26,14 @@ License: Apache-2.0
Group: Development/Tools/Building
URL: https://fedora-java.github.io/xmvn/
Source0: https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz
Patch0: 0001-Fix-resolution-of-aliases-registered-by-add_maven_de.patch
# Backport to gradle 4.4.1
Patch1: xmvn-gradle_4_4_1.patch
Patch1: 0001-Prefer-namespaced-metadata-when-duplicates-are-found.patch
Patch2: 0002-Allow-removing-plugins-during-model-validation.patch
Patch3: 0003-Make-xmvn-subst-honor-settings-for-ignoring-duplicat.patch
Patch4: 0004-Fix-requires-generation-for-self-depending-packages.patch
Patch5: 0005-Fix-resolution-of-aliases-registered-by-add_maven_de.patch
Patch6: 0006-Revert-port-to-gradle-4.5.1.patch
Patch7: 0007-Fixes-56-Honour-source-parameter-in-javadoc-mojo.patch
Patch8: 0008-Mimic-maven-javadoc-plugin-for-source-and-release.patch
BuildRequires: fdupes
# Build this one with the bootstrap package in order to avoid build cycles
BuildRequires: maven-local
@ -59,8 +64,7 @@ This package provides %{summary}.
%prep
%setup -q -n %{parent}-%{version}
%patch0 -p1
%patch1 -p1
%autopatch -p1
# Bisect IT has no chances of working in local, offline mode, without
# network access - it needs to access remote repositories.

12
xmvn-connector-ivy.spec
View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -28,6 +28,14 @@ Group: Development/Tools/Building
URL: https://fedora-java.github.io/xmvn/
Source0: https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz
Source1: %{parent}-build.tar.xz
Patch1: 0001-Prefer-namespaced-metadata-when-duplicates-are-found.patch
Patch2: 0002-Allow-removing-plugins-during-model-validation.patch
Patch3: 0003-Make-xmvn-subst-honor-settings-for-ignoring-duplicat.patch
Patch4: 0004-Fix-requires-generation-for-self-depending-packages.patch
Patch5: 0005-Fix-resolution-of-aliases-registered-by-add_maven_de.patch
Patch6: 0006-Revert-port-to-gradle-4.5.1.patch
Patch7: 0007-Fixes-56-Honour-source-parameter-in-javadoc-mojo.patch
Patch8: 0008-Mimic-maven-javadoc-plugin-for-source-and-release.patch
BuildRequires: %{parent}-api = %{version}
BuildRequires: ant
BuildRequires: apache-ivy
@ -54,6 +62,8 @@ This package provides %{summary}.
%prep
%setup -q -n %{parent}-%{version} -a1
%autopatch -p1
# Bisect IT has no chances of working in local, offline mode, without
# network access - it needs to access remote repositories.
find -name BisectIntegrationTest.java -delete

12
xmvn-mojo.spec
View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -26,6 +26,14 @@ License: Apache-2.0
Group: Development/Tools/Building
URL: https://fedora-java.github.io/xmvn/
Source0: https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz
Patch1: 0001-Prefer-namespaced-metadata-when-duplicates-are-found.patch
Patch2: 0002-Allow-removing-plugins-during-model-validation.patch
Patch3: 0003-Make-xmvn-subst-honor-settings-for-ignoring-duplicat.patch
Patch4: 0004-Fix-requires-generation-for-self-depending-packages.patch
Patch5: 0005-Fix-resolution-of-aliases-registered-by-add_maven_de.patch
Patch6: 0006-Revert-port-to-gradle-4.5.1.patch
Patch7: 0007-Fixes-56-Honour-source-parameter-in-javadoc-mojo.patch
Patch8: 0008-Mimic-maven-javadoc-plugin-for-source-and-release.patch
BuildRequires: %{parent}-api = %{version}
BuildRequires: %{parent}-core = %{version}
BuildRequires: fdupes
@ -72,6 +80,8 @@ This package provides %{summary}.
%prep
%setup -q -n %{parent}-%{version}
%autopatch -p1
# Bisect IT has no chances of working in local, offline mode, without
# network access - it needs to access remote repositories.
find -name BisectIntegrationTest.java -delete

14
xmvn-parent.spec
View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -26,7 +26,15 @@ License: Apache-2.0
Group: Development/Tools/Building
URL: https://fedora-java.github.io/xmvn/
Source0: https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz
BuildRequires: javapackages-local
Patch1: 0001-Prefer-namespaced-metadata-when-duplicates-are-found.patch
Patch2: 0002-Allow-removing-plugins-during-model-validation.patch
Patch3: 0003-Make-xmvn-subst-honor-settings-for-ignoring-duplicat.patch
Patch4: 0004-Fix-requires-generation-for-self-depending-packages.patch
Patch5: 0005-Fix-resolution-of-aliases-registered-by-add_maven_de.patch
Patch6: 0006-Revert-port-to-gradle-4.5.1.patch
Patch7: 0007-Fixes-56-Honour-source-parameter-in-javadoc-mojo.patch
Patch8: 0008-Mimic-maven-javadoc-plugin-for-source-and-release.patch
BuildRequires: javapackages-local >= 6
BuildRequires: xmvn-resolve
BuildRequires: mvn(org.apache.maven.plugins:maven-compiler-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-jar-plugin)
@ -40,6 +48,8 @@ This package provides XMvn parent POM.
%prep
%setup -q -n %{parent}-%{version}
%autopatch -p1
%pom_remove_plugin -r :maven-site-plugin
# Upstream code quality checks, not relevant when building RPMs

15
xmvn-tools.spec
View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -28,8 +28,13 @@ URL: https://fedora-java.github.io/xmvn/
Source0: https://github.com/fedora-java/xmvn/releases/download/%{version}/%{parent}-%{version}.tar.xz
Source1: %{parent}-build.tar.xz
Patch1: 0001-Prefer-namespaced-metadata-when-duplicates-are-found.patch
Patch2: 0002-Make-xmvn-subst-honor-settings-for-ignoring-duplicat.patch
Patch3: 0003-Fix-requires-generation-for-self-depending-packages.patch
Patch2: 0002-Allow-removing-plugins-during-model-validation.patch
Patch3: 0003-Make-xmvn-subst-honor-settings-for-ignoring-duplicat.patch
Patch4: 0004-Fix-requires-generation-for-self-depending-packages.patch
Patch5: 0005-Fix-resolution-of-aliases-registered-by-add_maven_de.patch
Patch6: 0006-Revert-port-to-gradle-4.5.1.patch
Patch7: 0007-Fixes-56-Honour-source-parameter-in-javadoc-mojo.patch
Patch8: 0008-Mimic-maven-javadoc-plugin-for-source-and-release.patch
BuildRequires: ant
BuildRequires: apache-commons-compress
BuildRequires: beust-jcommander
@ -143,9 +148,7 @@ This package provides %{summary}.
%prep
%setup -q -n %{parent}-%{version} -a1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%autopatch -p1
# Bisect IT has no chances of working in local, offline mode, without
# network access - it needs to access remote repositories.

2
xmvn.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package xmvn
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed