Skip to content

Commit

Permalink
Merge pull request #2 from eclipse/update_tp_v1.3.x
Browse files Browse the repository at this point in the history
[releng] update TP
  • Loading branch information
tguiu authored Jan 21, 2020
2 parents ef57315 + 491ff41 commit 490342d
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ org.polarsys.capella.studio.product.application
openFile
--launcher.appendVmargs
</programArgs>
<programArgsLin>--launcher.GTK_version
<programArgsLin>--launcher.GTK_version
2
</programArgsLin>
<vmArgs>-Dosgi.requiredJavaVersion=1.8
-Xms512m
-Xmx2048m
<vmArgs>-Dosgi.requiredJavaVersion=1.8
-Xms512m
-Xmx2048m
-XX:PermSize=256M
</vmArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
Expand All @@ -45,13 +45,13 @@ openFile

<license>
<text>
Eclipse Public License v1.0

All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v1.0 which accompanies this
distribution, and is available at
Eclipse Public License v1.0

All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v1.0 which accompanies this
distribution, and is available at
http://www.eclipse.org/legal/epl-v10.htm
</text>
</license>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
<target name="capellastudio" sequenceNumber="1562944615">
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="capellastudio" sequenceNumber="1579623339">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
Expand Down Expand Up @@ -152,7 +152,7 @@
<unit id="org.eclipse.sirius.specifier.ide.ui.aql.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sirius.specifier.ide.ui.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sirius.specifier.ide.ui.source.feature.group" version="0.0.0"/>
<repository id="Sirus" location="https://download.eclipse.org/sirius/updates/stable/6.1.3-S20190506-061916/oxygen"/>
<repository id="Sirus" location="https://download.eclipse.org/sirius/updates/releases/6.1.3/oxygen/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.diffmerge.feature.feature.group" version="0.0.0"/>
Expand Down Expand Up @@ -192,7 +192,7 @@
<unit id="org.eclipse.emf.ecoretools.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.ecoretools.design" version="0.0.0"/>
<unit id="org.eclipse.emf.ecoretools.explorer.contextual.feature.group" version="0.0.0"/>
<repository id="EcoreTools" location="http://download.eclipse.org/ecoretools/updates/milestones/3.3.0RC4/oxygen/"/>
<repository id="EcoreTools" location="http://download.eclipse.org/ecoretools/updates/releases/3.3.0/oxygen/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.egf.sdk.feature.feature.group" version="0.0.0"/>
Expand Down Expand Up @@ -378,7 +378,7 @@
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.polarsys.capella.docgen.feature.feature.group" version="0.0.0"/>
<unit id="org.polarsys.capella.docgen.configuration.feature.feature.group" version="0.0.0"/>
<repository id="xhtml-docgen" location="http://download.eclipse.org/capella/addons/xhtmldocgen/updates/releases/1.3.1"/>
<repository id="xhtml-docgen" location="https://download.eclipse.org/capella/addons/xhtmldocgen/updates/release/1.3.1"/>
</location>
</locations>
</target>
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ target "capellastudio" with source, requirements

//include "common/capellabase.targetplatform" NOT already used

include "https://git.polarsys.org/c/kitalpha/kitalpha.git/plain/releng/plugins/org.polarsys.kitalpha.releng.targets/kitalpha.targetplatform?h=v1.3.x"
include "https://github.com/eclipse/kitalpha/raw/v1.3.x/releng/plugins/org.polarsys.kitalpha.releng.targets/kitalpha.targetplatform"

location sirius-query-legacy-1.1.0 "http://download.eclipse.org/sirius/updates/legacy/1.1.0" {
org.eclipse.sirius.query.legacy.feature.feature.group lazy
Expand Down Expand Up @@ -167,7 +167,7 @@ location capella "http://download.polarsys.org/capella/core/updates/releases/1.3
org.polarsys.capella.core.feature.source.feature.group lazy
}

location xhtml-docgen "http://download.eclipse.org/capella/addons/xhtmldocgen/updates/releases/1.3.1" {
location xhtml-docgen "https://download.eclipse.org/capella/addons/xhtmldocgen/updates/release/1.3.1" {
org.polarsys.capella.docgen.feature.feature.group lazy
org.polarsys.capella.docgen.configuration.feature.feature.group lazy
}

0 comments on commit 490342d

Please sign in to comment.