[releng] Add Oxygen target platform
Change-Id: I1e1130a484f628f5ca264392cdb49a6818b7dd5c
Signed-off-by: Andreas Sewe <andreas.sewe@codetrails.com>
diff --git a/bundles/org.eclipse.epp.logging.aeri.ide/pom.xml b/bundles/org.eclipse.epp.logging.aeri.ide/pom.xml
index 4d7276a..251b5e6 100644
--- a/bundles/org.eclipse.epp.logging.aeri.ide/pom.xml
+++ b/bundles/org.eclipse.epp.logging.aeri.ide/pom.xml
@@ -44,6 +44,16 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-maven-plugin</artifactId>
+ <version>1.15</version>
+ <configuration>
+ <!-- Ignored due to a Tycho bug. -->
+ <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=512697 -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/pom.xml b/pom.xml
index 1e38496..977d304 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,10 +32,10 @@
</prerequisites>
<modules>
+ <module>releng</module>
<module>bundles</module>
<module>tests</module>
<module>features</module>
- <module>releng</module>
<module>examples</module>
</modules>
@@ -51,10 +51,10 @@
<properties>
<loggingVersion>2.0.5-SNAPSHOT</loggingVersion>
<javaVersion>1.8</javaVersion>
- <tychoVersion>0.26.0</tychoVersion>
+ <tychoVersion>1.0.0</tychoVersion>
<!-- The default simultaneous release used to base the target platform
on (override with -Dsimrel=...) -->
- <simrel>neon</simrel>
+ <simrel>oxygen</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/neon/neon.target b/releng/targets/neon/neon.target
index 7fba6df..f9d6f8d 100644
--- a/releng/targets/neon/neon.target
+++ b/releng/targets/neon/neon.target
@@ -10,8 +10,8 @@
<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"/>
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
-<!-- Stable build for Neon.3 -->
-<repository location="http://download.eclipse.org/releases/neon/201703231000/"/>
+<!-- Stable build for Neon.3 respin -->
+<repository location="http://download.eclipse.org/releases/neon/201705151400/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="ch.qos.logback.classic" version="1.0.7.v20121108-1250"/>
@@ -20,7 +20,6 @@
<unit id="com.google.gson" version="2.2.4.v201311231704"/>
<unit id="com.google.guava" version="15.0.0.v201403281430"/>
<unit id="javax.inject" version="1.0.0.v20091030"/>
-<unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
<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.3.6.v201511171540"/>
diff --git a/releng/targets/oxygen/oxygen.target b/releng/targets/oxygen/oxygen.target
new file mode 100644
index 0000000..635968c
--- /dev/null
+++ b/releng/targets/oxygen/oxygen.target
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="Target Definition for Eclipse Oxygen (4.7)" 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"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.7-I-builds/"/>
+</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.13milestones/"/>
+</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="15.0.0.v201403281430"/>
+<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.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"/>
+<!-- Recommended Orbit build for Oxygen -->
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/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>
diff --git a/releng/targets/oxygen/pom.xml b/releng/targets/oxygen/pom.xml
new file mode 100644
index 0000000..4184584
--- /dev/null
+++ b/releng/targets/oxygen/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.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>oxygen</artifactId>
+ <packaging>eclipse-target-definition</packaging>
+
+ <name>Target Definition for Eclipse Oxygen (4.7)</name>
+</project>
diff --git a/releng/targets/pom.xml b/releng/targets/pom.xml
index 385bcd5..4c01b59 100644
--- a/releng/targets/pom.xml
+++ b/releng/targets/pom.xml
@@ -14,6 +14,7 @@
<modules>
<module>neon</module>
+ <module>oxygen</module>
</modules>
<build>
