Google Git
Sign in
eclipse/gerrit/osbp/org.eclipse.osbp.technologystack/9fbab8e830531d7dd96e3d566b04cf8ab2293d04^!/.
commit
9fbab8e830531d7dd96e3d566b04cf8ab2293d04
[log] [tgz]
author
Ralf Mollik <ramollik@compex-commerce.com>
Wed Nov 07 09:09:35 2018 +0100
committer
Ralf Mollik <ramollik@compex-commerce.com>
Wed Nov 07 09:09:35 2018 +0100
tree
b80a60811e584909c08c86db74065209b2ffed4e
parent
a86975d9caa6eaa5734b8be9734589669ea3c0a9 [diff]
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 b46b5d3..57d3f32 100644
--- a/jenkins.build.config.xml
+++ b/jenkins.build.config.xml

@@ -21,7 +21,6 @@
                 <jenkins.build.dependency>org.eclipse.osbp.dependencies</jenkins.build.dependency>
                 <jenkins.build.dependency>org.eclipse.osbp.dependencies.p2</jenkins.build.dependency>
                 <jenkins.build.dependency>org.eclipse.osbp.fork.jpos</jenkins.build.dependency>
-                <jenkins.build.dependency>org.eclipse.osbp.fork.tapiji</jenkins.build.dependency>
                 <jenkins.build.dependency>org.eclipse.osbp.fork.uomo</jenkins.build.dependency>
                 <jenkins.build.dependency>org.eclipse.osbp.gitinfo</jenkins.build.dependency>
         </jenkins.build.dependencies>

diff --git a/org.eclipse.osbp.technologystack.feature/feature.xml b/org.eclipse.osbp.technologystack.feature/feature.xml
index 08f8a55..c449852 100644
--- a/org.eclipse.osbp.technologystack.feature/feature.xml
+++ b/org.eclipse.osbp.technologystack.feature/feature.xml

@@ -87,11 +87,11 @@
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.osbp.dependencies.feature.javax.transaction"
+         id="org.eclipse.osbp.dependencies.feature.jackson.core"
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.osbp.dependencies.feature.jetty"
+         id="org.eclipse.osbp.dependencies.feature.javax.transaction"
          version="0.0.0"/>
 
    <includes

diff --git a/org.eclipse.osbp.technologystack.feature/pom.xml b/org.eclipse.osbp.technologystack.feature/pom.xml
index 7f40a3c..f866c25 100644
--- a/org.eclipse.osbp.technologystack.feature/pom.xml
+++ b/org.eclipse.osbp.technologystack.feature/pom.xml

@@ -99,6 +99,12 @@
 		</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>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.osbp.dependencies</groupId>
 			<artifactId>org.eclipse.osbp.dependencies.feature.javax.transaction</artifactId>
 			<version>1.1.1-SNAPSHOT</version>
 			<type>eclipse-feature</type>
@@ -106,7 +112,7 @@
 		<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>
 		</dependency>
 		<dependency>

diff --git a/org.eclipse.osbp.technologystack.target.feature/feature.xml b/org.eclipse.osbp.technologystack.target.feature/feature.xml
index 1ce5c7d..e9a7c02 100644
--- a/org.eclipse.osbp.technologystack.target.feature/feature.xml
+++ b/org.eclipse.osbp.technologystack.target.feature/feature.xml

@@ -23,6 +23,10 @@
          version="0.0.0"/>
 
    <includes
+         id="org.eclipse.osbp.dependencies.feature.apache.cxf"
+         version="0.0.0"/>
+
+   <includes
          id="org.eclipse.osbp.dependencies.feature.birt.runtime"
          version="0.0.0"/>
 
@@ -33,19 +37,19 @@
    <includes
          id="org.eclipse.osbp.dependencies.feature.e4tools.runtime"
          version="0.0.0"/>
-         
+
    <includes
          id="org.eclipse.osbp.dependencies.feature.eclipse.core"
          version="0.0.0"/>
-         
-    <includes
+
+   <includes
          id="org.eclipse.osbp.dependencies.feature.eclipse.emf"
          version="0.0.0"/>
- 
+
    <includes
          id="org.eclipse.osbp.dependencies.feature.eclipse.jdt"
          version="0.0.0"/>
-         
+
    <includes
          id="org.eclipse.osbp.dependencies.feature.equinox"
          version="0.0.0"/>
@@ -59,9 +63,17 @@
          version="0.0.0"/>
 
    <includes
+         id="org.eclipse.osbp.dependencies.feature.jackson.core"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.osbp.dependencies.feature.jetty"
+         version="0.0.0"/>
+
+   <includes
          id="org.eclipse.osbp.dependencies.feature.misc.external"
          version="0.0.0"/>
-         
+
    <includes
          id="org.eclipse.osbp.dependencies.feature.misc.runtime"
          version="0.0.0"/>
@@ -69,7 +81,7 @@
    <includes
          id="org.eclipse.osbp.dependencies.feature.vaadin"
          version="0.0.0"/>
-   
+
    <includes
          id="org.eclipse.osbp.dependencies.feature.vaadin.addons"
          version="0.0.0"/>
@@ -87,7 +99,7 @@
          version="0.0.0"/>
 
    <includes
-		id="org.eclipse.datatools.connectivity.oda.feature"
+         id="org.eclipse.datatools.connectivity.oda.feature"
          version="0.0.0"/>
 
 </feature>

diff --git a/org.eclipse.osbp.technologystack.target.feature/pom.xml b/org.eclipse.osbp.technologystack.target.feature/pom.xml
index 0b69b16..d4fac9f 100644
--- a/org.eclipse.osbp.technologystack.target.feature/pom.xml
+++ b/org.eclipse.osbp.technologystack.target.feature/pom.xml

@@ -45,6 +45,7 @@
 						<plugin id="org.eclipse.equinox.security.win32.x86" />
 						<plugin id="org.eclipse.equinox.console.jaas.fragment" />
 						<plugin id="org.eclipse.jdt.core" />
+						<feature id="org.eclipse.osbp.dependencies.feature.apache.cxf" />
 						<feature id="org.eclipse.osbp.dependencies.feature.derby" />
 						<feature id="org.eclipse.osbp.dependencies.feature.gemini.naming" />
 						<feature id="org.eclipse.osbp.dependencies.feature.h2" />
@@ -123,6 +124,12 @@
         </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>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.osbp.dependencies</groupId>
             <artifactId>org.eclipse.osbp.dependencies.feature.derby</artifactId>
             <version>10.11.1-SNAPSHOT</version>
             <type>eclipse-feature</type>
@@ -139,6 +146,12 @@
             <version>${project.version}</version>
             <type>eclipse-feature</type>
         </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>
+		</dependency>
         <dependency>
             <groupId>org.eclipse.osbp.dependencies</groupId>
             <artifactId>org.eclipse.osbp.dependencies.feature.misc.external</artifactId>
@@ -209,10 +222,14 @@
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.osbp.dependencies</groupId>
-			<artifactId>
-				org.eclipse.osbp.dependencies.feature.e4tools.runtime
-			</artifactId>
-			<version>0.9.0-SNAPSHOT</version>
+			<artifactId>org.eclipse.osbp.dependencies.feature.e4tools.runtime</artifactId>
+			<version>${project.version}</version>
+			<type>eclipse-feature</type>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.osbp.dependencies</groupId>
+			<artifactId>org.eclipse.osbp.dependencies.feature.jetty</artifactId>
+			<version>${project.version}</version>
 			<type>eclipse-feature</type>
 		</dependency>
     </dependencies>