95: Migrate java10 demos to java12 demos, java12 to java13

Task-Url: #95
unitsofmeasurement · Sep 28, 2020 · 1b96b73 · 1b96b73
1 parent 8c87a37
commit 1b96b73
Show file tree

Hide file tree

Showing 44 changed files with 79 additions and 45 deletions.
diff --git a/console/basic/pom.xml b/console/basic/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>tech.uom.demo.console</groupId>
 		<artifactId>uom-console-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	<name>Basic UoM Console Demos</name>
 	<artifactId>uom-console-demos-basic</artifactId>

diff --git a/console/basic/src/main/java/tech/uom/demo/basic/format/EBNFDemo.java b/console/basic/src/main/java/tech/uom/demo/basic/format/EBNFDemo.java
@@ -0,0 +1,34 @@
+package tech.uom.demo.basic.format;
+
+import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+import tech.units.indriya.format.EBNFUnitFormat;
+import tech.units.indriya.format.SymbolMap;
+import tech.units.indriya.unit.Units;
+
+/**
+ * Simple code to demonstrate use of aliases with the EBNFUnitFormat
+ */
+public class EBNFDemo {
+
+    private static final String BUNDLE_NAME = "tech.units.indriya.format.messages"; //$NON-NLS-1$
+
+    /**
+     * @param args the command line arguments
+     */
+    public static void main(String[] args) throws UnsupportedEncodingException {
+        // TODO code application logic here
+        SymbolMap map = SymbolMap.of(ResourceBundle.getBundle(BUNDLE_NAME, Locale.ROOT));
+        map.alias(Units.COULOMB.multiply(1.60217662e-19), "e");
+
+        EBNFUnitFormat unitParser = EBNFUnitFormat.getInstance(map);
+
+        PrintStream utfOut = new PrintStream(System.out, true, "UTF-8");
+        utfOut.println("Dimension of e: " + unitParser.parse("e").getDimension());
+
+    }
+
+}
diff --git a/console/conference/pom.xml b/console/conference/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>tech.uom.demo.console</groupId>
 		<artifactId>uom-console-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 
 	<name>Conference Demo</name>

diff --git a/console/java12/pom.xml b/console/java12/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>tech.uom.demo.console</groupId>
 		<artifactId>uom-console-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	<name>Basic UoM Console Demos for Java 12</name>
 	<artifactId>uom-console-demos-java12</artifactId>

diff --git a/console/java13/pom.xml b/console/java13/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>tech.uom.demo.console</groupId>
 		<artifactId>uom-console-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	<name>Basic UoM Console Demos for Java 13</name>
 	<description>Java 13 Units of Measurement Console Demos</description>

diff --git a/console/java14/pom.xml b/console/java14/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>tech.uom.demo.console</groupId>
 		<artifactId>uom-console-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	<name>Basic UoM Console Demos for Java 14</name>
 	<artifactId>uom-console-demos-java14</artifactId>

diff --git a/console/pom.xml b/console/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>tech.uom.demo</groupId>
 		<artifactId>uom-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 
 	<build>

diff --git a/console/systems/common-java12/pom.xml b/console/systems/common-java12/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>tech.uom.demo.console.systems</groupId>
 		<artifactId>uom-console-system-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	<artifactId>uom-console-demos-common-java12</artifactId>
 

diff --git a/console/systems/common-java14/pom.xml b/console/systems/common-java14/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>tech.uom.demo.console.systems</groupId>
 		<artifactId>uom-console-system-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	<artifactId>uom-console-demos-common-java14</artifactId>
 	<name>UoM Common Console Demos for Java 14</name>

diff --git a/console/systems/common/pom.xml b/console/systems/common/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>tech.uom.demo.console.systems</groupId>
 		<artifactId>uom-console-system-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	<name>UoM Common Console Demos</name>
 	<artifactId>uom-console-demos-common</artifactId>

diff --git a/console/systems/historical/pom.xml b/console/systems/historical/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>tech.uom.demo.console.systems</groupId>
     <artifactId>uom-console-system-demos</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.0.2</version>
   </parent>
   <artifactId>historical</artifactId>
   <name>Historical Unit Systems</name>

