Commit ae34d933 authored by Marco Descher's avatar Marco Descher
Browse files

Switch prepare target to master

parent 667c4e2e

targets/es.target/prepare/elexis-server-prepare.target

+8 −8
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="no"?>

<?pde?>

<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->

<target name="Elexis-Server" sequenceNumber="1569506678">

<target name="Elexis-Server" sequenceNumber="1570110087">

  <locations>

    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

      <unit id="org.osgi.framework.system.packages.extra" version="1.0.0.20190124-1239"/>

      <unit id="jaxb-api-impl-import-java9" version="1.0.0.20190902-0604"/>

      <unit id="ch.rgw.utility" version="3.8.0.20190906-1311"/>

      <unit id="ch.elexis.core" version="3.8.0.20190926-0852"/>

      <unit id="ch.elexis.core" version="3.8.0.20190927-1244"/>

      <unit id="ch.elexis.core.l10n" version="3.8.0.20190911-1253"/>

      <unit id="ch.elexis.core.importer.div" version="3.2.0.20190906-1311"/>

      <unit id="ch.elexis.core.hl7.v2x" version="3.2.0.20190819-0833"/>
@@ -18,13 +18,13 @@ 
      <unit id="ch.elexis.core.jpa.datasource" version="1.0.0.20190829-1235"/>

      <unit id="ch.elexis.core.jpa.entities" version="1.0.0.20190925-1045"/>

      <unit id="ch.elexis.core.jpa.logging.slf4j" version="1.0.0.20181009-1221"/>

      <unit id="ch.elexis.core.model" version="1.0.0.20190926-0809"/>

      <unit id="ch.elexis.core.model" version="1.0.0.20190927-1244"/>

      <unit id="ch.elexis.core.jcifs" version="2.1.2.20190917-0933"/>

      <unit id="ch.elexis.core.services" version="1.0.0.20190926-1347"/>

      <unit id="ch.elexis.core.services" version="1.0.0.20190927-1244"/>

      <unit id="ch.elexis.core.hapi.fhir" version="3.4.0.20190619-0803"/>

      <unit id="ch.elexis.core.findings.fhir.model" version="1.0.0.20190723-1221"/>

      <unit id="ch.elexis.core.tasks" version="1.0.0.20190925-0856"/>

      <unit id="ch.elexis.core.logback.rocketchat" version="1.0.0.20190926-1348"/>

      <unit id="ch.elexis.core.tasks" version="1.0.0.20190927-1244"/>

      <unit id="ch.elexis.core.logback.rocketchat" version="1.0.0.20190927-1247"/>

      <unit id="org.h2" version="1.3.170"/>

      <unit id="org.jdom" version="1.1.0"/>

      <unit id="org.apache.commons.dbcp" version="1.4.0.v201204271417"/>
@@ -39,7 +39,7 @@ 
      <unit id="org.apache.commons.lang3" version="3.7.0"/>

      <unit id="org.apache.xmlbeans" version="2.3.0.v201605172150"/>

      <unit id="org.dom4j" version="1.6.1.v20170815-1500"/>

      <repository location="http://download.elexis.info/elexis/f11106/p2/elexis-3-core/"/>

      <repository location="http://download.elexis.info/elexis/master/p2/elexis-3-core/"/>

    </location>

    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

      <unit id="ch.elexis.base.ch.ticode" version="3.2.0.20190516-0804"/>
@@ -49,7 +49,7 @@ 
      <unit id="ch.elexis.omnivore" version="3.2.0.20190430-1229"/>

      <unit id="ch.elexis.omnivore.model" version="3.8.0.20190826-1405"/>

      <unit id="ch.elexis.base.ch.labortarif.model" version="1.0.0.20190516-0804"/>

      <repository location="http://download.elexis.info/elexis/f11106/p2/elexis-3-base/"/>

      <repository location="http://download.elexis.info/elexis/master/p2/elexis-3-base/"/>

    </location>

    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

      <unit id="org.eclipse.equinox.sdk.feature.group" version="3.15.0.v20180904-1442"/>

targets/es.target/prepare/elexis-server-prepare.tpd

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ target "Elexis-Server" 
with source allEnvironments



// switch to appropriate Elexis branch on branching ES

location "http://download.elexis.info/elexis/f11106/p2/elexis-3-core/" {

location "http://download.elexis.info/elexis/master/p2/elexis-3-core/" {

	// Java 11

	org.osgi.framework.system.packages.extra

	jaxb-api-impl-import-java9
@@ -46,7 +46,7 @@ location "http://download.elexis.info/elexis/f11106/p2/elexis-3-core/" { 
}



// switch to appropriate Elexis branch on branching ES

location "http://download.elexis.info/elexis/f11106/p2/elexis-3-base/" {

location "http://download.elexis.info/elexis/master/p2/elexis-3-base/" {

	ch.elexis.base.ch.ticode

	at.medevit.ch.artikelstamm

	at.medevit.ch.artikelstamm.model