...
 
Commits (20)
/*******************************************************************************
* Copyright (c) 2013-2014 MEDEVIT <office@medevit.at>.
* Copyright (c) 2013-2019 MEDEVIT <office@medevit.at>.
* 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
......@@ -17,7 +17,6 @@ import org.eclipse.equinox.app.IApplicationContext;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.internal.WorkbenchPlugin;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -103,8 +102,13 @@ public class Desk implements IApplication {
Messages.Warning_tooManyMessage + CoreHub.getWritableUserDir().getAbsolutePath());
}
// care for log-in
WorkbenchPlugin.unsetSplashShell(UiDesk.getDisplay());
// make sure identifiers are initialized
initIdentifiers();
// close splash
context.applicationRunning();
// perform login
cod.performLogin(UiDesk.getDisplay().getActiveShell());
if ((CoreHub.actUser == null) || !CoreHub.actUser.isValid()) {
// no valid user, exit (don't consider this as an error)
......@@ -112,8 +116,6 @@ public class Desk implements IApplication {
PersistentObject.disconnect();
System.exit(0);
}
// make sure identifiers are initialized
initIdentifiers();
// start the workbench
try {
......
......@@ -23,6 +23,7 @@ import org.eclipse.ui.application.WorkbenchWindowAdvisor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ch.elexis.core.data.events.ElexisEventDispatcher;
import ch.elexis.core.data.extension.AbstractCoreOperationAdvisor;
import ch.elexis.core.data.extension.CoreOperationExtensionPoint;
import ch.elexis.core.ui.Hub;
......@@ -43,7 +44,7 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
protected static AbstractCoreOperationAdvisor cod =
CoreOperationExtensionPoint.getCoreOperationAdvisor();
@Override
public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(
final IWorkbenchWindowConfigurer configurer){
......@@ -82,6 +83,12 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
return initPerspective;
}
@Override
public void preStartup(){
super.preStartup();
ElexisEventDispatcher.getInstance().start();
}
@Override
public void eventLoopException(final Throwable exception){
log.error(Messages.ApplicationWorkbenchAdvisor_10 + exception.getMessage(), exception);
......
......@@ -52,6 +52,7 @@ import ch.elexis.data.PersistentObject;
* @since 3.0.0 major changes, switch to {@link ElexisContext}
* @since 3.4 switched listeners to {@link ListenerList}
* @since 3.7 move from Eclipse job to ScheduledExecutorService
* @since 3.8 must explicitly {@link #start()} queue execution
*/
public final class ElexisEventDispatcher implements Runnable {
private Logger log = LoggerFactory.getLogger(ElexisEventDispatcher.class);
......@@ -85,6 +86,14 @@ public final class ElexisEventDispatcher implements Runnable {
elexisUIContext = new ElexisContext();
service = Executors.newSingleThreadScheduledExecutor();
}
/**
* Start the ElexisEventDispatch scheduler; that is, start delivering events
*
* @since 3.8
*/
public void start(){
service.scheduleAtFixedRate(this, 0, 25, TimeUnit.MILLISECONDS);
}
......
/*******************************************************************************
* Copyright (c) 2016 MEDEVIT <office@medevit.at>.
* Copyright (c) 2016-2019 MEDEVIT <office@medevit.at>.
* 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
......@@ -72,13 +72,6 @@ public class DiagnoseListComposite extends Composite {
super(parent, style);
setLayout(new GridLayout(1, false));
toolbarManager = new ToolBarManager();
toolbarManager.add(new AddConditionAction());
toolbarManager.add(new RemoveConditionAction());
ToolBar toolbar = toolbarManager.createControl(this);
toolbar.setLayoutData(new GridData(SWT.RIGHT, SWT.TOP, false, false));
toolbar.setBackground(parent.getBackground());
natTableWrapper = NatTableFactory.createSingleColumnTable(this,
new GlazedListsDataProvider<ICondition>(dataList, new IColumnAccessor<ICondition>() {
@Override
......@@ -181,6 +174,13 @@ public class DiagnoseListComposite extends Composite {
mgr.setRemoveAllWhenShown(true);
mgr.addMenuListener(new ConditionsMenuListener());
natTableWrapper.getNatTable().setMenu(mgr.createContextMenu(natTableWrapper.getNatTable()));
toolbarManager = new ToolBarManager();
toolbarManager.add(new AddConditionAction());
toolbarManager.add(new RemoveConditionAction());
ToolBar toolbar = toolbarManager.createControl(this);
toolbar.setLayoutData(new GridData(SWT.RIGHT, SWT.TOP, false, false));
toolbar.setBackground(parent.getBackground());
}
public void setInput(List<ICondition> conditions){
......
......@@ -5,11 +5,12 @@ Bundle-SymbolicName: ch.elexis.core.mail
Bundle-Version: 3.2.0.qualifier
Bundle-Vendor: medevit.at
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Multi-Release: true
Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/ch.elexis.core.mail.internal.MailClient.xml
Require-Bundle: ch.elexis.core.data;bundle-version="3.2.0",
javax.mail.glassfish;bundle-version="1.4.1",
org.eclipse.osgi.services;bundle-version="3.3.100"
Import-Package: ch.rgw.io
org.eclipse.osgi.services;bundle-version="3.3.100",
ch.rgw.utility;bundle-version="3.8.0"
Export-Package: ch.elexis.core.mail
Automatic-Module-Name: ch.elexis.core.mail
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Import-Package: javax.activation
......@@ -34,6 +34,7 @@ Require-Bundle: org.eclipse.core.runtime,
com.google.guava,
net.sf.opencsv
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Multi-Release: true
Bundle-ActivationPolicy: lazy
Export-Package: ch.elexis.core.ui,
ch.elexis.core.ui.actions,
......
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Import-Package: org.apache.commons.io,
org.apache.commons.lang3;version="3.1.0",
org.apache.commons.lang3.math;version="3.1.0",
org.eclipse.core.expressions,
org.eclipse.e4.core.contexts,
org.eclipse.e4.core.di.annotations,
org.eclipse.e4.ui.di,
javax.xml.bind,
javax.xml.bind.annotation,
org.osgi.service.component.annotations;version="1.2.0",
org.osgi.service.event;version="1.3.1",
org.slf4j
......@@ -7,6 +7,7 @@ Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Multi-Release: true
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
org.eclipse.emf.ecore;visibility:=reexport,
ch.rgw.utility;bundle-version="3.0.0",
......@@ -41,8 +42,7 @@ Export-Package: ch.elexis.core.common,
ch.elexis.core.types.impl,
ch.elexis.core.types.util,
ch.elexis.core.utils
Import-Package: ch.elexis.core.constants,
javax.ws.rs;version="[2.0.0,2.1.0)",
Import-Package: javax.ws.rs;version="[2.0.0,2.1.0)",
javax.ws.rs.core;version="[2.0.0,2.1.0)",
org.apache.commons.lang3;version="3.1.0",
org.osgi.service.component;version="1.1.0";resolution:=optional,
......
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Import-Package: javax.ws.rs;version="[2.0.0,2.1.0)",
javax.ws.rs.core;version="[2.0.0,2.1.0)",
javax.xml.bind,
javax.xml.bind.annotation,
org.apache.commons.lang3;version="3.1.0",
org.osgi.service.component;version="1.1.0";resolution:=optional,
org.slf4j;version="1.6.6"
......@@ -5,6 +5,7 @@ Bundle-SymbolicName: ch.rgw.utility;singleton:=true
Bundle-Version: 3.8.0.qualifier
Bundle-Vendor: G. Weirich
Eclipse-BuddyPolicy: registered
Multi-Release: true
Export-Package: ch.rgw.compress,
ch.rgw.crypt,
ch.rgw.io,
......@@ -14,11 +15,11 @@ Export-Package: ch.rgw.compress,
Require-Bundle: ch.qos.logback.classic;bundle-version="1.0.0",
ch.qos.logback.core;bundle-version="1.0.0",
org.jdom;bundle-version="1.1.0",
org.apache.commons.dbcp;bundle-version="1.4.0",
org.apache.commons.pool;bundle-version="1.6.0",
bouncycastle.bcprov-jdk14;bundle-version="138.0.0",
org.apache.commons.codec;bundle-version="1.6.0";visibility:=reexport,
ch.elexis.core.l10n;bundle-version="3.5.0"
ch.elexis.core.l10n;bundle-version="3.5.0",
org.apache.commons.dbcp;bundle-version="1.4.0",
org.apache.commons.pool;bundle-version="1.6.0"
Import-Package: com.mysql.jdbc;version="5.1.0",
org.h2;version="1.3.170",
org.postgresql,
......
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Import-Package: com.mysql.jdbc;version="5.1.0",
javax.transaction,
org.h2;version="1.3.170",
org.postgresql,
org.slf4j
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>jaxb-api-impl-import-java9</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.7
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: jaxb-api bind implementation fragment
Bundle-SymbolicName: jaxb-api-impl-import-java9
Bundle-Version: 1.0.0.qualifier
Fragment-Host: jaxb-api;bundle-version="2.4.0"
Automatic-Module-Name: jaxb-api-bind
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Multi-Release: true
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Import-Package: com.sun.xml.bind.v2
# JAXB-API import package binding for Java > 8
This fragment binds to jaxb-api, importing for Java > 8 the
`com.sun.xml.bind.v2` package from `com.sun.xml.bind.jaxb-osgi` which
provides a concrete JAXB implementation.
Without this fragment, instantiations of JAXB would face the following exception:
Caused by: javax.xml.bind.JAXBException: Implementation of JAXB-API has not been found on module path or classpath.
at javax.xml.bind.ContextFinder.newInstance(ContextFinder.java:269) ~[na:na]
at javax.xml.bind.ContextFinder.find(ContextFinder.java:412) ~[na:na]
at javax.xml.bind.JAXBContext.newInstance(JAXBContext.java:721) ~[na:na]
at javax.xml.bind.JAXBContext.newInstance(JAXBContext.java:662) ~[na:na]
at at.medevit.redmine.rest.messages.UserBodyReader.readFrom(UserBodyReader.java:40) ~[na:na]
... 93 common frames omitted
Caused by: java.lang.ClassNotFoundException: com.sun.xml.bind.v2.ContextFactory
at java.base/jdk.internal.loader.BuiltinClassLoader.loadClass(BuiltinClassLoader.java:583) ~[na:na]
at java.base/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(ClassLoaders.java:178) ~[na:na]
at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:521) ~[na:na]
at org.eclipse.osgi.internal.framework.ContextFinder.loadClass(ContextFinder.java:135) ~[na:na]
at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:521) ~[na:na]
at javax.xml.bind.ServiceLoaderUtil.nullSafeLoadClass(ServiceLoaderUtil.java:122) ~[na:na]
at javax.xml.bind.ServiceLoaderUtil.safeLoadClass(ServiceLoaderUtil.java:155) ~[na:na]
at javax.xml.bind.ContextFinder.newInstance(ContextFinder.java:267) ~[na:na]
... 97 common frames omitted
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.osgi.framework.system.packages.extra</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.release=disabled
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Version: 1.0.0.qualifier
Bundle-Name: Osgi Framework Extender
Fragment-Host: system.bundle; extension:=framework
Bundle-SymbolicName: org.osgi.framework.system.packages.extra
Export-Package: com.sun.source.tree,com.sun.source.util
# OSGi Extender Fragment
This fragment provides the `com.source.tree` and `com.source.util` packages to
`com.sun.xml.bind.jaxb-osgi` for resolving the bundles during Tycho build, resp.
Eclipse feature bundling.
At runtime, these packages are resolved by `org.eclipse.osgi`.
See https://github.com/eclipse-ee4j/jaxb-api/issues/92 and
https://bugs.eclipse.org/bugs/show_bug.cgi?id=540426
......@@ -15,6 +15,8 @@
</parent>
<modules>
<module>org.osgi.framework.system.packages.extra</module>
<module>jaxb-api-impl-import-java9</module>
<module>ch.elexis.core.l10n</module>
<module>ch.elexis.core.application</module>
<module>ch.elexis.core.console.application</module>
......
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/ch.elexis.core.ui.p2.feature_3.6.0.qualifier.jar" id="ch.elexis.core.ui.p2.feature" version="3.8.0.qualifier">
<feature url="features/ch.elexis.core.ui.p2.feature" id="ch.elexis.core.ui.p2.feature" version="0.0.0">
<category name="elexis_3_core"/>
</feature>
<feature url="features/ch.elexis.core.logging.feature_3.6.0.qualifier.jar" id="ch.elexis.core.logging.feature" version="3.8.0.qualifier">
<feature url="features/ch.elexis.core.logging.feature" id="ch.elexis.core.logging.feature" version="0.0.0">
<category name="elexis_3_core"/>
</feature>
<feature url="features/ch.elexis.core.ui.medication.os.feature_3.6.0.qualifier.jar" id="ch.elexis.core.ui.medication.os.feature" version="3.8.0.qualifier">
<feature url="features/ch.elexis.core.ui.medication.os.feature" id="ch.elexis.core.ui.medication.os.feature" version="0.0.0">
<category name="elexis_3_core"/>
</feature>
<feature url="features/ch.elexis.core.ui.feature_3.6.0.qualifier.jar" id="ch.elexis.core.ui.feature" version="3.8.0.qualifier">
<feature url="features/ch.elexis.core.ui.feature" id="ch.elexis.core.ui.feature" version="0.0.0">
<category name="elexis_3_core"/>
</feature>
<feature url="features/ch.elexis.core.application.feature_3.6.0.qualifier.jar" id="ch.elexis.core.application.feature" version="3.8.0.qualifier">
<feature url="features/ch.elexis.core.application.feature" id="ch.elexis.core.application.feature" version="0.0.0">
<category name="elexis_3_core"/>
</feature>
<feature url="features/ch.elexis.core.common.feature_3.6.0.qualifier.jar" id="ch.elexis.core.common.feature" version="3.8.0.qualifier">
<feature url="features/ch.elexis.core.common.feature_0.0.0.jar" id="ch.elexis.core.common.feature" version="0.0.0">
<category name="elexis_3_core"/>
</feature>
<bundle id="ch.elexis.core.data.tests" version="3.8.0.qualifier"/>
<bundle id="ch.elexis.core.ui.usage" version="3.8.0.qualifier"/>
<bundle id="ch.elexis.core.data.tests" version="0.0.0"/>
<bundle id="ch.elexis.core.ui.usage" version="0.0.0"/>
<category-def name="elexis_3_core" label="Elexis 3 Kern"/>
</site>
This diff is collapsed.
target "Elexis" with source
location "http://download.elexis.info/elexis/master/p2/target/" {
location "http://download.elexis.info/elexis/f11355/p2/target/" {
org.eclipse.equinox.executable.feature.group
org.eclipse.rcp.feature.group
org.eclipse.platform.feature.group
......@@ -64,7 +64,7 @@ location "http://download.elexis.info/elexis/master/p2/target/" {
javax.xml [1.3.4.v201005080400,1.3.4.v201005080400]
javax.mail.glassfish [1.4.0,1.5.0)
javax.activation [1.1.0,1.2.0)
com.google.guava [15.0.0,16.0.0)
com.google.guava
org.apache.commons.dbcp
org.apache.commons.codec
org.apache.commons.collections
......@@ -90,6 +90,14 @@ location "http://download.elexis.info/elexis/master/p2/target/" {
org.slf4j.log4j [1.7.2,1.7.3)
org.slf4j.nop [1.7.2,1.7.3)
// java 11
com.sun.activation.javax.activation [1.2.0,1.2.0]
javax.transaction-api [1.3.0,1.3.0]
javax.enterprise.cdi-api
javax.interceptor-api
com.sun.xml.bind.jaxb-osgi
jaxb-api
//
org.springframework.spring-web
woodstox-core-asl
javax.xml.stream.stax-api
......
target "Oxygen.3 for Elexis" with source allEnvironments
target "Elexis" with source allEnvironments
// We a mirror http://download.eclipse.org/technology/babel/update-site/R0.16.0/oxygen as
// We a mirror http://download.eclipse.org/technology/babel/update-site/R0.16.0/photon as
// it was really unreliable when building on the Jenkins
location "https://ftp.fau.de/eclipse/technology/babel/update-site/R0.16.0/oxygen" {
location "https://ftp.fau.de/eclipse/technology/babel/update-site/R0.16.0/photon" {
org.eclipse.swt.nl_de
org.eclipse.swt.nl_fr
org.eclipse.swt.nl_it
......@@ -33,7 +33,7 @@ location "http://download.eclipse.org/e4/snapshots/org.eclipse.e4.tools/latest/"
org.eclipse.e4.tools.spies.feature.feature.group
}
location "http://download.eclipse.org/eclipse/updates/4.7/" {
location "http://download.eclipse.org/eclipse/updates/4.9/" {
org.eclipse.equinox.executable.feature.group
org.eclipse.rcp.feature.group
org.eclipse.platform.feature.group
......@@ -51,7 +51,7 @@ location "http://download.eclipse.org/eclipse/updates/4.7/" {
org.eclipse.e4.tools.emf.ui
}
location "http://download.eclipse.org/releases/oxygen" {
location "http://download.eclipse.org/releases/2018-09/" {
ch.qos.logback.classic
ch.qos.logback.core
ch.qos.logback.slf4j
......@@ -76,8 +76,9 @@ location "http://medevit.github.io/osgi-jax-rs-connector/5.3.100/" {
com.eclipsesource.jaxrs.jersey-all-nojavax
}
// Eclipse Orbit Recommended Tue, 6 Feb 2018 -- 16:31 (UTC) Oxygen.3
location "http://download.eclipse.org/tools/orbit/downloads/drops/R20180206163158/repository/" {
// Eclipse Orbit Recommended Wed, 5 Sep 2018 -- 20:19 (UTC) 2018-09
// https://download.eclipse.org/tools/orbit/downloads/
location "http://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository/" {
org.apache.httpcomponents.httpcore
org.apache.httpcomponents.httpclient
edu.emory.mathcs.backport [3.1.0,3.1.1)
......@@ -87,21 +88,21 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/R2018020616315
javax.xml [1.3.4.v201005080400,1.3.4.v201005080400]
javax.mail.glassfish [1.4.0,1.5.0)
javax.activation [1.1.0,1.2.0)
com.google.guava [15.0.0,16.0.0)
org.apache.commons.dbcp
com.google.guava [21.0.0.v20170206-1425,21.0.0.v20170206-1425]
org.apache.commons.codec
org.apache.commons.collections
org.apache.commons.cli
org.apache.commons.exec
org.apache.commons.lang
org.apache.commons.lang3
org.apache.commons.pool
org.apache.commons.httpclient
org.apache.poi
org.apache.poi.ooxml
org.apache.poi.ooxml.schemas
org.apache.xmlbeans
org.dom4j
org.apache.commons.dbcp
org.apache.commons.pool
}
location "http://download.elexis.info/elexis-server/master/p2/elexis-server" {
......@@ -119,6 +120,16 @@ location "http://download.elexis.info/mirror.4.elexis/snapshot" {
}
location "http://download.elexis.info/elexis-server/elexis-server-dependencies" {
// java 11
// javax.transaction
javax.transaction-api [1.3.0,1.3.0]
javax.enterprise.cdi-api
javax.interceptor-api
// jaxb
com.sun.activation.javax.activation [1.2.0,1.2.0]
com.sun.xml.bind.jaxb-osgi
jaxb-api
//
org.springframework.spring-web
woodstox-core-asl
javax.xml.stream.stax-api
......
......@@ -662,20 +662,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.commons.dbcp"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.commons.pool"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="bouncycastle.bcprov-jdk14"
download-size="0"
......@@ -1074,4 +1060,186 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.poi.ooxml"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.poi.ooxml.schemas"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.xmlbeans"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.dom4j"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.core.filesystem"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.core.filesystem.linux.x86"
os="linux"
arch="x86"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.eclipse.core.filesystem.linux.x86_64"
os="linux"
arch="x86_64"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.eclipse.core.filesystem.macosx"
os="macosx"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.eclipse.core.filesystem.win32.x86"
os="win32"
arch="x86"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.eclipse.core.filesystem.win32.x86_64"
os="win32"
arch="x86_64"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.eclipse.equinox.concurrent"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.xml.stream.stax-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.transaction-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.enterprise.cdi-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.el"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.interceptor-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.commons.dbcp"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.commons.pool"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="jaxb-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.equinox.console"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.sun.xml.bind.jaxb-osgi"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.sun.activation.javax.activation"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.osgi.framework.system.packages.extra"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"/>
<plugin
id="jaxb-api-impl-import-java9"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"/>
</feature>
......@@ -77,7 +77,6 @@
<plugin
id="ch.elexis.core.ui.importer.div.native32"
os="win32"
ws="win32"
arch="x86"
download-size="0"
install-size="0"
......@@ -87,7 +86,6 @@
<plugin
id="ch.elexis.core.ui.importer.div.native64"
os="win32"
ws="win32"
arch="x86_64"
download-size="0"
install-size="0"
......
......@@ -20,10 +20,10 @@
</repository>
</repositories>
<properties>
<tycho.version>1.0.0</tycho.version>
<tycho.version>1.3.0</tycho.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tycho-groupid>org.eclipse.tycho</tycho-groupid>
<git.target.branch>master</git.target.branch>
<git.target.branch>f11355</git.target.branch>
<git.core.branch>${git.target.branch}</git.core.branch>
</properties>
......