diff --git a/console/systems/jscience/pom.xml b/console/systems/jscience/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>tech.uom.demo.console.systems</groupId>
 		<artifactId>uom-console-system-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	<artifactId>jscience</artifactId>
 	<name>JScience 4 Console Demos</name>

diff --git a/console/systems/pom.xml b/console/systems/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>tech.uom.demo.console</groupId>
 		<artifactId>uom-console-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	<groupId>tech.uom.demo.console.systems</groupId>
 	<artifactId>uom-console-system-demos</artifactId>

diff --git a/console/systems/si-java12/pom.xml b/console/systems/si-java12/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>tech.uom.demo.console.systems</groupId>
 		<artifactId>uom-console-system-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	<artifactId>uom-si-console-demos-java12</artifactId>
 

diff --git a/console/systems/si/pom.xml b/console/systems/si/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>tech.uom.demo.console.systems</groupId>
 		<artifactId>uom-console-system-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	<artifactId>uom-si-console-demos</artifactId>
 

diff --git a/console/systems/ucum-java12/pom.xml b/console/systems/ucum-java12/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>tech.uom.demo.console.systems</groupId>
 		<artifactId>uom-console-system-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	<artifactId>uom-console-demos-ucum-java12</artifactId>
 

diff --git a/console/systems/ucum/pom.xml b/console/systems/ucum/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>tech.uom.demo.console.systems</groupId>
 		<artifactId>uom-console-system-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	<artifactId>uom-console-demos-ucum</artifactId>
 	<properties>

diff --git a/console/systems/unicode-java12/pom.xml b/console/systems/unicode-java12/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>tech.uom.demo.console.systems</groupId>
     <artifactId>uom-console-system-demos</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.0.2</version>
   </parent>
   <artifactId>uom-console-demos-unicode-java12</artifactId>
   <properties>

diff --git a/console/systems/unicode/pom.xml b/console/systems/unicode/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>tech.uom.demo.console.systems</groupId>
     <artifactId>uom-console-system-demos</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.0.2</version>
   </parent>
   <artifactId>uom-console-demos-unicode</artifactId>
   <name>Unicode Console Demos</name>

diff --git a/console/valhalla/pom.xml b/console/valhalla/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>uom-console-demos</artifactId>
 		<groupId>tech.uom.demo.console</groupId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>valhalla</artifactId>

diff --git a/desktop/javafx/fxlib/pom.xml b/desktop/javafx/fxlib/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>tech.uom.demo.desktop</groupId>
 		<artifactId>uom-javafx-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	<artifactId>uom-fxlib</artifactId>
 	<name>Units of Measurement FXlib</name>

diff --git a/desktop/javafx/pom.xml b/desktop/javafx/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>tech.uom.demo.desktop</groupId>
 		<artifactId>uom-desktop-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	<description>Demos of the Units of Measurement API using JavaFX</description>
 

diff --git a/desktop/pom.xml b/desktop/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>tech.uom.demo</groupId>
     <artifactId>uom-demos</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.0.2</version>
   </parent>
   <groupId>tech.uom.demo.desktop</groupId>
   <artifactId>uom-desktop-demos</artifactId>

diff --git a/device/edison/hello/pom.xml b/device/edison/hello/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>tech.uom.demo.device.edison</groupId>
 		<artifactId>uom-edison-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	<artifactId>uom-edison-hello</artifactId>
 	<name>Hello Edison Demo</name>

diff --git a/device/edison/pom.xml b/device/edison/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>tech.uom.demo.device</groupId>
 		<artifactId>uom-device-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	<groupId>tech.uom.demo.device.edison</groupId>
 	<artifactId>uom-edison-demos</artifactId>

diff --git a/device/edison/tutorial/pom.xml b/device/edison/tutorial/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>tech.uom.demo.device.edison</groupId>
 		<artifactId>uom-edison-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	<artifactId>uom-edison-tutorial</artifactId>
 	<packaging>pom</packaging>

diff --git a/device/edison/tutorial/src/main/asciidoc/03-ExampleCode.asciidoc b/device/edison/tutorial/src/main/asciidoc/03-ExampleCode.asciidoc
@@ -1,7 +1,7 @@
 === Example Code
 Now you are ready to run a first "Hello World" project.
 
