catch up with branch daily
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.dependencies.p2/category.xml b/org.eclipse.osbp.dependencies.p2/category.xml
index 66ac19f..2125e9b 100644
--- a/org.eclipse.osbp.dependencies.p2/category.xml
+++ b/org.eclipse.osbp.dependencies.p2/category.xml
@@ -21,6 +21,9 @@
<feature id="org.eclipse.osbp.dependencies.feature.apache.commons.source">
<category name="osbp_feature_source"/>
</feature>
+ <feature id="org.eclipse.osbp.dependencies.feature.apache.cxf">
+ <category name="osbp_feature"/>
+ </feature>
<feature id="org.eclipse.osbp.dependencies.feature.apache.mina.core">
<category name="osbp_feature"/>
</feature>
@@ -93,6 +96,12 @@
<feature id="org.eclipse.osbp.dependencies.feature.h2">
<category name="osbp_feature"/>
</feature>
+ <feature id="org.eclipse.osbp.dependencies.feature.jackson.core">
+ <category name="osbp_feature"/>
+ </feature>
+ <feature id="org.eclipse.osbp.dependencies.feature.jackson.core.source">
+ <category name="osbp_feature"/>
+ </feature>
<feature id="org.eclipse.osbp.dependencies.feature.javax.transaction">
<category name="osbp_feature"/>
</feature>
diff --git a/org.eclipse.osbp.dependencies.p2/pom.xml b/org.eclipse.osbp.dependencies.p2/pom.xml
index 9ce11c6..4e4025d 100644
--- a/org.eclipse.osbp.dependencies.p2/pom.xml
+++ b/org.eclipse.osbp.dependencies.p2/pom.xml
@@ -89,11 +89,6 @@
<layout>p2</layout>
</repository>
<repository>
- <id>jetty</id>
- <url>http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.1.v20170120</url>
- <layout>p2</layout>
- </repository>
- <repository>
<id>p2.restlet.com-2.1</id>
<url>http://p2.restlet.com/2.1/</url>
<layout>p2</layout>
@@ -254,6 +249,13 @@
</dependency>
<dependency>
<groupId>org.eclipse.osbp.dependencies</groupId>
+ <artifactId>org.eclipse.osbp.dependencies.feature.apache.cxf</artifactId>
+ <version>${project.version}</version>
+ <type>eclipse-feature</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.osbp.dependencies</groupId>
<artifactId>org.eclipse.osbp.dependencies.feature.apache.pdfbox</artifactId>
<version>2.0.6-SNAPSHOT</version>
<type>eclipse-feature</type>
@@ -389,8 +391,15 @@
</dependency>
<dependency>
<groupId>org.eclipse.osbp.dependencies</groupId>
+ <artifactId>org.eclipse.osbp.dependencies.feature.jackson.core</artifactId>
+ <version>${project.version}</version>
+ <type>eclipse-feature</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.osbp.dependencies</groupId>
<artifactId>org.eclipse.osbp.dependencies.feature.jetty</artifactId>
- <version>9.4.1-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>eclipse-feature</type>
<scope>provided</scope>
</dependency>
