catch up with branch daily
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/jenkins.build.config.xml b/jenkins.build.config.xml
index 3a0c007..3a0e976 100644
--- a/jenkins.build.config.xml
+++ b/jenkins.build.config.xml
@@ -59,6 +59,7 @@
<jenkins.build.dependency>org.eclipse.osbp.ui.api</jenkins.build.dependency>
<jenkins.build.dependency>org.eclipse.osbp.ui.common</jenkins.build.dependency>
<jenkins.build.dependency>org.eclipse.osbp.utils</jenkins.build.dependency>
+ <jenkins.build.dependency>org.eclipse.osbp.utils.email</jenkins.build.dependency>
<jenkins.build.dependency>org.eclipse.osbp.utils.functionnormalizer</jenkins.build.dependency>
<jenkins.build.dependency>org.eclipse.osbp.utils.js</jenkins.build.dependency>
<jenkins.build.dependency>org.eclipse.osbp.utils.themes.ui</jenkins.build.dependency>
diff --git a/org.eclipse.osbp.softwarefactory.p2/category.xml b/org.eclipse.osbp.softwarefactory.p2/category.xml
index 8915d95..585be50 100644
--- a/org.eclipse.osbp.softwarefactory.p2/category.xml
+++ b/org.eclipse.osbp.softwarefactory.p2/category.xml
@@ -12,6 +12,12 @@
<feature id="org.eclipse.osbp.softwarefactory.target.feature.source">
<category name="osbp_software_factory_target"/>
</feature>
+ <feature id="org.eclipse.osbp.technologystack.postgresql.feature">
+ <category name="osbp_software_factory_target"/>
+ </feature>
+ <feature id="org.eclipse.osbp.technologystack.postgresql.feature.source">
+ <category name="osbp_software_factory_target"/>
+ </feature>
<category-def name="osbp_software_factory" label="OSBP Software Factory"/>
<category-def name="osbp_software_factory_target" label="OSBP Software Factory Target Definition"/>
</site>
diff --git a/org.eclipse.osbp.softwarefactory.runtime.feature/feature.xml b/org.eclipse.osbp.softwarefactory.runtime.feature/feature.xml
index 93c65d3..14c7bfd 100644
--- a/org.eclipse.osbp.softwarefactory.runtime.feature/feature.xml
+++ b/org.eclipse.osbp.softwarefactory.runtime.feature/feature.xml
@@ -102,7 +102,7 @@
version="0.0.0"/>
<includes
- id="org.eclipse.osbp.dependencies.feature.mondrian"
+ id="org.eclipse.osbp.dependencies.feature.mondrian.3.14.0"
version="0.0.0"/>
<includes
@@ -182,6 +182,10 @@
version="0.0.0"/>
<includes
+ id="org.eclipse.osbp.utils.email.feature"
+ version="0.0.0"/>
+
+ <includes
id="org.eclipse.osbp.authentication.ui.feature"
version="0.0.0"/>
@@ -261,6 +265,14 @@
id="org.eclipse.osbp.dependencies.feature.jackson.core"
version="0.0.0"/>
+ <includes
+ id="org.eclipse.gemini.dbaccess.postgresql.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.osbp.dependencies.feature.postgresql"
+ version="0.0.0"/>
+
<plugin
id="org.eclipse.osbp.abstractstatemachine"
download-size="0"
diff --git a/org.eclipse.osbp.softwarefactory.runtime.feature/pom.xml b/org.eclipse.osbp.softwarefactory.runtime.feature/pom.xml
index ccd7f0e..8f6f03f 100644
--- a/org.eclipse.osbp.softwarefactory.runtime.feature/pom.xml
+++ b/org.eclipse.osbp.softwarefactory.runtime.feature/pom.xml
@@ -72,6 +72,17 @@
<classifier>sources-feature</classifier>
</dependency>
<dependency>
+ <groupId>org.eclipse.osbp.utils.email</groupId>
+ <artifactId>org.eclipse.osbp.utils.email.feature</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.osbp.utils.email</groupId>
+ <artifactId>org.eclipse.osbp.utils.email.feature</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources-feature</classifier>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.osbp.authentication.ui</groupId>
<artifactId>org.eclipse.osbp.authentication.ui.feature</artifactId>
<version>${project.version}</version>
@@ -235,6 +246,24 @@
<version>${project.version}</version>
<type>eclipse-feature</type>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.osbp.dependencies</groupId>
+ <artifactId>
+ org.eclipse.osbp.dependencies.feature.postgresql
+ </artifactId>
+ <version>42.2.2-SNAPSHOT</version>
+ <type>eclipse-feature</type>
+ </dependency>
+ <dependency>
+ <groupId>
+ org.eclipse.osbp.gemini.dbaccess.postgresql
+ </groupId>
+ <artifactId>
+ org.eclipse.gemini.dbaccess.postgresql.feature
+ </artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <type>eclipse-feature</type>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -275,7 +304,8 @@
<feature id="org.eclipse.osbp.dependencies.feature.joda" />
<feature id="org.eclipse.osbp.dependencies.feature.misc.mbp" />
<feature id="org.eclipse.osbp.dependencies.feature.misc.runtime" />
- <feature id="org.eclipse.osbp.dependencies.feature.mondrian" />
+ <feature id="org.eclipse.osbp.dependencies.feature.mondrian.3.14.0" />
+ <feature id="org.eclipse.osbp.dependencies.feature.postgresql" />
<feature id="org.eclipse.osbp.dependencies.feature.quartz" />
<feature id="org.eclipse.osbp.dependencies.feature.uomo" />
<feature id="org.eclipse.osbp.dependencies.feature.vaadin.addons" />
