catch up with branch development
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/bundles/org.eclipse.uomo.ucum.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.ucum.tests/META-INF/MANIFEST.MF
index 79b2ea8..bffe32c 100644
--- a/bundles/org.eclipse.uomo.ucum.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.ucum.tests/META-INF/MANIFEST.MF
@@ -9,5 +9,6 @@
Export-Package: org.eclipse.uomo.ucum.tests
Require-Bundle: org.junit;bundle-version="4.8.2",
org.eclipse.uomo.util;bundle-version="0.6.0",
- org.eclipse.uomo.xml;bundle-version="0.6.0"
+ org.eclipse.uomo.xml;bundle-version="0.6.0",
+ org.xmlpull;bundle-version="1.1.3"
diff --git a/org.eclipse.osbp.jpa.services b/org.eclipse.osbp.jpa.services
new file mode 160000
index 0000000..1b3ee75
--- /dev/null
+++ b/org.eclipse.osbp.jpa.services
@@ -0,0 +1 @@
+Subproject commit 1b3ee7555198a84d99f82cec4b12235d2804de05
diff --git a/pom.xml b/pom.xml
index 9630ffe..0d87b11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,6 +90,19 @@
</contributors>
+ <distributionManagement>
+ <repository>
+ <id>osbp-nexus-release</id>
+ <name>Nexus Release Repository</name>
+ <url>${distribution.repository.release.url}</url>
+ </repository>
+ <snapshotRepository>
+ <id>osbp-nexus-snapshots</id>
+ <name>Sonatype Nexus Snapshots</name>
+ <url>${distribution.repository.snapshot.url}</url>
+ </snapshotRepository>
+ </distributionManagement>
+
<scm>
<url>http://git.eclipse.org/c/uomo/org.eclipse.uomo.git/</url>
</scm>
@@ -130,67 +143,6 @@
<osbp.build.eclipse.platform.p2.url>http://download.eclipse.org/releases/luna</osbp.build.eclipse.platform.p2.url>
</properties>
</profile>
- <profile>
- <id>isEclipseBuild</id>
- <activation>
- <property>
- <name>!isNotEclipseBuild</name>
- </property>
- </activation>
- <properties>
- <osbp.build.branch>master</osbp.build.branch>
- <osbp.stage.p2.dependencies.target.dir.base>${osbp.developer.home.repositories}${osbp.dependencies.repository.label}${file.separator}${osbp.build.eclipse.platform.name}</osbp.stage.p2.dependencies.target.dir.base>
- <osbp.stage.p2.target.dir.base>/home/data/httpd/download.eclipse.org/osbp${file.separator}${osbp.build.eclipse.platform.name}</osbp.stage.p2.target.dir.base>
- </properties>
-
- <distributionManagement>
- <repository>
- <id>repo.eclipse.org</id>
- <name>Project Repository - Releases</name>
- <url>https://repo.eclipse.org/content/repositories/osbp-releases/</url>
- </repository>
- <snapshotRepository>
- <id>repo.eclipse.org</id>
- <name>Project Repository - Snapshots</name>
- <url>https://repo.eclipse.org/content/repositories/osbp-snapshots/</url>
- </snapshotRepository>
- </distributionManagement>
-
- </profile>
- <profile>
- <id>isNotEclipseBuild</id>
- <activation>
- <property>
- <name>isNotEclipseBuild</name>
- </property>
- </activation>
-
- <properties>
- <!-- osbp.build.branch is set from the local settings.xml -->
- <!-- osbp.build.branch>latest</osbp.build.branch -->
- <osbp.stage.p2.dependencies.target.dir.base>${osbp.developer.home.repositories}${osbp.dependencies.repository.label}${file.separator}${osbp.build.eclipse.platform.name}</osbp.stage.p2.dependencies.target.dir.base>
- <osbp.stage.p2.target.dir.base>${osbp.developer.home.repositories}${osbp.federated.repository.label}${file.separator}${osbp.build.eclipse.platform.name}</osbp.stage.p2.target.dir.base>
- </properties>
-
- <distributionManagement>
- <repository>
- <id>osbp-nexus-release</id>
- <name>Nexus Release Repository</name>
- <url>${distribution.repository.release.url}</url>
- </repository>
- <snapshotRepository>
- <id>osbp-nexus-snapshots</id>
- <name>Sonatype Nexus Snapshots</name>
- <url>${distribution.repository.snapshot.url}</url>
- </snapshotRepository>
- <site>
- <id>osbp-source-pages</id>
- <name>OSBP Source Pages</name>
- <url>${distribution.site.url}</url>
- </site>
- </distributionManagement>
-
- </profile>
</profiles>
diff --git a/releng/Maven Clean Install.launch b/releng/Maven Clean Install.launch
deleted file mode 100644
index ddc3626..0000000
--- a/releng/Maven Clean Install.launch
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
-<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-<stringAttribute key="M2_GOALS" value="clean install"/>
-<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-<booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value=""/>
-<listAttribute key="M2_PROPERTIES"/>
-<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
-<booleanAttribute key="M2_SKIP_TESTS" value="true"/>
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dmaven.test.skip=true"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.uomo}"/>
-</launchConfiguration>
diff --git a/releng/Maven Clean Package.launch b/releng/Maven Clean Package.launch
deleted file mode 100644
index d2a0f15..0000000
--- a/releng/Maven Clean Package.launch
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
-<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-<stringAttribute key="M2_GOALS" value="clean package"/>
-<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-<booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value=""/>
-<listAttribute key="M2_PROPERTIES"/>
-<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
-<booleanAttribute key="M2_SKIP_TESTS" value="true"/>
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dmaven.test.skip=true"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.uomo}"/>
-</launchConfiguration>
diff --git a/releng/Maven Install.launch b/releng/Maven Install.launch
deleted file mode 100644
index 01673ec..0000000
--- a/releng/Maven Install.launch
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
-<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-<stringAttribute key="M2_GOALS" value="install"/>
-<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-<booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value=""/>
-<listAttribute key="M2_PROPERTIES"/>
-<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
-<booleanAttribute key="M2_SKIP_TESTS" value="true"/>
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.uomo}"/>
-</launchConfiguration>