Adapt to latest PDE changes + use latest update site

eclipse-tycho · Dec 10, 2023 · b9e70e0 · b9e70e0
1 parent b687f13
commit b9e70e0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -10,7 +10,7 @@ if(env.BRANCH_NAME == deployBranch) {
 
 pipeline {
 	options {
-		timeout(time: 180, unit: 'MINUTES')
+		timeout(time: 240, unit: 'MINUTES')
 		buildDiscarder(logRotator(numToKeepStr:'10'))
 		disableConcurrentBuilds(abortPrevious: true)
 	}

diff --git a/tycho-api/src/main/java/org/eclipse/tycho/TychoConstants.java b/tycho-api/src/main/java/org/eclipse/tycho/TychoConstants.java
@@ -18,7 +18,7 @@
 
 public interface TychoConstants {
 
-    public static final String ECLIPSE_LATEST = "https://download.eclipse.org/releases/2023-09/";
+    public static final String ECLIPSE_LATEST = "https://download.eclipse.org/releases/2023-12/";
 
     static final String ANY_QUALIFIER = "qualifier";
 

diff --git a/...in/src/main/java/org/eclipse/tycho/extras/docbundle/runner/ConvertSchemaToHtmlRunner.java b/...in/src/main/java/org/eclipse/tycho/extras/docbundle/runner/ConvertSchemaToHtmlRunner.java
@@ -41,12 +41,15 @@
 import org.eclipse.pde.internal.core.XMLDefaultHandler;
 import org.eclipse.pde.internal.core.builders.SchemaTransformer;
 import org.eclipse.pde.internal.core.ischema.ISchema;
+import org.eclipse.pde.internal.core.ischema.ISchemaDescriptor;
 import org.eclipse.pde.internal.core.ischema.ISchemaInclude;
 import org.eclipse.pde.internal.core.plugin.ExternalFragmentModel;
 import org.eclipse.pde.internal.core.plugin.ExternalPluginModel;
 import org.eclipse.pde.internal.core.plugin.ExternalPluginModelBase;
+import org.eclipse.pde.internal.core.schema.PathSchemaProvider;
 import org.eclipse.pde.internal.core.schema.Schema;
 import org.eclipse.pde.internal.core.schema.SchemaDescriptor;
+import org.eclipse.pde.internal.core.schema.SchemaProvider;
 import org.eclipse.pde.internal.core.util.HeaderMap;
 import org.osgi.framework.Constants;
 
@@ -100,14 +103,23 @@ public ConvertSchemaToHtmlResult call() throws Exception {
 							.parse(schemaFile, handler);
 					@SuppressWarnings("deprecation")
 					URL url = schemaFile.toURL();
-					SchemaDescriptor desc = new SchemaDescriptor(extPoint.getFullId(), url,
+					PathSchemaProvider pathSchemaProvider = new PathSchemaProvider(
 							additionalSearchPaths.stream().map(pathString -> {
 								IPath path = IPath.fromOSString(pathString);
 								if (!path.isAbsolute()) {
 									return IPath.fromOSString(baseDir.getPath()).append(path);
 								}
 								return path;
 							}).toList());
+					SchemaDescriptor desc = new SchemaDescriptor(extPoint.getFullId(), url, new SchemaProvider() {
+
+						@Override
+						public ISchema createSchema(ISchemaDescriptor descriptor, String location) {
+							// TODO if the path return null we should search inside the bundle target
+							// platform for the schema!
+							return pathSchemaProvider.createSchema(descriptor, schemaLocation);
+						}
+					});
 					schema = (Schema) desc.getSchema(false);
 
 					// Check that all included schemas are available