Releng updates: * Unbreak the build by moving from non-existant platform I-build repo * Update to newest tycho * Switch http -> https for all required p2 repos * Avoid duplicate lucene bundles in update site by being specific with the version we require * Add missing lucene.misc bundle to update site required by bundle o.e.dt.sqltools.result * Add missing LPG bundle to update site, which is no longer available from the simrel repo Signed-off-by: Mat Booth <mat.booth@gmail.com> Change-Id: Ie6afab8f4704dede49f89491762cb4f37aa1e0ba
diff --git a/pom.xml b/pom.xml index 47372ef..0a63a2b 100644 --- a/pom.xml +++ b/pom.xml
@@ -9,28 +9,30 @@ <properties> <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/datatools/org.eclipse.datatools.git</tycho.scmUrl> - <tycho-version>2.2.0</tycho-version> + <tycho-version>2.3.0</tycho-version> <tycho-extras-version>${tycho-version}</tycho-extras-version> + <tycho-repo.url>https://oss.sonatype.org/content/repositories/public/</tycho-repo.url> + <tycho-snapshot-repo.url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</tycho-snapshot-repo.url> <maven-resources-version>2.6</maven-resources-version> <!-- Set up the default target platform to build against --> - <license-site>http://download.eclipse.org/cbi/updates/license</license-site> - <!-- <platform-repo.url>http://download.eclipse.org/eclipse/updates/I-builds/</platform-repo.url> --> - <platform-repo.url>https://download.eclipse.org/eclipse/updates/4.21-I-builds/</platform-repo.url> - <!-- <orbit-repo.url>http://download.eclipse.org/tools/orbit/I-builds/I20180829144012/repository/</orbit-repo.url> --> - <orbit-repo.url>http://download.eclipse.org/tools/orbit/downloads/latest-I/</orbit-repo.url> - <emf-site>http://download.eclipse.org/modeling/emf/emf/builds/release/2.22/</emf-site> - <emf-query-site>http://download.eclipse.org/modeling/emf/query/updates/milestones/</emf-query-site> - <mdt-ocl-site>http://download.eclipse.org/modeling/mdt/ocl/updates/releases/latest/</mdt-ocl-site> - <gef-site>http://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952/</gef-site> - <junit3-site>http://archive.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/</junit3-site> + <license-site>https://download.eclipse.org/cbi/updates/license</license-site> + <!-- <platform-repo.url>https://download.eclipse.org/eclipse/updates/I-builds/</platform-repo.url> --> + <platform-repo.url>https://download.eclipse.org/eclipse/updates/4.23-I-builds/</platform-repo.url> + <!-- <orbit-repo.url>https://download.eclipse.org/tools/orbit/I-builds/I20180829144012/repository/</orbit-repo.url> --> + <orbit-repo.url>https://download.eclipse.org/tools/orbit/downloads/latest-I/</orbit-repo.url> + <emf-site>https://download.eclipse.org/modeling/emf/emf/builds/release/2.28/</emf-site> + <emf-query-site>https://download.eclipse.org/modeling/emf/query/updates/milestones/</emf-query-site> + <mdt-ocl-site>https://download.eclipse.org/modeling/mdt/ocl/updates/releases/latest/</mdt-ocl-site> + <gef-site>https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952/</gef-site> + <junit3-site>https://archive.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/</junit3-site> - <cbi-plugins.version>1.1.4</cbi-plugins.version> + <cbi-plugins.version>1.3.2</cbi-plugins.version> <cbi-repo.url>https://repo.eclipse.org/content/repositories/cbi/</cbi-repo.url> <!-- baseline check URLs: skip with -DskipBaselineComparison=true and/or -Dtycho.baseline=disable --> <skipBaselineComparison>false</skipBaselineComparison> - <lastStableRepository>http://download.eclipse.org/datatools/updates/1.14.100.201805031905/repository/</lastStableRepository> + <lastStableRepository>https://download.eclipse.org/datatools/updates/1.14.100.201805031905/repository/</lastStableRepository> </properties> <repositories> @@ -77,16 +79,6 @@ </repositories> <pluginRepositories> <pluginRepository> - <id>sonatype</id> - <url>http://oss.sonatype.org/content/repositories/public</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </pluginRepository> - <pluginRepository> <id>cbi-repo</id> <url>${cbi-repo.url}</url> <releases> @@ -96,6 +88,26 @@ <enabled>true</enabled> </snapshots> </pluginRepository> + <pluginRepository> + <id>tycho</id> + <url>${tycho-repo.url}</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + <pluginRepository> + <id>tycho-snapshot</id> + <url>${tycho-snapshot-repo.url}</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> </pluginRepositories> <build> <plugins>
diff --git a/site/category.xml b/site/category.xml index d5bb129..282f100 100644 --- a/site/category.xml +++ b/site/category.xml
@@ -82,9 +82,11 @@ <feature id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.source"><category name="dtp-sources"/></feature> <feature id="org.eclipse.datatools.sqltools.doc.user.source"><category name="dtp-sources"/></feature> - <bundle id="org.apache.lucene.analyzers-common"><category name="deps"/></bundle> - <bundle id="org.apache.lucene.core"><category name="deps"/></bundle> - <bundle id="org.apache.lucene.queryparser"><category name="deps"/></bundle> + <bundle id="org.apache.lucene.analyzers-common" version="7.5.0.v20181003-1532"><category name="deps"/></bundle> + <bundle id="org.apache.lucene.core" version="7.5.0.v20181003-1532"><category name="deps"/></bundle> + <bundle id="org.apache.lucene.misc" version="7.5.0.v20181003-1532"><category name="deps"/></bundle> + <bundle id="org.apache.lucene.queryparser" version="7.5.0.v20181003-1532"><category name="deps"/></bundle> + <bundle id="net.sourceforge.lpg.lpgjavaruntime" version="1.1.0.v201004271650"><category name="deps"/></bundle> <category-def name="dtp" label="Eclipse Data Tools"><description>Data Tools Platform (DTP) - main features</description></category-def> <category-def name="dtp-sources" label="Eclipse Data Tools - Sources"><description>Data Tools Platform (DTP) - sources</description></category-def>