Updated master
Change-Id: Iac939c686c5b6a7119bc7797fc57d661b70732c2
diff --git a/bundles/org.eclipse.uomo.business.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.business.tests/META-INF/MANIFEST.MF
index 2d0195d..767b8fd 100644
--- a/bundles/org.eclipse.uomo.business.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.business.tests/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@
Bundle-ManifestVersion: 2
Bundle-Name: UOMo Business Tests
Bundle-SymbolicName: org.eclipse.uomo.business.tests
-Bundle-Version: 0.8.0.qualifier
-Bundle-Vendor: Eclipse Org
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: Eclipse Foundation
Fragment-Host: org.eclipse.uomo.business;bundle-version="0.8.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.junit;bundle-version="4.11.0"
diff --git a/bundles/org.eclipse.uomo.business/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.business/META-INF/MANIFEST.MF
index 90a06af..c45bfa1 100644
--- a/bundles/org.eclipse.uomo.business/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.business/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: UOMo Business
Bundle-SymbolicName: org.eclipse.uomo.business
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Eclipse.org
Import-Package: javax.measure;version="[1.0,2)",
javax.measure.format;version="[1.0,2)",
diff --git a/bundles/org.eclipse.uomo.core.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.core.tests/META-INF/MANIFEST.MF
index cb2abb7..52f25cc 100644
--- a/bundles/org.eclipse.uomo.core.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: UOMO Core Tests
Bundle-SymbolicName: org.eclipse.uomo.core.tests
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Eclipse org
Fragment-Host: org.eclipse.uomo.core;bundle-version="0.8.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.uomo.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.core/META-INF/MANIFEST.MF
index 710e0c7..b495a36 100644
--- a/bundles/org.eclipse.uomo.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.core/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@
Require-Bundle: org.eclipse.osgi;bundle-version="3.6.0";visibility:=reexport,
org.eclipse.osgi.services;bundle-version="3.2.100";visibility:=reexport
Bundle-Vendor: Eclipse.org
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bnd-LastModified: 1288905964975
Bundle-Activator: org.eclipse.uomo.core.internal.Activator
Bundle-ManifestVersion: 2
diff --git a/bundles/org.eclipse.uomo.icu/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.icu/META-INF/MANIFEST.MF
index 7358c7e..597c39b 100644
--- a/bundles/org.eclipse.uomo.icu/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.icu/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: UOMo Units ICU
Bundle-SymbolicName: org.eclipse.uomo.icu
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Export-Package: org.eclipse.uomo.icu,
org.eclipse.uomo.icu.impl
Require-Bundle: com.ibm.icu;visibility:=reexport,
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 8bfed72..d2628e3 100644
--- a/bundles/org.eclipse.uomo.ucum.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.ucum.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: UCUM Tests
Bundle-SymbolicName: org.eclipse.uomo.ucum.tests
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Eclipse.org
Fragment-Host: org.eclipse.uomo.ucum;bundle-version="0.8.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 852026a..39dbaa7 100644
--- a/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: UOMo UCUM
Bundle-SymbolicName: org.eclipse.uomo.ucum
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Export-Package: org.eclipse.uomo.ucum,
org.eclipse.uomo.ucum.canonical,
org.eclipse.uomo.ucum.expression,
diff --git a/bundles/org.eclipse.uomo.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.ui/META-INF/MANIFEST.MF
index 6e9b54a..c7592e3 100644
--- a/bundles/org.eclipse.uomo.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Eclipse UOMo
Bundle-SymbolicName: org.eclipse.uomo.ui
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Eclipse UOMo
Bundle-RequiredExecutionEnvironment: JavaSE-1.8,
JavaSE-1.7
diff --git a/bundles/org.eclipse.uomo.util.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.util.tests/META-INF/MANIFEST.MF
index 008e7cb..8bab910 100644
--- a/bundles/org.eclipse.uomo.util.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.util.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: UoMO Units Tests
Bundle-SymbolicName: org.eclipse.uomo.util.tests
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Eclipse org
Fragment-Host: org.eclipse.uomo.util;bundle-version="0.8.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.uomo.util/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.util/META-INF/MANIFEST.MF
index b97cf0e..535d1cd 100644
--- a/bundles/org.eclipse.uomo.util/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.util/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: UOMo Utilities
Bundle-SymbolicName: org.eclipse.uomo.util;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.uomo.util.internal.UtilitiesPlugin
Bundle-Vendor: Eclipse.org
Export-Package: org.eclipse.uomo.util,
diff --git a/bundles/org.eclipse.uomo.xml.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.xml.tests/META-INF/MANIFEST.MF
index 845bbba..95cfbd5 100644
--- a/bundles/org.eclipse.uomo.xml.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.xml.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: UOMo XML Tests
Bundle-SymbolicName: org.eclipse.uomo.xml.tests
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Eclipse.org
Fragment-Host: org.eclipse.uomo.util;bundle-version="0.8.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.uomo.xml/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.xml/META-INF/MANIFEST.MF
index ff70d70..abcf62a 100644
--- a/bundles/org.eclipse.uomo.xml/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.xml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: UOMo XML
Bundle-SymbolicName: org.eclipse.uomo.xml
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.eclipse.uomo.core;bundle-version="0.8.0",
org.apache.commons.lang;bundle-version="2.6.0",
org.apache.xerces,
diff --git a/examples/business/pom.xml b/examples/business/pom.xml
index 4034e27..af9b3f8 100644
--- a/examples/business/pom.xml
+++ b/examples/business/pom.xml
@@ -21,13 +21,13 @@
<repository>
<id>maven-geotoolkit.org</id>
<name>GeoToolkit Repository for Maven</name>
- <url>http://maven.geotoolkit.org/</url>
+ <url>https://maven.geotoolkit.org/</url>
</repository>
<repository>
<id>OpenL10n</id>
<name>Openl10.net</name>
- <url>http://nexus.openl10n.net/content/groups/public/</url>
+ <url>https://nexus.openl10n.net/content/groups/public/</url>
</repository>
</repositories>
diff --git a/examples/units/pom.xml b/examples/units/pom.xml
index 37435e6..87ac312 100644
--- a/examples/units/pom.xml
+++ b/examples/units/pom.xml
@@ -22,13 +22,13 @@
<repository>
<id>maven-geotoolkit.org</id>
<name>GeoToolkit Repository for Maven</name>
- <url>http://maven.geotoolkit.org/</url>
+ <url>https://maven.geotoolkit.org/</url>
</repository>
<repository>
<id>OpenL10n</id>
<name>Openl10.net</name>
- <url>http://nexus.openl10n.net/content/groups/public/</url>
+ <url>https://nexus.openl10n.net/content/groups/public/</url>
</repository>
</repositories>
diff --git a/features/org.eclipse.uomo.feature/feature.xml b/features/org.eclipse.uomo.feature/feature.xml
index e9afbf9..0dc0e1d 100644
--- a/features/org.eclipse.uomo.feature/feature.xml
+++ b/features/org.eclipse.uomo.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.uomo.feature"
label="Eclipse UOMo"
- version="0.8.0.qualifier"
+ version="1.0.0.qualifier"
provider-name="Eclipse.org"
plugin="org.eclipse.uomo.ui">
diff --git a/maven/Maven Clean Package.launch b/maven/Maven Clean Package.launch
index 201b1e8..8a2fef8 100644
--- a/maven/Maven Clean Package.launch
+++ b/maven/Maven Clean Package.launch
@@ -1,21 +1,22 @@
<?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"/>
-<intAttribute key="M2_THREADS" value="1"/>
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-<stringAttribute key="M2_USER_SETTINGS" value=""/>
-<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.8"/>
-<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}"/>
+ <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"/>
+ <intAttribute key="M2_THREADS" value="1"/>
+ <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+ <stringAttribute key="M2_USER_SETTINGS" value=""/>
+ <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+ <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+ <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+ </listAttribute>
+ <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-1.8"/>
+ <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 2214a88..7327a51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,17 +20,20 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.javaVersion>1.8</project.build.javaVersion>
<maven.compilerPlugin.version>2.3.2</maven.compilerPlugin.version>
- <uomo-version>1.0.0-SNAPSHOT</uomo-version>
- <tycho-version>1.0.0</tycho-version>
+ <uomo-version>0.8.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>
- <icu4j-version>56.1</icu4j-version>
+ <si-version>1.3</si-version>
+ <systems-version>1.3</systems-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>
@@ -64,18 +67,27 @@
</roles>
</developer>
<developer>
- <name>Chris Senior</name>
- <id>csenior</id>
- <email>christopher.senior@gmail.com</email>
- <organization>Private Individual</organization>
+ <id>otaviojava</id>
+ <name>Otávio Gonçalves de Santana</name>
+ <email>otaviopolianasantana@gmail.com</email>
+ <organization>Individual / SouJava</organization>
+ <timezone>-5</timezone>
<roles>
- <role>Architect</role>
<role>Java Developer</role>
</roles>
</developer>
</developers>
<contributors>
<contributor>
+ <name>Chris Senior</name>
+ <!-- >csenior</id -->
+ <email>christopher.senior@gmail.com</email>
+ <organization>Private Individual</organization>
+ <roles>
+ <role>Committer emeritus</role>
+ </roles>
+ </contributor>
+ <contributor>
<name>Grahame Grieve</name>
<!-- id>grahameg</id -->
<email>grahame@healthintersections.com.au</email>
@@ -198,6 +210,105 @@
<version>${tycho-version}</version> <configuration> <archive> <addMavenDescriptor>false</addMavenDescriptor>
</archive> </configuration> </plugin> -->
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-clean-plugin
+ </artifactId>
+ <versionRange>
+ [2.5,)
+ </versionRange>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.eclipse.tycho
+ </groupId>
+ <artifactId>
+ tycho-compiler-plugin
+ </artifactId>
+ <versionRange>
+ [1.0.0,)
+ </versionRange>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.eclipse.tycho
+ </groupId>
+ <artifactId>
+ tycho-packaging-plugin
+ </artifactId>
+ <versionRange>
+ [1.0.0,)
+ </versionRange>
+ <goals>
+ <goal>build-qualifier</goal>
+ <goal>validate-id</goal>
+ <goal>
+ validate-version
+ </goal>
+ <goal>
+ build-qualifier-aggregator
+ </goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-enforcer-plugin
+ </artifactId>
+ <versionRange>
+ [1.2,)
+ </versionRange>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<!-- Additional repositories -->
@@ -205,7 +316,7 @@
<repository>
<id>jcenter</id>
<name>JCenter</name>
- <url>http://jcenter.bintray.com</url>
+ <url>https://jcenter.bintray.com</url>
</repository>
<repository>
<snapshots>
@@ -213,7 +324,7 @@
</snapshots>
<id>bintray-release</id>
<name>libs-release</name>
- <url>http://oss.jfrog.org/artifactory/libs-release</url>
+ <url>https://oss.jfrog.org/artifactory/libs-release</url>
</repository>
<repository>
<snapshots>
@@ -221,12 +332,12 @@
</snapshots>
<id>bintray-snapshot</id>
<name>libs-snapshot</name>
- <url>http://oss.jfrog.org/artifactory/libs-snapshot</url>
+ <url>https://oss.jfrog.org/artifactory/libs-snapshot</url>
</repository>
<repository>
<id>bintray-uom</id>
<name>Bintray Units of Measurement</name>
- <url>http://dl.bintray.com/unitsofmeasurement/maven</url>
+ <url>https://dl.bintray.com/unitsofmeasurement/maven</url>
</repository>
</repositories>
@@ -237,18 +348,18 @@
</pluginRepository>
<pluginRepository>
<id>buchen-maven-repo</id>
- <url>http://buchen.github.io/maven-repo</url>
+ <url>https://buchen.github.io/maven-repo</url>
<layout>default</layout>
</pluginRepository>
<pluginRepository>
<id>jcenter</id>
<name>JCenter</name>
- <url>http://jcenter.bintray.com</url>
+ <url>https://jcenter.bintray.com</url>
</pluginRepository>
</pluginRepositories>
<ciManagement>
- <system>Hudson</system>
- <url>https://hudson.eclipse.org/uomo/</url>
+ <system>Jenkins</system>
+ <url>https://ci.eclipse.org/uomo/</url>
</ciManagement>
</project>
\ No newline at end of file
diff --git a/releng/eclipse-repository/category.xml b/releng/eclipse-repository/category.xml
index df7814b..bad7b56 100644
--- a/releng/eclipse-repository/category.xml
+++ b/releng/eclipse-repository/category.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.eclipse.uomo.feature_0.8.0.qualifier.jar" id="org.eclipse.uomo.feature" version="0.8.0.qualifier">
+ <feature url="features/org.eclipse.uomo.feature_0.8.0.qualifier.jar" id="org.eclipse.uomo.feature" version="1.0.0.qualifier">
<category name="uomo-category"/>
</feature>
<category-def name="uomo-category" label="Units of Measurement (UOMo)">