-. We called it +HelloEdison+ in the package +tec.uom.demo.edison.hello+
+. We called it +HelloEdison+ in the package +tech.uom.demo.edison.hello+
 . The following code: 
 +
 [source,java]

diff --git a/device/pom.xml b/device/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>tech.uom.demo</groupId>
     <artifactId>uom-demos</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.0.2</version>
   </parent>
   <artifactId>uom-device-demos</artifactId>
   <packaging>pom</packaging>

diff --git a/domain/energy/pom.xml b/domain/energy/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>tech.uom.demo.domain</groupId>
 		<artifactId>uom-domain-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	<artifactId>uom-energy-demos</artifactId>
     <name>Units of Measurement Energy Demos</name>

diff --git a/domain/health/pom.xml b/domain/health/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>tech.uom.demo.domain</groupId>
 		<artifactId>uom-domain-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	<artifactId>uom-health-demos-se</artifactId>
     <name>Units of Measurement Health Demos for Java SE</name>

diff --git a/domain/pom.xml b/domain/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>tech.uom.demo</groupId>
 		<artifactId>uom-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	   <description>Domain Specific Demos of the Units of Measurement API</description>
     <groupId>tech.uom.demo.domain</groupId>

diff --git a/domain/retail/pom.xml b/domain/retail/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>tech.uom.demo.domain</groupId>
 		<artifactId>uom-domain-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	<artifactId>retail</artifactId>
 	<name>Retail Demos for Java SE</name>

diff --git a/lang/pom.xml b/lang/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>tech.uom.demo</groupId>
 		<artifactId>uom-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 
 	<build>

diff --git a/lang/repl/pom.xml b/lang/repl/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>uom-language-demos</artifactId>
 		<groupId>tech.uom.demo.lang</groupId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>repl</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -11,8 +11,7 @@
 	<artifactId>uom-demos</artifactId>
 	<packaging>pom</packaging>
 	<name>Units of Measurement Demos</name>
-	<version>2.0.2-SNAPSHOT</version>
-	<url>http://github.com/unitsofmeasurement/uom-demos</url>
+	<url>https://unitsofmeasurement.github.io/uom-demos/</url>
 	<organization>
 		<name>Units of Measurement project</name>
 		<url>http://unitsofmeasurement.github.io</url>
@@ -36,7 +35,7 @@
 		<jsr.version>2.0</jsr.version>
 		<ri.version>2.0.4</ri.version>
 		<lib.version>2.0.1</lib.version>
-		<si.version>2.0.2-SNAPSHOT</si.version>
+		<si.version>2.0.1</si.version>
 		<systems.version>2.0.2</systems.version>
 	</properties>
 

diff --git a/src/etc/BMIDemoSE.launch b/src/etc/BMIDemoSE.launch
@@ -7,7 +7,7 @@
 <listEntry value="1"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="tec.uom.demo.health.se.BMIDemoSE"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="tech.uom.demo.health.se.BMIDemoSE"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="${string_prompt:height} ${string_prompt:weight}"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="uom-health-demos-se"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>

diff --git a/src/etc/HeatingDemo (SE).launch b/src/etc/HeatingDemo (SE).launch
@@ -9,6 +9,6 @@
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="tec.uom.demo.energy.se.HeatingDemo"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="tech.uom.demo.energy.se.HeatingDemo"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="energy-se"/>
 </launchConfiguration>
diff --git a/src/etc/SmartHomeDemo.launch b/src/etc/SmartHomeDemo.launch
@@ -6,6 +6,6 @@
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="tec.uom.demo.energy.SmartHomeDemo"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="tech.uom.demo.energy.SmartHomeDemo"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="energy"/>
 </launchConfiguration>
diff --git a/src/etc/uom-demos clean install.launch b/src/etc/uom-demos clean install.launch
@@ -15,6 +15,7 @@
     <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
         <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
     </listAttribute>
+    <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-14"/>
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/uom-demos}"/>

diff --git a/web/pom.xml b/web/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>tech.uom.demo</groupId>
 		<artifactId>uom-demos</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.0.2</version>
 	</parent>
     <description>Web-based Demos for Units of Measurement</description>
     <modules>