diff --git a/0001-Fix-the-Tycho-build-to-work-on-Fedora.patch b/0001-Fix-the-Tycho-build-to-work-on-Fedora.patch index fadc8ba..4aaaf6c 100644 --- a/0001-Fix-the-Tycho-build-to-work-on-Fedora.patch +++ b/0001-Fix-the-Tycho-build-to-work-on-Fedora.patch @@ -1,7 +1,7 @@ -From 7c8407e05ff8426af7a2b67d4101c9872b429d6f Mon Sep 17 00:00:00 2001 +From 5dec5bd2d03b0fdfd5ca283d5f7bf88d0b1b3bb8 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Tue, 12 Jun 2012 09:56:38 -0400 -Subject: [PATCH 1/7] Fix the Tycho build to work on Fedora. +Subject: [PATCH 1/2] Fix the Tycho build to work on Fedora. Minor fixes of limited scope needed to have Tycho building on Fedora. @@ -12,7 +12,7 @@ Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java -index 3cba4662..f7337742 100644 +index 3cba466..f733774 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java +++ b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java @@ -102,7 +102,9 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic @@ -27,7 +27,7 @@ index 3cba4662..f7337742 100644 } diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java -index 5b8a92d5..200030e8 100644 +index 5b8a92d..200030e 100644 --- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java +++ b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java @@ -113,12 +113,11 @@ public abstract class AbstractTychoIntegrationTest { diff --git a/0002-Implement-a-custom-resolver-for-Tycho-in-local-mode.patch b/0002-Implement-a-custom-resolver-for-Tycho-in-local-mode.patch index 82e3071..7332cb1 100644 --- a/0002-Implement-a-custom-resolver-for-Tycho-in-local-mode.patch +++ b/0002-Implement-a-custom-resolver-for-Tycho-in-local-mode.patch @@ -1,7 +1,7 @@ -From a179fbb73edb21d245fb183ce2cfb9e938699125 Mon Sep 17 00:00:00 2001 +From 983244b6e973369675d72c1c4097437fa96ba2c1 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Tue, 12 Jun 2012 10:38:51 -0400 -Subject: [PATCH 2/7] Implement a custom resolver for Tycho in local mode. +Subject: [PATCH 2/2] Implement a custom resolver for Tycho in local mode. When running in local mode, dependencies should be resolved by looking on the local system. Remote repositories should be ignored unless @@ -31,7 +31,7 @@ for our runtime (fedora-eclipse) to avoid collisions. Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b --- - .../internal/DefaultEquinoxEmbedder.java | 13 ++++-- + .../internal/DefaultEquinoxEmbedder.java | 19 ++++++-- .../remote/RemoteRepositoryCacheManager.java | 11 +++++ .../p2/target/TargetDefinitionResolver.java | 11 ++++- .../target/TargetPlatformBundlePublisher.java | 20 +++------ @@ -47,22 +47,34 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b .../osgi/runtime/TychoOsgiRuntimeLocator.java | 33 +++++++++----- tycho-p2/tycho-p2-facade/pom.xml | 5 +++ .../p2/resolver/P2DependencyResolver.java | 9 ++++ - 16 files changed, 246 insertions(+), 48 deletions(-) + 16 files changed, 251 insertions(+), 49 deletions(-) diff --git a/sisu-equinox/sisu-equinox-embedder/src/main/java/org/eclipse/sisu/equinox/embedder/internal/DefaultEquinoxEmbedder.java b/sisu-equinox/sisu-equinox-embedder/src/main/java/org/eclipse/sisu/equinox/embedder/internal/DefaultEquinoxEmbedder.java -index f3d38198..f51d258b 100644 +index f3d3819..04b4577 100644 --- a/sisu-equinox/sisu-equinox-embedder/src/main/java/org/eclipse/sisu/equinox/embedder/internal/DefaultEquinoxEmbedder.java +++ b/sisu-equinox/sisu-equinox-embedder/src/main/java/org/eclipse/sisu/equinox/embedder/internal/DefaultEquinoxEmbedder.java -@@ -202,7 +202,7 @@ public class DefaultEquinoxEmbedder extends AbstractLogEnabled - private void activateBundlesInWorkingOrder() { - // activate bundles which need to do work in their respective activator; stick to a working order (cf. bug 359787) - // TODO this order should come from the EquinoxRuntimeLocator -- tryActivateBundle("org.apache.felix.scr"); -+ tryActivateBundle("org.apache.felix.scr"); - tryActivateBundle("org.eclipse.equinox.ds"); - tryActivateBundle("org.eclipse.equinox.registry"); - tryActivateBundle("org.eclipse.core.net"); -@@ -239,7 +239,14 @@ public class DefaultEquinoxEmbedder extends AbstractLogEnabled +@@ -95,14 +95,18 @@ public class DefaultEquinoxEmbedder extends AbstractLogEnabled + + @Override + public void addInstallation(File location) { +- if (location == null || !location.isDirectory() || !new File(location, "plugins").isDirectory()) { ++ if (location == null || !location.isDirectory() || (!new File(location, "plugins").isDirectory() && !new File(location, "eclipse/plugins").isDirectory())) { + throw new IllegalArgumentException(); + } + if (!installationLocations.isEmpty()) { + // allow only one installation for now + throw new IllegalStateException(); + } +- installationLocations.add(location); ++ if (new File(location, "plugins").isDirectory()) { ++ installationLocations.add(location); ++ } else { ++ installationLocations.add(new File(location, "eclipse")); ++ } + } + + @Override +@@ -239,7 +243,14 @@ public class DefaultEquinoxEmbedder extends AbstractLogEnabled if (verIdx > 0) { bundles.append(name.substring(0, verIdx)); } else { @@ -78,7 +90,7 @@ index f3d38198..f51d258b 100644 } } } -@@ -247,7 +254,7 @@ public class DefaultEquinoxEmbedder extends AbstractLogEnabled +@@ -247,7 +258,7 @@ public class DefaultEquinoxEmbedder extends AbstractLogEnabled } protected boolean isFrameworkBundle(File file) { @@ -88,7 +100,7 @@ index f3d38198..f51d258b 100644 String getReferenceUrl(File file) { diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/remote/RemoteRepositoryCacheManager.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/remote/RemoteRepositoryCacheManager.java -index 1f233e11..744e7dd4 100644 +index 1f233e1..744e7dd 100644 --- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/remote/RemoteRepositoryCacheManager.java +++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/remote/RemoteRepositoryCacheManager.java @@ -12,14 +12,18 @@ package org.eclipse.tycho.p2.remote; @@ -125,7 +137,7 @@ index 1f233e11..744e7dd4 100644 if (offline) { if (cacheFile != null) { diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java -index 23b9e640..9d164661 100644 +index 23b9e64..9d16466 100644 --- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java +++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java @@ -24,6 +24,7 @@ import java.util.regex.Matcher; @@ -154,7 +166,7 @@ index 23b9e640..9d164661 100644 IQueryable locationUnits = QueryUtil.compoundQueryable(locations); installableUnitResolver.addLocation((InstallableUnitLocation) locationDefinition, locationUnits); diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java -index 2c2f29a4..63794cad 100644 +index 2c2f29a..63794ca 100644 --- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java +++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java @@ -38,6 +38,7 @@ import org.eclipse.tycho.core.shared.MavenLogger; @@ -202,7 +214,7 @@ index 2c2f29a4..63794cad 100644 private File getBaseDir() { diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformFactoryImpl.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformFactoryImpl.java -index a909caf7..fed19448 100644 +index a909caf..fed1944 100644 --- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformFactoryImpl.java +++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformFactoryImpl.java @@ -35,6 +35,9 @@ import org.eclipse.core.runtime.URIUtil; @@ -272,7 +284,7 @@ index a909caf7..fed19448 100644 RepositoryArtifactProvider::loadRepository)); } diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java -index e05f8715..03900e27 100644 +index e05f871..03900e2 100644 --- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java +++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java @@ -11,6 +11,8 @@ @@ -331,7 +343,7 @@ index e05f8715..03900e27 100644 } diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/target/facade/TargetPlatformConfigurationStub.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/target/facade/TargetPlatformConfigurationStub.java -index 272db570..70897e4a 100644 +index 272db57..70897e4 100644 --- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/target/facade/TargetPlatformConfigurationStub.java +++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/target/facade/TargetPlatformConfigurationStub.java @@ -59,7 +59,11 @@ public class TargetPlatformConfigurationStub { @@ -348,7 +360,7 @@ index 272db570..70897e4a 100644 // convenience method for tests diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product -index 7e3d5fbe..b146c08f 100644 +index 7e3d5fb..b146c08 100644 --- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product +++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product @@ -77,6 +77,7 @@ @@ -360,7 +372,7 @@ index 7e3d5fbe..b146c08f 100644 diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockerImpl.java b/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockerImpl.java -index 99405613..9a98a400 100644 +index 9940561..9a98a40 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockerImpl.java +++ b/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockerImpl.java @@ -27,20 +27,34 @@ public class FileLockerImpl implements FileLocker { @@ -405,7 +417,7 @@ index 99405613..9a98a400 100644 this.lockFileLocation.set(lockMarkerFile.toURL(), false, lockMarkerFile.getAbsolutePath()); } catch (MalformedURLException e) { diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java -index f7337742..8ca51b1e 100644 +index f733774..8ca51b1 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java +++ b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java @@ -30,6 +30,7 @@ import org.apache.maven.project.MavenProject; @@ -458,7 +470,7 @@ index f7337742..8ca51b1e 100644 baseDirs.add(basedir); } diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java -index b53a889a..7ea21770 100644 +index b53a889..7ea2177 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java +++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java @@ -15,12 +15,18 @@ import java.util.Objects; @@ -536,7 +548,7 @@ index b53a889a..7ea21770 100644 + } } diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java -index 4ec4166d..d57245de 100644 +index 4ec4166..d57245d 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java +++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java @@ -516,6 +516,7 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro @@ -572,7 +584,7 @@ index 4ec4166d..d57245de 100644 } } diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java b/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java -index 87042d2b..85d52aa0 100644 +index 87042d2..85d52aa 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java +++ b/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java @@ -87,7 +87,11 @@ public class DefaultTargetPlatformConfigurationReader { @@ -589,7 +601,7 @@ index 87042d2b..85d52aa0 100644 setTargetPlatformResolver(result, configuration); diff --git a/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java b/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java -index ea817a92..c71fc930 100644 +index ea817a9..c71fc93 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java +++ b/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java @@ -160,40 +160,53 @@ public class TychoOsgiRuntimeLocator implements EquinoxRuntimeLocator { @@ -657,7 +669,7 @@ index ea817a92..c71fc930 100644 description.addBundle(artifact.getFile()); } diff --git a/tycho-p2/tycho-p2-facade/pom.xml b/tycho-p2/tycho-p2-facade/pom.xml -index a5cbdb6d..c6099934 100644 +index a5cbdb6..c609993 100644 --- a/tycho-p2/tycho-p2-facade/pom.xml +++ b/tycho-p2/tycho-p2-facade/pom.xml @@ -57,6 +57,11 @@ @@ -673,7 +685,7 @@ index a5cbdb6d..c6099934 100644 diff --git a/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2DependencyResolver.java b/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2DependencyResolver.java -index c911d45a..26df4a67 100644 +index c911d45..26df4a6 100644 --- a/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2DependencyResolver.java +++ b/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2DependencyResolver.java @@ -92,6 +92,7 @@ import org.eclipse.tycho.p2.resolver.facade.P2ResolverFactory; diff --git a/sources b/sources index 7416547..dd0e261 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (fedoraproject-p2-290f67a4c717599b2f5166ea89aa5365571314b1.tar.gz) = 5ddfa3e7c1dc3d64335d836d74d7325904f294e0ab1782de41a8815b09ddf42f0c47a263c3a6217626aaf293a17788d01174c327e17b192a0f451d07d5655c49 +SHA512 (fedoraproject-p2-0be3abaa1729553b13f384a008b1cd1fb00beaf4.tar.gz) = 0fc3585203eff6dcaf08c679a258dc8f108a6d64a29f88983a8ac10ae82641b85ea5cf05e112daadaeef95d798255d1307efd8b2d55b5d482b36b448709f7ab5 SHA512 (eclipse-bootstrap-2020-09.tar.xz) = a534271fb86e23e0a11b3c3e943b5f981fcbd16e8a0c6b826752ed82e4fd1594af8318c1483798174b0aa2871d5744b3eb404235d89bbf7ace58b5d5fb156c1a SHA512 (org.eclipse.tycho-tycho-2.1.0.tar.xz) = b87c99ebe76e7ab5a13e40f26d875e23c79e11ccd29329f87c641e6dff13bdf73698551a03c5347ba629a4ace260debfd5e8347b39355321328fb25aef981a6b diff --git a/tycho-bootstrap.sh b/tycho-bootstrap.sh index 6bbb0a4..eeff515 100755 --- a/tycho-bootstrap.sh +++ b/tycho-bootstrap.sh @@ -29,7 +29,7 @@ deps[6]="tycho-bundles/org.eclipse.tycho.embedder.shared/target/org.eclipse.tych xtraDeps[0]="" externalDeps[4]="org.eclipse.equinox.common,org.eclipse.equinox.p2.repository,org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.core,org.eclipse.equinox.p2.metadata.repository,org.eclipse.equinox.p2.artifact.repository,org.eclipse.osgi" -externalDeps[5]="org.eclipse.core.runtime,org.eclipse.equinox.security,org.eclipse.equinox.frameworkadmin.equinox,org.eclipse.equinox.frameworkadmin,org.eclipse.equinox.p2.core,org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.publisher.eclipse,org.eclipse.equinox.p2.artifact.repository,org.eclipse.equinox.p2.metadata.repository,org.eclipse.equinox.p2.director,org.eclipse.equinox.p2.repository,org.eclipse.equinox.p2.updatesite,org.eclipse.core.net,org.eclipse.equinox.common,org.eclipse.osgi,org.eclipse.equinox.preferences" +externalDeps[5]="org.eclipse.core.runtime,org.eclipse.equinox.security,org.eclipse.equinox.frameworkadmin.equinox,org.eclipse.equinox.frameworkadmin,org.eclipse.equinox.p2.core,org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.publisher.eclipse,org.eclipse.equinox.p2.artifact.repository,org.eclipse.equinox.p2.metadata.repository,org.eclipse.equinox.p2.director,org.eclipse.equinox.p2.repository,org.eclipse.equinox.p2.updatesite,org.eclipse.core.net,org.eclipse.equinox.common,org.eclipse.osgi,org.eclipse.equinox.preferences,biz.aQute.bndlib" externalDeps[6]="org.eclipse.equinox.p2.director.app,org.eclipse.equinox.frameworkadmin.equinox,org.eclipse.equinox.frameworkadmin,org.eclipse.equinox.p2.core,org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.updatesite,org.eclipse.core.runtime,org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.repository,org.eclipse.equinox.p2.repository.tools,org.eclipse.equinox.p2.metadata.repository,org.eclipse.equinox.p2.artifact.repository,org.eclipse.equinox.p2.publisher.eclipse,org.eclipse.equinox.p2.engine,org.eclipse.equinox.p2.director,org.eclipse.osgi,org.eclipse.equinox.common,org.eclipse.equinox.app,org.eclipse.equinox.registry" xtraExternalDeps[0]="org.eclipse.osgi,org.eclipse.core.runtime,org.eclipse.equinox.common,org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.repository,org.eclipse.equinox.p2.core,org.eclipse.equinox.p2.publisher.eclipse,org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.touchpoint.eclipse,org.eclipse.equinox.p2.updatesite,org.eclipse.equinox.p2.repository.tools,org.eclipse.equinox.app,slf4j.api" @@ -63,7 +63,7 @@ done for proj in ${reactorprojs[@]} ; do isolateProject ${proj} xmvn -B -o -e -f "${proj}/pom.xml" -Dmaven.repo.local=$(pwd)/.m2 -Dmaven.test.skip=true \ - -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -Dmaven.compiler.release=8 -Dproject.build.sourceEncoding=UTF-8 \ + -Dmaven.compiler.source=11 -Dmaven.compiler.target=11 -Dmaven.compiler.release=11 -Dproject.build.sourceEncoding=UTF-8 \ clean install unifyProject ${proj} done diff --git a/tycho-scripts.sh b/tycho-scripts.sh index de3bd06..2043adb 100755 --- a/tycho-scripts.sh +++ b/tycho-scripts.sh @@ -26,7 +26,7 @@ if [ $# -gt 1 ]; then cp='-classpath '$2':'"${basedir}"'/target/externalDeps/*' fi -javac -d "${basedir}/${output}" -encoding utf8 --release 8 \ +javac -d "${basedir}/${output}" -encoding utf8 --release 11 \ $(for file in `find "${basedir}/${src}" -name "*.java"`; \ do echo -n "${file} "; \ done;) \ diff --git a/tycho.spec b/tycho.spec index 596cbf7..023bfe8 100644 --- a/tycho.spec +++ b/tycho.spec @@ -9,14 +9,14 @@ # Tycho such that it can build a bootstrap mode Eclipse and subsequently # fully rebuild itself. In this mode, there may be reduced functionality, # so a full non-bootstrap mode build should always be done afterwards. -%bcond_with bootstrap +%bcond_without bootstrap # Allow conditionally building without Junit 5 support %bcond_with junit5 # Release tags or git SHAs %global git_tag tycho-%{version} -%global fp_p2_git_tag 290f67a4c717599b2f5166ea89aa5365571314b1 +%global fp_p2_git_tag 0be3abaa1729553b13f384a008b1cd1fb00beaf4 %global fp_p2_version 0.0.1 %global fp_p2_snap -SNAPSHOT @@ -28,7 +28,7 @@ Name: tycho Version: 2.1.0 -Release: 1%{?dist} +Release: 3%{?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 @@ -221,11 +221,6 @@ mv fedoraproject-p2-%{fp_p2_git_tag} fedoraproject-p2 %pom_remove_dep ":org.eclipse.tycho.surefire.junit56" tycho-surefire/tycho-surefire-plugin %endif -# Move from org.sonatype.aether to org.eclipse.aether -find . -name "*.java" | xargs sed -i 's/org.sonatype.aether/org.eclipse.aether/g' -find . -name "*.java" | xargs sed -i 's/org.eclipse.aether.util.DefaultRepositorySystemSession/org.eclipse.aether.DefaultRepositorySystemSession/g' -sed -i 's/public int getPriority/public float getPriority/g' tycho-core/src/main/java/org/eclipse/tycho/core/p2/P2RepositoryConnectorFactory.java - # Relax dep on aqute-bndlib sed -i -e '/biz.aQute.bndlib/s/5.1.2/3.5.0/' \ tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF @@ -236,6 +231,12 @@ sed -i -e 's/ASM9/ASM8/' \ sed -i -e '/slf4j.api/s/org.slf4j.api/slf4j.api/' \ tycho-bundles/tycho-bundles-external/tycho-bundles-external.product +# Remove repositories section and pom imports +%pom_xpath_remove "pom:repositories" fedoraproject-p2 +# Use osgi from local repo +%pom_xpath_remove "pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='tycho']" fedoraproject-p2/xmvn-p2-installer-plugin +%pom_xpath_inject "pom:dependencies/pom:dependency[pom:artifactId='org.eclipse.osgi']" "\${equinox-version}" fedoraproject-p2/xmvn-p2-installer-plugin + # place empty mojo in place mkdir -p tycho-maven-plugin/src/main/java/org/fedoraproject pushd tycho-maven-plugin/src/main/java/org/fedoraproject @@ -244,9 +245,7 @@ popd # Homogenise requirement on OSGi bundle %if %{with bootstrap} -sed -i -e "s/>org.eclipse.platformorg.eclipse.tychoorg.eclipse.tychoorg.eclipse.platformorg.eclipse.platformorg.eclipse.tycho - 2.1.0-3 +- Enable bootstrap mode +- Update fp-p2 snapshot to fix xmvn installation failure + +* Thu Jan 14 2021 Mat Booth - 2.1.0-2 +- Fix embedded equinox location discovery and fix bootstrapping on Java 11 + * Tue Nov 24 2020 Mat Booth - 2.1.0-1 - Update to latest upstream release