Move to Photon and update to Lucene 7.1.
As Oxygen stream is done now added photon target and made it default.
EMF added genmodel additional attributes to the files so they are part
of this commit too.
Lucene is bumped to 7.1.0 as this is the version shipped with Photon.
Change-Id: Ieb4199f59dadff6a596c3907d26e9276d7088602
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.epp.logging.aeri.core/plugin.xml b/bundles/org.eclipse.epp.logging.aeri.core/plugin.xml
index 92a7adc..c8e3c95 100644
--- a/bundles/org.eclipse.epp.logging.aeri.core/plugin.xml
+++ b/bundles/org.eclipse.epp.logging.aeri.core/plugin.xml
@@ -5,7 +5,6 @@
<!-- @generated aeri -->
<package
uri="https://www.eclipse.org/epp/logging/aeri/core/2.0"
- class="org.eclipse.epp.logging.aeri.core.IModelPackage"
- genModel="models/aeri.genmodel"/>
+ class="org.eclipse.epp.logging.aeri.core.IModelPackage"/>
</extension>
</plugin>
diff --git a/bundles/org.eclipse.epp.logging.aeri.ide/META-INF/MANIFEST.MF b/bundles/org.eclipse.epp.logging.aeri.ide/META-INF/MANIFEST.MF
index 6cf56e7..fc1d252 100644
--- a/bundles/org.eclipse.epp.logging.aeri.ide/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.epp.logging.aeri.ide/META-INF/MANIFEST.MF
@@ -54,13 +54,13 @@
org.apache.http.impl.client.cache;version="[4.3.0,5.0.0)",
org.apache.http.message;version="[4.3.0,5.0.0)",
org.apache.http.util;version="[4.3.0,5.0.0)",
- org.apache.lucene.analysis;version="[6.1.0,7.0.0)",
- org.apache.lucene.analysis.core;version="[6.1.0,7.0.0)",
- org.apache.lucene.document;core=split;version="[6.1.0,7.0.0)",
- org.apache.lucene.index;core=split;version="[6.1.0,7.0.0)",
- org.apache.lucene.search;core=split;version="[6.1.0,7.0.0)",
- org.apache.lucene.store;core=split;version="[6.1.0,7.0.0)",
- org.apache.lucene.util;version="[6.1.0,7.0.0)"
+ org.apache.lucene.analysis;core=split;version="[7.1.0,8.0.0)",
+ org.apache.lucene.analysis.core;version="[7.1.0,8.0.0)",
+ org.apache.lucene.document;version="[7.1.0,8.0.0)",
+ org.apache.lucene.index;version="[7.1.0,8.0.0)",
+ org.apache.lucene.search;version="[7.1.0,8.0.0)",
+ org.apache.lucene.store;version="[7.1.0,8.0.0)",
+ org.apache.lucene.util;version="[7.1.0,8.0.0)"
Export-Package: org.eclipse.epp.internal.logging.aeri.ide;x-internal:=true,
org.eclipse.epp.internal.logging.aeri.ide.server;x-internal:=true,
org.eclipse.epp.internal.logging.aeri.ide.server.json;x-internal:=true,
diff --git a/bundles/org.eclipse.epp.logging.aeri.ide/plugin.xml b/bundles/org.eclipse.epp.logging.aeri.ide/plugin.xml
index 6d20d5e..8d7b8f9 100644
--- a/bundles/org.eclipse.epp.logging.aeri.ide/plugin.xml
+++ b/bundles/org.eclipse.epp.logging.aeri.ide/plugin.xml
@@ -111,8 +111,7 @@
<!-- @generated aeri.ide -->
<package
uri="https://www.eclipse.org/epp/logging/aeri/ide/2.0"
- class="org.eclipse.epp.internal.logging.aeri.ide.IIdePackage"
- genModel="models/aeri.ide.genmodel"/>
+ class="org.eclipse.epp.internal.logging.aeri.ide.IIdePackage"/>
</extension>
<extension
diff --git a/features/org.eclipse.epp.logging.3rd.feature/feature.xml b/features/org.eclipse.epp.logging.3rd.feature/feature.xml
index fdad56a..36598f2 100644
--- a/features/org.eclipse.epp.logging.3rd.feature/feature.xml
+++ b/features/org.eclipse.epp.logging.3rd.feature/feature.xml
@@ -108,14 +108,14 @@
id="org.apache.lucene.core"
download-size="0"
install-size="0"
- version="6.1.0.qualifier"
+ version="7.1.0.qualifier"
unpack="false"/>
<plugin
id="org.apache.lucene.analyzers-common"
download-size="0"
install-size="0"
- version="6.1.0.qualifier"
+ version="7.1.0.qualifier"
unpack="false"/>
<plugin
diff --git a/pom.xml b/pom.xml
index b76f483..3df0918 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
<tychoVersion>1.1.0</tychoVersion>
<!-- The default simultaneous release used to base the target platform
on (override with -Dsimrel=...) -->
- <simrel>oxygen</simrel>
+ <simrel>photon</simrel>
<!-- Use HTTP, as it provides the most firewall-friendly access to the
Git repository. -->
<tycho.scmUrl>scm:git:http://git.eclipse.org/gitroot/epp/org.eclipse.epp.logging.git</tycho.scmUrl>
diff --git a/releng/targets/photon/photon.target b/releng/targets/photon/photon.target
new file mode 100644
index 0000000..d4f895c
--- /dev/null
+++ b/releng/targets/photon/photon.target
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="Target Definition for Eclipse Photon (4.8)" sequenceNumber="1">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
+<!-- Stable platform build for Photon M6 -->
+<repository location="http://download.eclipse.org/eclipse/updates/4.8milestones/S-4.8M6-201803080630/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.13/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.mylyn.sdk_feature.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/mylyn/snapshots/weekly/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="ch.qos.logback.classic" version="1.0.7.v20121108-1250"/>
+<unit id="ch.qos.logback.core" version="1.0.7.v20121108-1250"/>
+<unit id="ch.qos.logback.slf4j" version="1.0.7.v201505121915"/>
+<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
+<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+<unit id="javax.inject" version="1.0.0.v20091030"/>
+<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
+<unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
+<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170210-0925"/>
+<unit id="org.apache.httpcomponents.httpcore" version="4.4.6.v20170210-0925"/>
+<unit id="org.apache.lucene.core" version="3.5.0.v20120725-1805"/>
+<unit id="org.apache.lucene.core" version="7.1.0.v20171214-1510"/>
+<unit id="org.apache.lucene.analyzers-common" version="7.1.0.v20180122-2126"/>
+<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+<unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/>
+<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
+<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
+<unit id="org.junit" version="4.12.0.v201504281640"/>
+<unit id="org.mockito" version="1.9.5.v201605172210"/>
+<unit id="org.objenesis" version="1.0.0.v201505121915"/>
+<unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
+<unit id="org.yaml.snakeyaml" version="1.14.0.v201604211500"/>
+<!-- Stable Orbit build for Photon M6 -->
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20180302171354/repository"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.swtbot.feature.group" version="2.2.1.201402241301"/>
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.2.1.201402241301"/>
+<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
+<unit id="org.hamcrest.library" version="1.3.0.v201305281000"/>
+<repository location="http://download.eclipse.org/technology/swtbot/releases/2.2.1/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/cbi/updates/license"/>
+</location>
+</locations>
+<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+</target>
\ No newline at end of file
diff --git a/releng/targets/photon/pom.xml b/releng/targets/photon/pom.xml
new file mode 100644
index 0000000..b89b077
--- /dev/null
+++ b/releng/targets/photon/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.epp.logging</groupId>
+ <artifactId>targets</artifactId>
+ <version>2.0.7-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>photon</artifactId>
+ <packaging>eclipse-target-definition</packaging>
+
+ <name>Target Definition for Eclipse Photon (4.8)</name>
+</project>
diff --git a/releng/targets/pom.xml b/releng/targets/pom.xml
index 29d087c..28b1f34 100644
--- a/releng/targets/pom.xml
+++ b/releng/targets/pom.xml
@@ -15,6 +15,7 @@
<modules>
<module>neon</module>
<module>oxygen</module>
+ <module>photon</module>
</modules>
<build>
