Merged from 0.8
Change-Id: I02cf4990118631fcb34846b6f84a1ccd6798021d
diff --git a/bundles/org.eclipse.uomo.business.tests/pom.xml b/bundles/org.eclipse.uomo.business.tests/pom.xml
index 4b1f9f6..9863375 100644
--- a/bundles/org.eclipse.uomo.business.tests/pom.xml
+++ b/bundles/org.eclipse.uomo.business.tests/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>org.eclipse.uomo.bundles</artifactId>
<groupId>org.eclipse.uomo</groupId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.uomo.business.tests</artifactId>
diff --git a/bundles/org.eclipse.uomo.business/pom.xml b/bundles/org.eclipse.uomo.business/pom.xml
index 27dd71c..8775675 100644
--- a/bundles/org.eclipse.uomo.business/pom.xml
+++ b/bundles/org.eclipse.uomo.business/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>org.eclipse.uomo.bundles</artifactId>
<groupId>org.eclipse.uomo</groupId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.uomo.business</artifactId>
diff --git a/bundles/org.eclipse.uomo.core.tests/pom.xml b/bundles/org.eclipse.uomo.core.tests/pom.xml
index c85d6a1..b6db507 100644
--- a/bundles/org.eclipse.uomo.core.tests/pom.xml
+++ b/bundles/org.eclipse.uomo.core.tests/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>org.eclipse.uomo.bundles</artifactId>
<groupId>org.eclipse.uomo</groupId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.uomo.core.tests</artifactId>
<name>UOMo Core Tests</name>
diff --git a/bundles/org.eclipse.uomo.core/pom.xml b/bundles/org.eclipse.uomo.core/pom.xml
index 12c5cd8..0f59921 100644
--- a/bundles/org.eclipse.uomo.core/pom.xml
+++ b/bundles/org.eclipse.uomo.core/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>org.eclipse.uomo.bundles</artifactId>
<groupId>org.eclipse.uomo</groupId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.uomo.core</artifactId>
<name>UOMo Core</name>
diff --git a/bundles/org.eclipse.uomo.icu/pom.xml b/bundles/org.eclipse.uomo.icu/pom.xml
index b5c5453..7fbcd59 100644
--- a/bundles/org.eclipse.uomo.icu/pom.xml
+++ b/bundles/org.eclipse.uomo.icu/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>org.eclipse.uomo.bundles</artifactId>
<groupId>org.eclipse.uomo</groupId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.uomo.icu</artifactId>
diff --git a/bundles/org.eclipse.uomo.ucum.tests/pom.xml b/bundles/org.eclipse.uomo.ucum.tests/pom.xml
index ba7746f..561cd9a 100644
--- a/bundles/org.eclipse.uomo.ucum.tests/pom.xml
+++ b/bundles/org.eclipse.uomo.ucum.tests/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>org.eclipse.uomo.bundles</artifactId>
<groupId>org.eclipse.uomo</groupId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.uomo.ucum.tests</artifactId>
diff --git a/bundles/org.eclipse.uomo.ucum/pom.xml b/bundles/org.eclipse.uomo.ucum/pom.xml
index a4e4cc7..cb61df3 100644
--- a/bundles/org.eclipse.uomo.ucum/pom.xml
+++ b/bundles/org.eclipse.uomo.ucum/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>org.eclipse.uomo.bundles</artifactId>
<groupId>org.eclipse.uomo</groupId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.uomo.ucum</artifactId>
diff --git a/bundles/org.eclipse.uomo.ui/pom.xml b/bundles/org.eclipse.uomo.ui/pom.xml
index 71b4f49..e38c509 100644
--- a/bundles/org.eclipse.uomo.ui/pom.xml
+++ b/bundles/org.eclipse.uomo.ui/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>org.eclipse.uomo.bundles</artifactId>
<groupId>org.eclipse.uomo</groupId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.uomo.ui</artifactId>
<packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.uomo.units.tests/pom.xml b/bundles/org.eclipse.uomo.units.tests/pom.xml
new file mode 100644
index 0000000..5e7ac63
--- /dev/null
+++ b/bundles/org.eclipse.uomo.units.tests/pom.xml
@@ -0,0 +1,11 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.eclipse.uomo.bundles</artifactId>
+ <groupId>org.eclipse.uomo</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.uomo.units.tests</artifactId>
+ <name>UOMo Units of Measurement Tests</name>
+ <packaging>eclipse-test-plugin</packaging>
+</project>
\ No newline at end of file
diff --git a/bundles/org.eclipse.uomo.units/pom.xml b/bundles/org.eclipse.uomo.units/pom.xml
new file mode 100644
index 0000000..7ae979b
--- /dev/null
+++ b/bundles/org.eclipse.uomo.units/pom.xml
@@ -0,0 +1,28 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.eclipse.uomo.bundles</artifactId>
+ <groupId>org.eclipse.uomo</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.uomo.units</artifactId>
+ <name>UOMo Units of Measurement</name>
+ <packaging>eclipse-plugin</packaging>
+
+ <properties>
+ <site.basedir>${project.parent.basedir}</site.basedir>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.measure</groupId>
+ <artifactId>unit-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <version>${icu4j-version}</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/bundles/org.eclipse.uomo.util.tests/pom.xml b/bundles/org.eclipse.uomo.util.tests/pom.xml
index 3dd89e8..341eb5c 100644
--- a/bundles/org.eclipse.uomo.util.tests/pom.xml
+++ b/bundles/org.eclipse.uomo.util.tests/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>org.eclipse.uomo.bundles</artifactId>
<groupId>org.eclipse.uomo</groupId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.uomo.util.tests</artifactId>
<name>UOMo Util Tests</name>
diff --git a/bundles/org.eclipse.uomo.util/pom.xml b/bundles/org.eclipse.uomo.util/pom.xml
index 5d3d7a7..0d600f9 100644
--- a/bundles/org.eclipse.uomo.util/pom.xml
+++ b/bundles/org.eclipse.uomo.util/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>org.eclipse.uomo.bundles</artifactId>
<groupId>org.eclipse.uomo</groupId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.uomo.util</artifactId>
<name>UOMo Utilities</name>
diff --git a/bundles/org.eclipse.uomo.xml.tests/pom.xml b/bundles/org.eclipse.uomo.xml.tests/pom.xml
index 35d203d..0c7e8e2 100644
--- a/bundles/org.eclipse.uomo.xml.tests/pom.xml
+++ b/bundles/org.eclipse.uomo.xml.tests/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>org.eclipse.uomo.bundles</artifactId>
<groupId>org.eclipse.uomo</groupId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.uomo.xml.tests</artifactId>
<name>UOMo XML Tests</name>
diff --git a/bundles/org.eclipse.uomo.xml/pom.xml b/bundles/org.eclipse.uomo.xml/pom.xml
index 23abbae..bea55fd 100644
--- a/bundles/org.eclipse.uomo.xml/pom.xml
+++ b/bundles/org.eclipse.uomo.xml/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>org.eclipse.uomo.bundles</artifactId>
<groupId>org.eclipse.uomo</groupId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 345d303..edf442f 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.uomo</artifactId>
<groupId>org.eclipse.uomo</groupId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.uomo.bundles</artifactId>
<name>Eclipse UOMo Bundles</name>
diff --git a/examples/business/org.eclipse.uomo.examples.business.console/pom.xml b/examples/business/org.eclipse.uomo.examples.business.console/pom.xml
index f9d6fb7..0cdde7c 100644
--- a/examples/business/org.eclipse.uomo.examples.business.console/pom.xml
+++ b/examples/business/org.eclipse.uomo.examples.business.console/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.uomo.examples.business</groupId>
<artifactId>org.eclipse.uomo.examples.business</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.uomo.examples.business.console</artifactId>
<name>UOMo Business Console Examples</name>
diff --git a/examples/business/pom.xml b/examples/business/pom.xml
index fad4115..4034e27 100644
--- a/examples/business/pom.xml
+++ b/examples/business/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>org.eclipse.uomo.examples</artifactId>
<groupId>org.eclipse.uomo</groupId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.uomo.examples.business</artifactId>
<packaging>pom</packaging>
diff --git a/examples/pom.xml b/examples/pom.xml
index 3432a20..1b4e4ee 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>org.eclipse.uomo</artifactId>
<groupId>org.eclipse.uomo</groupId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.uomo.examples</artifactId>
diff --git a/examples/ucum/org.eclipse.uomo.examples.ucum.console/pom.xml b/examples/ucum/org.eclipse.uomo.examples.ucum.console/pom.xml
index 0e62713..efaecf6 100644
--- a/examples/ucum/org.eclipse.uomo.examples.ucum.console/pom.xml
+++ b/examples/ucum/org.eclipse.uomo.examples.ucum.console/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.uomo.examples.ucum</groupId>
<artifactId>org.eclipse.uomo.examples.ucum</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.uomo.examples.ucum.console</artifactId>
<name>UOMo UCUM Console Examples</name>
diff --git a/examples/ucum/pom.xml b/examples/ucum/pom.xml
index ec8504e..650f55b 100644
--- a/examples/ucum/pom.xml
+++ b/examples/ucum/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.uomo</groupId>
<artifactId>org.eclipse.uomo.examples</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.uomo.examples.ucum</groupId>
<artifactId>org.eclipse.uomo.examples.ucum</artifactId>
diff --git a/examples/units/org.eclipse.uomo.examples.units.android/player/pom.xml b/examples/units/org.eclipse.uomo.examples.units.android/player/pom.xml
new file mode 100644
index 0000000..76089f4
--- /dev/null
+++ b/examples/units/org.eclipse.uomo.examples.units.android/player/pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.eclipse.uomo.examples.units.android</artifactId>
+ <groupId>org.eclipse.uomo.examples.units</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <!-- from parent <groupId>org.mic.maven.web.android.archetype</groupId> -->
+ <artifactId>player</artifactId>
+ <!-- from parent <version>1.0-SNAPSHOT</version> -->
+ <!-- for plugin, currently fails, run manually with ADT
+ <packaging>apk</packaging -->
+ <packaging>pom</packaging>
+ <name>UOMo Units Android Example Player</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.google.android</groupId>
+ <artifactId>android</artifactId>
+ <version>2.2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+ <artifactId>android-maven-plugin</artifactId>
+ <version>3.0.0-alpha-14</version>
+ <configuration>
+ <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
+ <assetsDirectory>${project.basedir}/assets</assetsDirectory>
+ <resourceDirectory>${project.basedir}/res</resourceDirectory>
+ <nativeLibrariesDirectory>${project.basedir}/src/main/native</nativeLibrariesDirectory>
+ <sdk>
+ <platform>8</platform>
+ </sdk>
+ <deleteConflictingFiles>true</deleteConflictingFiles>
+ <undeployBeforeDeploy>true</undeployBeforeDeploy>
+ </configuration>
+ <extensions>true</extensions>
+ </plugin>
+ <!-- from parent <plugin> <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version> <configuration> <source>1.6</source> <target>1.6</target>
+ </configuration> </plugin> -->
+ </plugins>
+ </build>
+</project>
diff --git a/examples/units/org.eclipse.uomo.examples.units.android/pom.xml b/examples/units/org.eclipse.uomo.examples.units.android/pom.xml
new file mode 100644
index 0000000..f389789
--- /dev/null
+++ b/examples/units/org.eclipse.uomo.examples.units.android/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.eclipse.uomo.examples.units</artifactId>
+ <groupId>org.eclipse.uomo.examples.units</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.uomo.examples.units.android</artifactId>
+ <packaging>pom</packaging>
+ <name>UOMo Units Android Examples</name>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven.compilerPlugin.version}</version>
+ <configuration>
+ <source>${project.build.javaVersion}</source>
+ <target>${project.build.javaVersion}</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <modules>
+ <module>web</module>
+ <module>player</module>
+ </modules>
+</project>
\ No newline at end of file
diff --git a/examples/units/org.eclipse.uomo.examples.units.android/web/.settings/org.eclipse.wst.common.component b/examples/units/org.eclipse.uomo.examples.units.android/web/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000..fa00d0c
--- /dev/null
+++ b/examples/units/org.eclipse.uomo.examples.units.android/web/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="android-web">
+ <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+ <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+ <dependent-module archiveName="org.eclipse.uomo.units-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/org.eclipse.uomo.units/org.eclipse.uomo.units">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="org.eclipse.uomo.core-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/org.eclipse.uomo.core/org.eclipse.uomo.core">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <property name="java-output-path" value="/web/target/classes"/>
+ <property name="context-root" value="android-web"/>
+ </wb-module>
+</project-modules>
diff --git a/examples/units/org.eclipse.uomo.examples.units.android/web/pom.xml b/examples/units/org.eclipse.uomo.examples.units.android/web/pom.xml
new file mode 100644
index 0000000..055e799
--- /dev/null
+++ b/examples/units/org.eclipse.uomo.examples.units.android/web/pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.eclipse.uomo.examples.units.android</artifactId>
+ <groupId>org.eclipse.uomo.examples.units</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <!-- form parent <groupId>org.mic.maven.web.android.archetype</groupId> -->
+ <artifactId>web</artifactId>
+ <!-- form parent <version>1.0-SNAPSHOT</version> -->
+ <packaging>war</packaging>
+ <name>UOMo Units Android Example Webapp</name>
+ <build>
+ <finalName>android-web</finalName>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>javax</groupId>
+ <artifactId>javaee-web-api</artifactId>
+ <version>6.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.uomo</groupId>
+ <artifactId>org.eclipse.uomo.units</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.unitsofmeasurement</groupId>
+ <artifactId>unit-api</artifactId>
+ <version>0.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <version>4.8.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.uomo</groupId>
+ <artifactId>org.eclipse.uomo.core</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>osgi</artifactId>
+ <version>3.5.0.v20090520</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/examples/units/org.eclipse.uomo.examples.units.console/pom.xml b/examples/units/org.eclipse.uomo.examples.units.console/pom.xml
index a7855f2..92e7dd6 100644
--- a/examples/units/org.eclipse.uomo.examples.units.console/pom.xml
+++ b/examples/units/org.eclipse.uomo.examples.units.console/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>org.eclipse.uomo.examples.units</artifactId>
<groupId>org.eclipse.uomo.examples.units</groupId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.uomo.examples.units.console</artifactId>
<name>UOMo Units Console Examples</name>
diff --git a/examples/units/pom.xml b/examples/units/pom.xml
index c9e89cc..37435e6 100644
--- a/examples/units/pom.xml
+++ b/examples/units/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>org.eclipse.uomo.examples</artifactId>
<groupId>org.eclipse.uomo</groupId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.uomo.examples.units</artifactId>
<packaging>pom</packaging>
diff --git a/features/karaf/esh-core/pom.xml b/features/karaf/esh-core/pom.xml
index 89b1715..54d05ad 100644
--- a/features/karaf/esh-core/pom.xml
+++ b/features/karaf/esh-core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.uomo</groupId>
<artifactId>karaf-features</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>esh-core</artifactId>
diff --git a/features/karaf/esh-ext/pom.xml b/features/karaf/esh-ext/pom.xml
index 2a86285..be23ead 100644
--- a/features/karaf/esh-ext/pom.xml
+++ b/features/karaf/esh-ext/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.uomo</groupId>
<artifactId>karaf-features</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>esh-ext</artifactId>
diff --git a/features/karaf/esh-tp/pom.xml b/features/karaf/esh-tp/pom.xml
index e351b1d..adb42f0 100644
--- a/features/karaf/esh-tp/pom.xml
+++ b/features/karaf/esh-tp/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.uomo</groupId>
<artifactId>karaf-features</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>esh-tp</artifactId>
diff --git a/features/karaf/esh-tp/src/main/history/dependencies.xml b/features/karaf/esh-tp/src/main/history/dependencies.xml
index e78f4b1..476b5de 100644
--- a/features/karaf/esh-tp/src/main/history/dependencies.xml
+++ b/features/karaf/esh-tp/src/main/history/dependencies.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" name="esh-tp-0.8.0-SNAPSHOT">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" name="esh-tp-1.0.0-SNAPSHOT">
<feature version="0.0.0">
<feature prerequisite="false" dependency="false">esh-tp-measurement</feature>
<feature prerequisite="false" dependency="false">eventadmin</feature>
diff --git a/features/karaf/pom.xml b/features/karaf/pom.xml
index 924befa..5b1e384 100644
--- a/features/karaf/pom.xml
+++ b/features/karaf/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.uomo</groupId>
<artifactId>org.eclipse.uomo.features</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/karaf/verify/pom.xml b/features/karaf/verify/pom.xml
index 7e42756..1b3da96 100644
--- a/features/karaf/verify/pom.xml
+++ b/features/karaf/verify/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.uomo</groupId>
<artifactId>karaf-features</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>verify</artifactId>
diff --git a/features/org.eclipse.uomo.feature/pom.xml b/features/org.eclipse.uomo.feature/pom.xml
index 4e870e9..f661520 100644
--- a/features/org.eclipse.uomo.feature/pom.xml
+++ b/features/org.eclipse.uomo.feature/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.uomo.features</artifactId>
<groupId>org.eclipse.uomo</groupId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<packaging>eclipse-feature</packaging>
<artifactId>org.eclipse.uomo.feature</artifactId>
diff --git a/features/pom.xml b/features/pom.xml
index 6e3d53b..74ebd8f 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>org.eclipse.uomo</artifactId>
<groupId>org.eclipse.uomo</groupId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.uomo.features</artifactId>
<name>Eclipse UOMo Features</name>
diff --git a/pom.xml b/pom.xml
index e6bf43f..2214a88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,25 +20,22 @@
<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>0.8.0-SNAPSHOT</uomo-version>
- <tycho-version>1.6.0</tycho-version>
+ <uomo-version>1.0.0-SNAPSHOT</uomo-version>
+ <tycho-version>1.0.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>58.2</icu4j-version>
+ <icu4j-version>56.1</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>
<artifactId>org.eclipse.uomo</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Eclipse UOMo</name>
@@ -72,21 +69,13 @@
<email>christopher.senior@gmail.com</email>
<organization>Private Individual</organization>
<roles>
- <role>Committer emeritus</role>
+ <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>
@@ -174,8 +163,8 @@
<artifact>
<groupId>org.eclipse.uomo</groupId>
<artifactId>org.eclipse.uomo.target</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- <classifier>${target.release}</classifier>
+ <version>1.0.0-SNAPSHOT</version>
+ <classifier>neon</classifier>
</artifact>
</target>
<ignoreTychoRepositories>true</ignoreTychoRepositories>
@@ -209,105 +198,6 @@
<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 -->
@@ -358,7 +248,7 @@
</pluginRepositories>
<ciManagement>
- <system>Jenkins</system>
- <url>https://ci.eclipse.org/uomo/</url>
+ <system>Hudson</system>
+ <url>https://hudson.eclipse.org/uomo/</url>
</ciManagement>
</project>
\ No newline at end of file
diff --git a/releng/eclipse-repository/pom.xml b/releng/eclipse-repository/pom.xml
index 207bb90..743daea 100644
--- a/releng/eclipse-repository/pom.xml
+++ b/releng/eclipse-repository/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>org.eclipse.uomo.releng</artifactId>
<groupId>org.eclipse.uomo</groupId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>eclipse-repository</artifactId>
<name>Eclipse UOMo Repository</name>
diff --git a/releng/org.eclipse.uomo.target/pom.xml b/releng/org.eclipse.uomo.target/pom.xml
index 3bc5b47..2907393 100644
--- a/releng/org.eclipse.uomo.target/pom.xml
+++ b/releng/org.eclipse.uomo.target/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>org.eclipse.uomo.releng</artifactId>
<groupId>org.eclipse.uomo</groupId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.uomo.target</artifactId>
<name>Eclipse UOMo Target Definition</name>
diff --git a/releng/pom.xml b/releng/pom.xml
index 141ef13..caf2d71 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.uomo</groupId>
<artifactId>org.eclipse.uomo</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.uomo.releng</artifactId>
<name>Eclipse UOMo</name>
