diff --git a/fix-xmvn-pomless-builddep.patch b/fix-xmvn-pomless-builddep.patch index 8718af3..582f6d6 100644 --- a/fix-xmvn-pomless-builddep.patch +++ b/fix-xmvn-pomless-builddep.patch @@ -15,16 +15,16 @@ diff --git a/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoModelRea index 349c776..e8a4f92 100644 --- a/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoModelReader.java +++ b/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoModelReader.java -@@ -24,6 +24,8 @@ +@@ -26,6 +26,8 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import org.apache.maven.model.InputLocation; +import org.apache.maven.model.InputSource; + import org.apache.maven.model.Build; import org.apache.maven.model.Model; import org.apache.maven.model.Parent; - import org.apache.maven.model.building.ModelProcessor; -@@ -81,6 +83,7 @@ +@@ -90,6 +92,7 @@ String bundleVersion = getRequiredHeaderValue("Bundle-Version", headers, manifestFile); model.setVersion(getPomVersion(bundleVersion)); model.setPackaging(getPackagingType(bundleSymbolicName)); @@ -32,15 +32,15 @@ index 349c776..e8a4f92 100644 return model; } -@@ -109,6 +112,7 @@ - model.setVersion(getPomVersion(featureVersionNode.getValue())); - model.setPackaging("eclipse-feature"); +@@ -150,6 +153,7 @@ + } + model.setVersion(getPomVersion(versionNode.getValue())); // groupId is inherited from parent pom -+ setLocation(model, featureXml); ++ setLocation(model, xmlFile); return model; } -@@ -192,4 +196,11 @@ +@@ -247,4 +251,11 @@ parentReference.setVersion(version); return parentReference; } @@ -57,53 +57,53 @@ index 05cf0c2..a40e738 100644 --- a/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoModelReaderTest.java +++ b/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoModelReaderTest.java @@ -19,6 +19,8 @@ - import java.util.HashMap; - import java.util.Map; - -+import org.apache.maven.model.InputLocation; -+import org.apache.maven.model.InputSource; - import org.apache.maven.model.Model; - import org.apache.maven.model.Parent; - import org.apache.maven.model.building.ModelProcessor; -@@ -43,6 +45,7 @@ - assertEquals("0.1.0-SNAPSHOT", model.getVersion()); - assertEquals("eclipse-plugin", model.getPackaging()); - assertParent(model.getParent()); -+ assertLocation("bundle1/META-INF/MANIFEST.MF", model.getLocation("")); - } - - public void testReadTestBundle() throws Exception { -@@ -52,6 +55,7 @@ - assertEquals("1.0.1", model.getVersion()); - assertEquals("eclipse-test-plugin", model.getPackaging()); - assertParent(model.getParent()); -+ assertLocation("bundle1.tests/META-INF/MANIFEST.MF", model.getLocation("")); - } - - public void testReadFeature() throws Exception { -@@ -61,6 +65,7 @@ - assertEquals("1.0.0-SNAPSHOT", model.getVersion()); - assertEquals("eclipse-feature", model.getPackaging()); - assertParent(model.getParent()); -+ assertLocation("feature/feature.xml", model.getLocation("")); - } - - public void testMissingManifestOrFeature() throws Exception { -@@ -148,6 +153,17 @@ - assertEquals("0.0.1-SNAPSHOT", parent.getVersion()); - } - -+ private void assertLocation(String expectedLocation, InputLocation location) { -+ assertNotNull(location); -+ assertEquals(0, location.getLineNumber()); -+ assertEquals(0, location.getColumnNumber()); -+ InputSource source = location.getSource(); -+ assertNotNull(source); -+ assertEquals(new File(getPolyglotTestDir(), expectedLocation).toString(), source.getLocation()); -+ assertNotNull(source.getModelId()); -+ assertTrue(source.getModelId().matches("^testParent.groupId:.*:.*")); -+ } -+ - private Map createReaderOptions(File buildProperties) { - Map options = new HashMap<>(); - options.put(ModelProcessor.SOURCE, buildProperties.getAbsolutePath()); + import java.util.HashMap; + import java.util.Map; + ++import org.apache.maven.model.InputLocation; ++import org.apache.maven.model.InputSource; + import org.apache.maven.model.Model; + import org.apache.maven.model.Parent; + import org.apache.maven.model.building.ModelProcessor; +@@ -45,6 +47,7 @@ + assertEquals("0.1.0-SNAPSHOT", model.getVersion()); + assertEquals("eclipse-plugin", model.getPackaging()); + assertParent(model.getParent()); ++ assertLocation("bundle1/META-INF/MANIFEST.MF", model.getLocation("")); + } + + @Test +@@ -55,6 +58,7 @@ + assertEquals("1.0.1", model.getVersion()); + assertEquals("eclipse-test-plugin", model.getPackaging()); + assertParent(model.getParent()); ++ assertLocation("bundle1.tests/META-INF/MANIFEST.MF", model.getLocation("")); + } + + @Test +@@ -65,6 +69,7 @@ + assertEquals("1.0.0-SNAPSHOT", model.getVersion()); + assertEquals("eclipse-feature", model.getPackaging()); + assertParent(model.getParent()); ++ assertLocation("feature/feature.xml", model.getLocation("")); + } + + @Test +@@ -204,6 +209,17 @@ + assertEquals("0.0.1-SNAPSHOT", parent.getVersion()); + } + ++ private void assertLocation(String expectedLocation, InputLocation location) { ++ assertNotNull(location); ++ assertEquals(0, location.getLineNumber()); ++ assertEquals(0, location.getColumnNumber()); ++ InputSource source = location.getSource(); ++ assertNotNull(source); ++ assertEquals(new File(getPolyglotTestDir(), expectedLocation).toString(), source.getLocation()); ++ assertNotNull(source.getModelId()); ++ assertTrue(source.getModelId().matches("^testParent.groupId:.*:.*")); ++ } ++ + private Map createReaderOptions(File buildProperties) { + Map options = new HashMap<>(); + options.put(ModelProcessor.SOURCE, buildProperties.getAbsolutePath()); diff --git a/sources b/sources index 152e9df..3a68540 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (org.eclipse.tycho.extras-tycho-extras-1.0.0.tar.xz) = a09620162b97ceaf0e3dbf4237e8a03886b4226884700970e9d410b2d81b60a5c91de11e2de235fa53efc56123e418cab25c30facfb56156c8c3e58b0b81f8fc +SHA512 (org.eclipse.tycho.extras-tycho-extras-1.1.0.tar.xz) = 814aa2f5f6f6c8c12068143f1692d48d0ebacf31bfaa3600f753a4a901ed4247a47397553e9c258c28286afbff68c50b311d558101bd0f2a0bff539db69c8367 diff --git a/tycho-extras-fix-build.patch b/tycho-extras-fix-build.patch index beb06c5..6ccfef3 100644 --- a/tycho-extras-fix-build.patch +++ b/tycho-extras-fix-build.patch @@ -2,7 +2,7 @@ diff --git a/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/ index 05baf87..2c62fb0 100644 --- a/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java +++ b/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java -@@ -515,15 +515,19 @@ public class SourceFeatureMojo extends AbstractMojo { +@@ -549,15 +549,19 @@ public class SourceFeatureMojo extends AbstractMojo { } private String getAttribute(PlexusConfiguration dom, String attrName) { diff --git a/tycho-extras-use-custom-resolver.patch b/tycho-extras-use-custom-resolver.patch index e5bc919..6637225 100644 --- a/tycho-extras-use-custom-resolver.patch +++ b/tycho-extras-use-custom-resolver.patch @@ -24,7 +24,7 @@ index 4c4baf0..18db847 100644 import java.util.ArrayList; import java.util.List; import java.util.Map; -@@ -51,6 +52,7 @@ import org.eclipse.tycho.p2.resolver.facade.P2Resolver; +@@ -52,6 +53,7 @@ import org.eclipse.tycho.p2.resolver.facade.P2Resolver; import org.eclipse.tycho.p2.resolver.facade.P2ResolverFactory; import org.eclipse.tycho.p2.target.facade.TargetPlatformConfigurationStub; import org.eclipse.tycho.plugins.p2.extras.Repository; @@ -32,7 +32,7 @@ index 4c4baf0..18db847 100644 /** * Launch an eclipse process with arbitrary commandline arguments. The eclipse installation is -@@ -187,6 +189,14 @@ public class EclipseRunMojo extends AbstractMojo { +@@ -225,6 +227,14 @@ public class EclipseRunMojo extends AbstractMojo { TargetPlatformConfigurationStub tpConfiguration = new TargetPlatformConfigurationStub(); // we want to resolve from remote repos only tpConfiguration.setForceIgnoreLocalArtifacts(true); diff --git a/tycho-extras.spec b/tycho-extras.spec index f078d27..324fb54 100644 --- a/tycho-extras.spec +++ b/tycho-extras.spec @@ -3,8 +3,8 @@ %global snap %{nil} Name: tycho-extras -Version: 1.0.0 -Release: 3%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: Additional plugins for Tycho License: EPL @@ -88,6 +88,9 @@ ln -s %{_javadir}/tesla-polyglot/polyglot-common.jar %{buildroot}%{_datadir}/xmv %files javadoc -f .mfiles-javadoc %changelog +* Wed May 02 2018 Mat Booth - 1.1.0-1 +- Update to latest upstream release + * Fri Feb 09 2018 Fedora Release Engineering - 1.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild