catch up with branch development Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.jpa.services b/org.eclipse.osbp.jpa.services deleted file mode 160000 index 1b3ee75..0000000 --- a/org.eclipse.osbp.jpa.services +++ /dev/null
@@ -1 +0,0 @@ -Subproject commit 1b3ee7555198a84d99f82cec4b12235d2804de05
diff --git a/org.eclipse.osbp.technologystack.feature/feature.xml b/org.eclipse.osbp.technologystack.feature/feature.xml index 08f8a55..9425bec 100644 --- a/org.eclipse.osbp.technologystack.feature/feature.xml +++ b/org.eclipse.osbp.technologystack.feature/feature.xml
@@ -147,6 +147,10 @@ version="0.0.0"/> <includes + id="org.eclipse.osbp.fork.tapiji.feature" + version="0.0.0"/> + + <includes id="org.eclipse.osbp.gitinfo.feature" version="0.0.0"/>
diff --git a/org.eclipse.osbp.technologystack.feature/pom.xml b/org.eclipse.osbp.technologystack.feature/pom.xml index 920f81d..d31ef57 100644 --- a/org.eclipse.osbp.technologystack.feature/pom.xml +++ b/org.eclipse.osbp.technologystack.feature/pom.xml
@@ -170,6 +170,19 @@ <type>eclipse-feature</type> </dependency> <dependency> + <groupId>org.eclipse.osbp.fork.tapiji</groupId> + <artifactId>org.eclipse.osbp.fork.tapiji.feature</artifactId> + <version>${project.version}</version> + <type>eclipse-feature</type> + <scope>provided</scope> + </dependency> + <!-- <dependency> --> + <!-- <groupId>org.eclipse.babel.plugins</groupId> --> + <!-- <artifactId>org.eclipse.babel.tapiji.tools.java.feature</artifactId> --> + <!-- <version>0.9.1-SNAPSHOT</version> --> + <!-- <type>eclipse-feature</type> --> + <!-- </dependency> --> + <dependency> <groupId>org.eclipse.osbp.fork.jpos</groupId> <artifactId>org.eclipse.osbp.fork.jpos.feature</artifactId> <version>1.14.0-SNAPSHOT</version>