571573: Remove Bintray/JCenter
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=571573
Signed-off-by: Werner Keil <werner.keil@gmx.net>
diff --git a/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/UcumFormatService.java b/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/UcumFormatService.java
index f2b625c..600f6c5 100644
--- a/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/UcumFormatService.java
+++ b/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/UcumFormatService.java
@@ -25,7 +25,7 @@
* @author <a href="mailto:jean-marie@dautelle.com">Jean-Marie Dautelle</a>
* @author <a href="mailto:uomo@catmedia.us">Werner Keil</a>
* @see <a href="http://aurora.regenstrief.org/~ucum/ucum.html">UCUM Full Specification</a>
- * @version 1.1 ($Revision: 306 $), $Date: 2010-10-29 21:42:27 +0100 (Fr, 29 Okt 2010) $
+ * @version 2.0, $Date: 2021-03-13 $
*/
public interface UcumFormatService extends UnitFormatService {
diff --git a/examples/pom.xml b/examples/pom.xml
index 85449a6..da777b5 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>javax.measure</groupId>
<artifactId>unit-api</artifactId>
- <version>1.0</version>
+ <version>${unit-api-version}</version>
</dependency>
<dependency>
<groupId>tech.units</groupId>
diff --git a/examples/ucum/org.eclipse.uomo.examples.ucum.console/.classpath b/examples/ucum/org.eclipse.uomo.examples.ucum.console/.classpath
index d55a581..650b7b8 100644
--- a/examples/ucum/org.eclipse.uomo.examples.ucum.console/.classpath
+++ b/examples/ucum/org.eclipse.uomo.examples.ucum.console/.classpath
@@ -5,7 +5,7 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-9">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
diff --git a/examples/units/org.eclipse.uomo.examples.units.console/.classpath b/examples/units/org.eclipse.uomo.examples.units.console/.classpath
index 9055def..b0ee9f9 100644
--- a/examples/units/org.eclipse.uomo.examples.units.console/.classpath
+++ b/examples/units/org.eclipse.uomo.examples.units.console/.classpath
@@ -30,7 +30,7 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-9">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
diff --git a/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/ConverterExample.java b/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/ConverterExample.java
index 8c45b7e..82d7387 100644
--- a/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/ConverterExample.java
+++ b/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/ConverterExample.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2005, 2020, Werner Keil and others.
+ * Copyright (c) 2005, 2021, Werner Keil and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,7 +11,7 @@
package org.eclipse.uomo.examples.units.console;
import static si.uom.SI.*;
-import static tech.units.indriya.unit.MetricPrefix.KILO;
+import static javax.measure.MetricPrefix.KILO;
import static systems.uom.common.USCustomary.FOOT;
import static systems.uom.common.USCustomary.INCH;
import static systems.uom.common.USCustomary.MILE;
diff --git a/features/karaf/esh-tp/src/main/feature/feature.xml b/features/karaf/esh-tp/src/main/feature/feature.xml
index 653a60f..fdbc52d 100644
--- a/features/karaf/esh-tp/src/main/feature/feature.xml
+++ b/features/karaf/esh-tp/src/main/feature/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2014-2017 by the respective copyright holders.
+ Copyright (c) 2014-2021 by the respective copyright holders.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -18,9 +18,9 @@
</feature>
<feature name="esh-tp-measurement" version="${project.version}">
- <bundle>mvn:javax.measure/unit-api/1.0</bundle>
- <bundle>mvn:tech.units/indriya/1.3</bundle>
- <bundle>mvn:tec.uom.lib/uom-lib-common/1.0.1</bundle>
+ <bundle>mvn:javax.measure/unit-api/2.1.2</bundle>
+ <bundle>mvn:tech.units/indriya/2.1.2</bundle>
+ <bundle>mvn:tec.uom.lib/uom-lib-common/2.1</bundle>
</feature>
</features>
diff --git a/maven/Maven Clean Install.launch b/maven/Maven Clean Install.launch
index 93e5cce..48f64ee 100644
--- a/maven/Maven Clean Install.launch
+++ b/maven/Maven Clean Install.launch
@@ -17,8 +17,9 @@
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+ <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
- <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+ <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-14"/>
<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/pom.xml b/pom.xml
index ea445ca..3434aba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,11 +14,11 @@
<maven.compilerPlugin.version>2.3.2</maven.compilerPlugin.version>
<uomo-version>1.0.0-SNAPSHOT</uomo-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>
+ <unit-api-version>2.1.2</unit-api-version>
+ <uom-lib-version>2.1</uom-lib-version>
+ <indriya-version>2.1.2</indriya-version>
+ <si-version>2.1-SNAPSHOT</si-version>
+ <systems-version>2.1-SNAPSHOT</systems-version>
<icu4j-version>64.2</icu4j-version>
<junit.version>4.12</junit.version><!-- TODO update to 5 -->
<karaf.version>4.2.2</karaf.version>
