Updated target version, Tycho
Change-Id: Id5d4ffd6a121db86fd533e0b98c6e7660224f949
diff --git a/bundles/org.eclipse.uomo.business/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.business/META-INF/MANIFEST.MF
index d3e81d8..90a06af 100644
--- a/bundles/org.eclipse.uomo.business/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.business/META-INF/MANIFEST.MF
@@ -16,7 +16,5 @@
tech.units.indriya.unit,
systems.uom.quantity
Require-Bundle: org.eclipse.uomo.core;bundle-version="0.8.0",
- tech.uom.lib.uom-lib-common;bundle-version="1.1.0",
- tech.units.indriya;bundle-version="1.3.0",
com.ibm.icu;bundle-version="4.2.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF
index 49ffcbd..852026a 100644
--- a/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF
@@ -10,21 +10,20 @@
org.eclipse.uomo.ucum.model,
org.eclipse.uomo.ucum.parsers,
org.eclipse.uomo.ucum.special
-Import-Package: javax.measure;version="[1.0,2)",
- javax.measure.format;version="[1.0,2)",
- javax.measure.quantity;version="[1.0,2)",
- javax.measure.spi;version="[1.0,2)",
+Import-Package: javax.measure,
+ javax.measure.format,
+ javax.measure.quantity,
+ javax.measure.spi,
+ systems.uom.quantity,
tech.units.indriya,
tech.units.indriya.format,
tech.units.indriya.function,
tech.units.indriya.quantity,
tech.units.indriya.spi,
- tech.units.indriya.unit,
- systems.uom.quantity
-Require-Bundle: org.eclipse.uomo.core;bundle-version="0.1.0",
- org.eclipse.uomo.util;bundle-version="0.2.6",
- org.eclipse.uomo.xml;bundle-version="0.2.0",
- org.apache.commons.lang;bundle-version="2.3.0",
- tech.units.indriya;bundle-version="1.3.0"
+ tech.units.indriya.unit
+Require-Bundle: org.eclipse.uomo.core;bundle-version="0.7.0",
+ org.eclipse.uomo.util;bundle-version="0.7.0",
+ org.eclipse.uomo.xml;bundle-version="0.7.0",
+ org.apache.commons.lang;bundle-version="2.3.0"
Bundle-Vendor: Eclipse.org
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/features/karaf/esh-tp/src/main/feature/feature.xml b/features/karaf/esh-tp/src/main/feature/feature.xml
index 1791eb1..653a60f 100644
--- a/features/karaf/esh-tp/src/main/feature/feature.xml
+++ b/features/karaf/esh-tp/src/main/feature/feature.xml
@@ -19,7 +19,7 @@
<feature name="esh-tp-measurement" version="${project.version}">
<bundle>mvn:javax.measure/unit-api/1.0</bundle>
- <bundle>mvn:tech.units/indriya/1.1</bundle>
+ <bundle>mvn:tech.units/indriya/1.3</bundle>
<bundle>mvn:tec.uom.lib/uom-lib-common/1.0.1</bundle>
</feature>
diff --git a/features/karaf/esh-tp/src/main/history/dependencies.xml b/features/karaf/esh-tp/src/main/history/dependencies.xml
index c06d8b9..e78f4b1 100644
--- a/features/karaf/esh-tp/src/main/history/dependencies.xml
+++ b/features/karaf/esh-tp/src/main/history/dependencies.xml
@@ -5,7 +5,7 @@
<feature prerequisite="false" dependency="false">eventadmin</feature>
<feature prerequisite="false" dependency="false">scr</feature>
<bundle>mvn:javax.measure/unit-api/1.0</bundle>
- <bundle>mvn:tech.uom.lib/uom-lib-common/1.2</bundle>
+ <bundle>mvn:tec.uom.lib/uom-lib-common/1.0.1</bundle>
<bundle>mvn:tech.units/indriya/1.3</bundle>
</feature>
</features>
diff --git a/pom.xml b/pom.xml
index b9f4bc6..e6bf43f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,18 +21,19 @@
<project.build.javaVersion>1.8</project.build.javaVersion>
<maven.compilerPlugin.version>2.3.2</maven.compilerPlugin.version>
<uomo-version>0.8.0-SNAPSHOT</uomo-version>
- <tycho-version>1.0.0</tycho-version>
+ <tycho-version>1.6.0</tycho-version>
<unit-api-version>1.0</unit-api-version>
<uom-lib-version>1.1</uom-lib-version>
<indriya-version>1.3</indriya-version>
<si-version>1.3</si-version>
<systems-version>1.3</systems-version>
- <icu4j-version>56.1</icu4j-version>
+ <icu4j-version>58.2</icu4j-version>
<junit.version>4.12</junit.version>
<karaf.version>4.0.3</karaf.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<site.basedir>${project.basedir}</site.basedir>
+ <target.release>oxygen</target.release>
</properties>
<groupId>org.eclipse.uomo</groupId>
@@ -174,7 +175,7 @@
<groupId>org.eclipse.uomo</groupId>
<artifactId>org.eclipse.uomo.target</artifactId>
<version>0.8.0-SNAPSHOT</version>
- <classifier>neon</classifier>
+ <classifier>${target.release}</classifier>
</artifact>
</target>
<ignoreTychoRepositories>true</ignoreTychoRepositories>
diff --git a/releng/org.eclipse.uomo.target/oxygen.target b/releng/org.eclipse.uomo.target/oxygen.target
index f9730ca..b97329e 100644
--- a/releng/org.eclipse.uomo.target/oxygen.target
+++ b/releng/org.eclipse.uomo.target/oxygen.target
@@ -26,33 +26,17 @@
<repository location="http://download.eclipse.org/releases/oxygen/201702031000/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.jst.web_sdk.feature.feature.group" version="3.8.0.v201701262152"/>
- <unit id="org.eclipse.jst.server_sdk.feature.feature.group" version="3.4.300.v201606081655"/>
- <unit id="org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group" version="3.8.0.v201603091933"/>
- <unit id="org.eclipse.wst.common.fproj.sdk.feature.group" version="3.7.0.v201505072140"/>
- <unit id="org.eclipse.wst.web_sdk.feature.feature.group" version="3.9.0.v201701262152"/>
- <unit id="org.eclipse.jst.enterprise_sdk.feature.feature.group" version="3.8.0.v201701262152"/>
- <unit id="org.eclipse.wst.server_adapters.sdk.feature.feature.group" version="3.2.600.v201606081655"/>
- <repository location="http://download.eclipse.org/webtools/downloads/drops/R3.9.0/S-3.9.0M5-20170201000249/repository"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="javax.measure.unit-api" version="0.0.0"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
<unit id="ch.qos.logback.slf4j" version="1.1.2.v20160301-0943"/>
<unit id="org.slf4j.log4j" version="1.7.2.v20130115-1340"/>
- <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20170120205402/repository/"/>
+ <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20180330011457/repository/"/>
</location>
- <!--
- <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
- <unit id="javax.measure.unit-api" version="0.0.0"/>
- <unit id="javax.measure.unit-api.source" version="0.0.0"/>
- <unit id="tec.uom.lib.uom-lib-common" version="0.0.0"/>
- <unit id="tec.uom.lib.uom-lib-common.source" version="0.0.0"/>
- <unit id="tec.uom.se" version="0.0.0"/>
- <unit id="tec.uom.se.source" version="0.0.0"/>
- <unit id="systems.uom.systems-quantity" version="0.0.0"/>
- <repository location="http://unitsofmeasurement.github.io/third-party/target/repository"/>
+ <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <unit id="tech.uom.lib.uom-lib-common" version="0.0.0"/>
+ <unit id="tech.units.indriya" version="0.0.0"/>
+ <unit id="systems.uom.systems-quantity" version="0.0.0"/>
+ <repository location="https://dl.bintray.com/unitsofmeasurement/p2/systems.uom_p2_site/1.3a"/>
</location>
- -->
- <location path="${project_loc:releng}/third-party" type="Directory"/>
</locations>
</target>
\ No newline at end of file
