Updated JSR impl
Change-Id: Ic18c8b7f3f603de7eb69d667d37ddf6169dc4a7d
diff --git a/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF
index 9af0128..f635afb 100644
--- a/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF
@@ -14,12 +14,12 @@
javax.measure.format;version="[1.0,2)",
javax.measure.quantity;version="[1.0,2)",
javax.measure.spi;version="[1.0,2)",
- tec.uom.se,
- tec.uom.se.format,
- tec.uom.se.function,
- tec.uom.se.quantity,
- tec.uom.se.spi,
- tec.uom.se.unit,
+ 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",
diff --git a/bundles/org.eclipse.uomo.ucum/pom.xml b/bundles/org.eclipse.uomo.ucum/pom.xml
index 94ae924..6a0ad6b 100644
--- a/bundles/org.eclipse.uomo.ucum/pom.xml
+++ b/bundles/org.eclipse.uomo.ucum/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>org.eclipse.uomo.bundles</artifactId>
@@ -14,18 +15,24 @@
<groupId>javax.measure</groupId>
<artifactId>unit-api</artifactId>
</dependency>
- <dependency>
- <groupId>tech.units</groupId>
- <artifactId>indriya</artifactId>
- <version>${indriya-version}</version>
- </dependency>
- <dependency>
- <groupId>tech.uom.lib</groupId>
- <artifactId>uom-lib-common</artifactId>
- <version>${uom-lib-version}</version>
- </dependency>
+ <dependency>
+ <groupId>tech.units</groupId>
+ <artifactId>indriya</artifactId>
+ <version>${indriya-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>tech.uom.lib</groupId>
+ <artifactId>uom-lib-common</artifactId>
+ <version>${uom-lib-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>systems.uom</groupId>
+ <artifactId>systems-quantity</artifactId>
+ <version>1.0</version>
+ </dependency>
+
</dependencies>
-
+
<!-- Additional repositories -->
<repositories>
<repository>
diff --git a/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/impl/UcumConverter.java b/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/impl/UcumConverter.java
index a8fe931..af6f781 100644
--- a/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/impl/UcumConverter.java
+++ b/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/impl/UcumConverter.java
@@ -36,7 +36,7 @@
import org.eclipse.uomo.ucum.special.SpecialUnitHandler;
import org.eclipse.uomo.util.Registry;
-import tec.uom.se.AbstractConverter;
+import tech.units.indriya.AbstractConverter;
/**
* = [mu_0] = 4.[pi].10*-7.N/A2 = (g.m/s2)/(C/s)2? = g.m/s2/(C2/s2) =
diff --git a/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/model/BaseUnit.java b/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/model/BaseUnit.java
index 6ee00ec..fb69f9a 100644
--- a/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/model/BaseUnit.java
+++ b/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/model/BaseUnit.java
@@ -20,7 +20,7 @@
import javax.measure.Unit;
import javax.measure.UnitConverter;
-import tec.uom.se.quantity.QuantityDimension;
+import tech.units.indriya.quantity.QuantityDimension;
/**
diff --git a/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/model/DefinedUnit.java b/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/model/DefinedUnit.java
index aab936a..94e1dbe 100644
--- a/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/model/DefinedUnit.java
+++ b/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/model/DefinedUnit.java
@@ -20,7 +20,7 @@
import javax.measure.Unit;
import javax.measure.UnitConverter;
-import tec.uom.se.quantity.QuantityDimension;
+import tech.units.indriya.quantity.QuantityDimension;
/**
* @author Werner Keil
diff --git a/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/special/CelsiusHandler.java b/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/special/CelsiusHandler.java
index a301c63..aec3341 100644
--- a/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/special/CelsiusHandler.java
+++ b/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/special/CelsiusHandler.java
@@ -18,7 +18,7 @@
import javax.measure.Unit;
import javax.measure.quantity.Temperature;
-import static tec.uom.se.unit.Units.KELVIN;
+import static tech.units.indriya.unit.Units.KELVIN;
public class CelsiusHandler extends SpecialUnitHandler<Temperature> {
diff --git a/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/special/FahrenheitHandler.java b/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/special/FahrenheitHandler.java
index 1354d4c..96ed1a0 100644
--- a/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/special/FahrenheitHandler.java
+++ b/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/special/FahrenheitHandler.java
@@ -13,7 +13,7 @@
package org.eclipse.uomo.ucum.special;
-import static tec.uom.se.unit.Units.KELVIN;
+import static tech.units.indriya.unit.Units.KELVIN;
import java.math.BigDecimal;
import java.math.MathContext;
diff --git a/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/special/HoldingHandler.java b/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/special/HoldingHandler.java
index 1f6bd63..b320378 100644
--- a/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/special/HoldingHandler.java
+++ b/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/special/HoldingHandler.java
@@ -16,7 +16,7 @@
import javax.measure.Quantity;
import javax.measure.Unit;
-import tec.uom.se.AbstractUnit;
+import tech.units.indriya.AbstractUnit;
/**
