rpms
/
tycho
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to latest upstream

This commit is contained in:
Mat Booth 2016-11-02 14:10:41 +00:00
parent d6a767b61d
commit 2a32b6c937
4 changed files with 82 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sources
View File

@ -1,3 +1,3 @@
9d9d533b4adff029b92564d393fab84c fedoraproject-p2-4e1319.tar.xz
ed271eb952e0f1ecb826e012f46e89b5 org.eclipse.tycho-tycho-0.25.0.tar.xz
81f33bc522de3d1848d1d1b6a91f4d3f fedoraproject-p2-f0168e8.tar.xz
153d63d4b78d9b64eedc84ab6e780368 org.eclipse.tycho-tycho-0.26.0.tar.xz
05f6c0c84ad6e8a58000bca28c9ee3e5 eclipse-bootstrap-neon.tar.xz

23
tycho-eclipse-neon.patch
View File

@ -1,23 +0,0 @@
--- tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockServiceImpl.java.orig 2016-04-20 12:22:19.317665808 +0100
+++ tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockServiceImpl.java 2016-04-20 12:24:38.059763976 +0100
@@ -12,9 +12,11 @@
package org.eclipse.tycho.core.locking;
import java.io.File;
+import java.util.concurrent.atomic.AtomicBoolean;
import org.codehaus.plexus.component.annotations.Component;
import org.eclipse.osgi.internal.framework.EquinoxContainer;
+import org.eclipse.osgi.internal.framework.EquinoxConfiguration.ConfigValues;
import org.eclipse.osgi.internal.location.BasicLocation;
import org.eclipse.osgi.service.datalocation.Location;
import org.eclipse.tycho.locking.facade.FileLockService;
@@ -26,7 +28,7 @@
private Location anyLocation;
public FileLockServiceImpl() {
- anyLocation = new BasicLocation(null, null, false, null, new EquinoxContainer(null).getConfiguration());
+ anyLocation = new BasicLocation(null, null, false, null, new ConfigValues(null), new EquinoxContainer(null), new AtomicBoolean(false));
}
/*

92
tycho-fix-surefire.patch
View File

@ -157,7 +157,7 @@ index 991edc1..83732d5 100644
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
@@ -5,9 +5,10 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.2.2",
Eclipse-AutoStart: true
Bundle-Version: 0.25.0
Bundle-Version: 0.26.0
Bundle-ClassPath: .,
- jars/surefire-booter-2.17.jar,
- jars/surefire-api-2.17.jar,
@ -189,7 +189,7 @@ diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/
index 19eeab9..31e9d3e 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
@@ -21,7 +21,9 @@ import java.io.IOException;
@@ -21,7 +21,9 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
@ -199,8 +199,8 @@ index 19eeab9..31e9d3e 100644
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -34,12 +36,15 @@ import org.apache.maven.surefire.booter.ClasspathConfiguration;
import org.apache.maven.surefire.booter.ForkedBooter;
@@ -36,12 +38,15 @@
import org.apache.maven.surefire.booter.PropertiesWrapper;
import org.apache.maven.surefire.booter.ProviderConfiguration;
import org.apache.maven.surefire.booter.ProviderFactory;
+import org.apache.maven.surefire.booter.Shutdown;
@ -215,7 +215,20 @@ index 19eeab9..31e9d3e 100644
import org.apache.maven.surefire.testset.TestRequest;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
@@ -75,13 +80,14 @@ public class OsgiSurefireBooter {
@@ -62,7 +67,11 @@
File reportsDir = new File(testProps.getProperty("reportsdirectory"));
String provider = testProps.getProperty("testprovider");
String runOrder = testProps.getProperty("runOrder");
- PropertiesWrapper wrapper = new PropertiesWrapper(testProps);
+ Map<String, String> testPropsMap = new HashMap<String, String>();
+ for (Map.Entry e : testProps.entrySet()) {
+ testPropsMap.put((String) e.getKey(), (String) e.getValue());
+ }
+ PropertiesWrapper wrapper = new PropertiesWrapper(testPropsMap);
List<String> suiteXmlFiles = wrapper.getStringList(BooterConstants.TEST_SUITE_XML_FILES);
boolean forkRequested = true;
@@ -79,13 +88,14 @@
new ClassLoaderConfiguration(useSystemClassloader, useManifestOnlyJar), forkRequested, inForkedVM);
// TODO dir scanning with no includes done here (done in TestMojo already)
// but without dirScannerParams we get an NPE accessing runOrder
@ -224,8 +237,8 @@ index 19eeab9..31e9d3e 100644
+ DirectoryScannerParameters dirScannerParams = new DirectoryScannerParameters(testClassesDir, Collections.<String>emptyList(),
+ Collections.<String>emptyList(), Collections.<String>emptyList(), failIfNoTests, runOrder);
ReporterConfiguration reporterConfig = new ReporterConfiguration(reportsDir, trimStacktrace);
- TestRequest testRequest = new TestRequest(null, testClassesDir, null);
+ TestRequest testRequest = new TestRequest(null, testClassesDir, new TestListResolver(Collections.<String> emptyList()));
- TestRequest testRequest = new TestRequest(suiteXmlFiles, testClassesDir, null);
+ TestRequest testRequest = new TestRequest(suiteXmlFiles, testClassesDir, new TestListResolver(Collections.<String> emptyList()));
ProviderConfiguration providerConfiguration = new ProviderConfiguration(dirScannerParams,
new RunOrderParameters(runOrder, null), failIfNoTests, reporterConfig, null, testRequest,
- extractProviderProperties(testProps), null, false);
@ -234,7 +247,7 @@ index 19eeab9..31e9d3e 100644
StartupReportConfiguration startupReportConfig = new StartupReportConfiguration(useFile, printSummary,
StartupReportConfiguration.PLAIN_REPORT_FORMAT, redirectTestOutputToFile, disableXmlReport, reportsDir,
trimStacktrace, null, "TESTHASH", false, 0);
@@ -103,12 +109,12 @@ public class OsgiSurefireBooter {
@@ -107,12 +117,12 @@
/*
* See TestMojo#mergeProviderProperties
*/
@ -267,7 +280,7 @@ diff --git a/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tych
index 9f1e332..62a16fb 100644
--- a/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java
+++ b/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java
@@ -20,6 +20,7 @@ import java.net.MalformedURLException;
@@ -20,6 +20,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@ -275,24 +288,37 @@ index 9f1e332..62a16fb 100644
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -45,6 +46,7 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
import org.apache.maven.repository.RepositorySystem;
@@ -47,6 +48,7 @@
import org.apache.maven.surefire.booter.BooterConstants;
import org.apache.maven.surefire.booter.PropertiesWrapper;
import org.apache.maven.surefire.booter.ProviderParameterNames;
+import org.apache.maven.surefire.testset.TestListResolver;
import org.apache.maven.surefire.util.DefaultScanResult;
import org.apache.maven.surefire.util.ScanResult;
import org.apache.maven.toolchain.Toolchain;
@@ -835,7 +837,7 @@ public class TestMojo extends AbstractMojo {
@@ -864,7 +866,7 @@
}
p.put("failifnotests", String.valueOf(failIfNoTests));
p.put("runOrder", runOrder);
private void createSurefireProperties(TestFrameworkProvider provider) throws MojoExecutionException {
- PropertiesWrapper wrapper = new PropertiesWrapper(new Properties());
+ PropertiesWrapper wrapper = new PropertiesWrapper(new HashMap<String, String>());
wrapper.setProperty("testpluginname", getTestBundleSymbolicName());
wrapper.setProperty("testclassesdirectory", testClassesDirectory.getAbsolutePath());
wrapper.setProperty("reportsdirectory", reportsDirectory.getAbsolutePath());
@@ -872,8 +874,10 @@
wrapper.setProperty("failifnotests", String.valueOf(failIfNoTests));
wrapper.setProperty("runOrder", runOrder);
- Properties mergedProviderProperties = getMergedProviderProperties();
- mergedProviderProperties.putAll(provider.getProviderSpecificProperties());
+ Map<String, String> mergedProviderProperties = getMergedProviderPropertiesMap();
+ for (Map.Entry<?, ?> entry : provider.getProviderSpecificProperties().entrySet()){
+ mergedProviderProperties.put((String)entry.getKey(), (String)entry.getValue().toString());
+ }
ScanResult scanResult = scanForTests();
scanResult.writeTo(mergedProviderProperties);
for (Map.Entry<?, ?> entry : mergedProviderProperties.entrySet()) {
@@ -862,6 +864,24 @@ public class TestMojo extends AbstractMojo {
@@ -907,6 +911,24 @@
return result;
}
@ -317,7 +343,7 @@ index 9f1e332..62a16fb 100644
protected ScanResult scanForTests() {
List<String> defaultIncludes = Arrays.asList("**/Test*.class", "**/*Test.class", "**/*TestCase.class");
List<String> defaultExcludes = Arrays.asList("**/*$*");
@@ -879,8 +899,8 @@ public class TestMojo extends AbstractMojo {
@@ -932,12 +954,20 @@
} else {
excludeList = defaultExcludes;
}
@ -328,6 +354,32 @@ index 9f1e332..62a16fb 100644
DefaultScanResult scanResult = scanner.scan();
return scanResult;
}
--
2.4.3
+ private void storeProperties(Map<String, String> p, File file) throws MojoExecutionException {
+ Properties props = new Properties();
+ for (Map.Entry<String, String> entry : p.entrySet()) {
+ props.setProperty(entry.getKey(), entry.getValue());
+ }
+ storeProperties(props, file);
+ }
+
private void storeProperties(Properties p, File file) throws MojoExecutionException {
try {
BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(file));
--- a/tycho-surefire/org.eclipse.tycho.surefire.testng/META-INF/MANIFEST.MF 2016-11-02 13:58:17.436696677 +0000
+++ b/tycho-surefire/org.eclipse.tycho.surefire.testng/META-INF/MANIFEST.MF 2016-11-02 14:00:25.344188489 +0000
@@ -6,10 +6,10 @@
Fragment-Host: org.eclipse.tycho.surefire.osgibooter
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ClassPath: .,
- jars/surefire-testng-2.17.jar,
- jars/surefire-testng-utils-2.17.jar,
- jars/surefire-grouper-2.17.jar,
- jars/common-java5-2.17.jar
+ jars/surefire-testng-2.19.1.jar,
+ jars/surefire-testng-utils-2.19.1.jar,
+ jars/surefire-grouper-2.19.1.jar,
+ jars/common-java5-2.19.1.jar
Import-Package: org.testng,
org.testng.xml
Bundle-Vendor: %providerName

15
tycho.spec
View File

@ -15,17 +15,17 @@
# %%global snap -SNAPSHOT
%global snap %{nil}
%global git_tag tycho-0.25.0
%global git_tag tycho-0.26.0
%global fp_p2_sha 4e1319
%global fp_p2_sha f0168e8
%global fp_p2_version 0.0.1
%global fp_p2_snap -SNAPSHOT
%define __requires_exclude osgi*
Name: tycho
Version: 0.25.0
Release: 7%{?dist}
Version: 0.26.0
Release: 1%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
# license file is missing but all files having some licensing information are ASL 2.0
@ -62,7 +62,6 @@ Patch5: %{name}-fix-bootstrap-build.patch
# Accepted upstream: https://git.eclipse.org/r/49897
Patch7: %{name}-port-to-plexus-archiver-3.0.1.patch
Patch8: tycho-maven-archiver-3.0.1.patch
Patch9: tycho-eclipse-neon.patch
BuildArch: noarch
@ -185,7 +184,6 @@ tar -xf %{SOURCE6}
%patch4 -p1
%patch7 -p0
%patch8 -p0
%patch9 -p0
find tycho-core -iname '*html' -delete
@ -328,7 +326,7 @@ for mod in target-platform-configuration tycho-compiler-{jdt,plugin} \
tycho-p2/tycho-p2-{facade,plugin,{director,publisher,repository}-plugin} \
tycho-{maven,packaging,pomgenerator,release/tycho-versions,source}-plugin \
tycho-bundles/org* \
tycho-surefire/{tycho-surefire-plugin,org.eclipse.tycho.surefire.{osgibooter,junit,junit4{,7}}}; do
tycho-surefire/{tycho-surefire-plugin,org.eclipse.tycho.surefire.{osgibooter,testng,junit,junit4{,7}}}; do
echo $mod
aid=`basename $mod`
install -pm 644 $mod/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$aid.pom
@ -424,6 +422,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/li
%{_javadocdir}/tycho
%changelog
* Wed Nov 02 2016 Mat Booth <mat.booth@redhat.com> - 0.26.0-1
- Update to latest upstream
* Mon Jul 25 2016 Mat Booth <mat.booth@redhat.com> - 0.25.0-7
- Remove incomplete SCL macros