Commit df3a6835 authored by Ubbo Veentjer's avatar Ubbo Veentjer
Browse files

Merge branch 'feature/photon' into develop

parents 2ea85ecf 37f9578c
[submodule "textgridlab-dependencies"]
path = textgridlab-dependencies
url = git://git.projects.gwdg.de/dariah-de/tg/textgrid-laboratory/textgridlab-dependencies.git
branch = develop
branch = feature/photon
[submodule "core"]
path = core
url = git://git.projects.gwdg.de/dariah-de/tg/textgrid-laboratory/lab-core.git
branch = develop
branch = feature/photon
[submodule "base"]
path = base
url = git://git.projects.gwdg.de/dariah-de/tg/textgrid-laboratory/lab-base.git
branch = develop
branch = feature/photon
[submodule "xmleditor"]
path = xmleditor
url = git://git.projects.gwdg.de/dariah-de/tg/textgrid-laboratory/xmleditor.git
branch = develop
branch = feature/photon
[submodule "help"]
path = help
url = git://git.projects.gwdg.de/dariah-de/tg/textgrid-laboratory/help.git
branch = develop
branch = feature/photon
[submodule "linkeditor"]
path = linkeditor
url = git://git.projects.gwdg.de/dariah-de/tg/textgrid-laboratory/linkeditor.git
branch = develop
branch = feature/photon
[submodule "dictionaries"]
path = dictionaries
url = git://git.projects.gwdg.de/dariah-de/tg/textgrid-laboratory/dictionaries.git
branch = develop
branch = feature/photon
[submodule "bundled-jre"]
path = bundled-jre
url = https://github.com/DARIAH-DE/bundled-jre
branch = develop
branch = feature/photon
......@@ -11,6 +11,9 @@ node {
if (env.BRANCH_NAME == 'develop') {
echo "deploying to nexus - branch is ${env.BRANCH_NAME}"
sh "${mvnHome}/bin/mvn -f ./parent/pom.xml -U clean verify deploy"
} else if (env.BRANCH_NAME == 'feature/photon') {
echo "deploying to nexus - branch is ${env.BRANCH_NAME}"
sh "${mvnHome}/bin/mvn -f ./parent/pom.xml -U clean verify deploy"
} else {
echo "not deploying to nexus - branch is ${env.BRANCH_NAME}"
sh "${mvnHome}/bin/mvn -f ./parent/pom.xml -U clean verify "
......
Subproject commit c8634c06c680bad55a646e00786564c1d14b0663
Subproject commit c274f4009d61d67b86f82ef261a990dfa46b4a8d
core @ 1a1b5ae6
Subproject commit 6750073c2cb48f524ee521b0445333590809a306
Subproject commit 1a1b5ae6cb4fa9a4a1370c9cbb70996aaa107192
......@@ -8,14 +8,14 @@
<packaging>pom</packaging>
<properties>
<tycho-version>0.22.0</tycho-version>
<tycho-extras-version>0.22.0</tycho-extras-version>
<tycho-version>1.2.0</tycho-version>
<tycho-extras-version>1.2.0</tycho-extras-version>
<java-version>1.7</java-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tycho.disableP2Mirrors>true</tycho.disableP2Mirrors>
<lab.repository.eclipse>http://download.eclipse.org/releases/luna</lab.repository.eclipse>
<lab.repository.dependencies>https://ci.de.dariah.eu/p2/nightly/dependencies</lab.repository.dependencies>
<lab.repository.root>https://ci.de.dariah.eu/p2/prerelease</lab.repository.root>
<lab.repository.eclipse>http://download.eclipse.org/releases/photon</lab.repository.eclipse>
<lab.repository.root>https://ci.de.dariah.eu/p2/feature-photon</lab.repository.root>
<lab.repository.dependencies>${lab.repository.root}/dependencies</lab.repository.dependencies>
<lab.repository.core>${lab.repository.root}/core</lab.repository.core>
<lab.repository.xmleditor>${lab.repository.root}/xmleditor</lab.repository.xmleditor>
<lab.repository.help>${lab.repository.root}/help</lab.repository.help>
......@@ -25,28 +25,32 @@
</properties>
<repositories>
<!--
<repository>
<id>eclipse4maintenance</id>
<layout>p2</layout>
<url>http://textgridlab.org/updates/luna/</url>
</repository>
-->
<repository>
<id>eclipse</id>
<layout>p2</layout>
<url>${lab.repository.eclipse}</url>
</repository>
</repository>
<repository>
<!-- TODO remove this as soon as the TP works -->
<id>babel</id>
<layout>p2</layout>
<url>http://archive.eclipse.org/technology/babel/update-site/R0.14.1/luna/</url>
<url>http://download.eclipse.org/technology/babel/update-site/R0.16.0/photon/</url>
</repository>
<!--
<repository>
<!-- TODO remove this as soon as the TP works -->
<id>orbit</id>
<layout>p2</layout>
<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/</url>
</repository>
-->
</repositories>
......@@ -99,17 +103,21 @@
<version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<!--
<target>
<artifact>
<groupId>info.textgrid.lab</groupId>
<artifactId>target-platform</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.8.0-SNAPSHOT</version>
</artifact>
</target>
-->
<resolver>p2</resolver>
<ignoreTychoRepositories>false</ignoreTychoRepositories>
<environments>
......
......@@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>target-platform</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.8.0-SNAPSHOT</version>
<packaging>eclipse-target-definition</packaging>
<parent>
<groupId>info.textgrid.lab</groupId>
<artifactId>parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.4.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment