add unit-api-0.6.1.jar to repo because it is not found in any repo through the maven mechanisms.
diff --git a/bundles/org.eclipse.uomo.core/.classpath b/bundles/org.eclipse.uomo.core/.classpath index 47ca448..77a3a33 100644 --- a/bundles/org.eclipse.uomo.core/.classpath +++ b/bundles/org.eclipse.uomo.core/.classpath
@@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry exported="true" kind="lib" path="libs/unit-api-0.6.1.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src/main/java/"/> <classpathentry kind="src" path="src/main/resources/"/>
diff --git a/bundles/org.eclipse.uomo.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.core/META-INF/MANIFEST.MF index 8c6d4c4..ac12ead 100644 --- a/bundles/org.eclipse.uomo.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.uomo.core/META-INF/MANIFEST.MF
@@ -9,8 +9,7 @@ Created-By: 1.6.0_23-ea(SunMicrosystemsInc.) Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.osgi.services;bundle-version="3.2.100";visibility:=reexport, - org.eclipse.core.runtime;bundle-version="3.10.0", - org.unitsofmeasurement.unit-api;bundle-version="0.6.1" + org.eclipse.core.runtime;bundle-version="3.10.0" Bundle-Vendor: Eclipse OSBP Bundle-Version: 0.6.0.qualifier Bnd-LastModified: 1288905964975 @@ -23,6 +22,8 @@ Bundle-DocURL: http://www.eclipse.org Include-Resource: src/main/resources Originally-Created-By: 1.6.0_23-ea(SunMicrosystemsInc.) -Bundle-ClassPath: org.eclipse.uomo.core/libs/icu4j-50_1_1.jar,. +Bundle-ClassPath: org.eclipse.uomo.core/libs/icu4j-50_1_1.jar, + libs/unit-api-0.6.1.jar, + .
diff --git a/bundles/org.eclipse.uomo.core/build.properties b/bundles/org.eclipse.uomo.core/build.properties index c0f224d..b3395c2 100644 --- a/bundles/org.eclipse.uomo.core/build.properties +++ b/bundles/org.eclipse.uomo.core/build.properties
@@ -2,4 +2,5 @@ output.. = target/classes bin.includes = META-INF/,\ .,\ - libs/icu4j-50_1_1.jar + libs/icu4j-50_1_1.jar,\ + libs/unit-api-0.6.1.jar
diff --git a/bundles/org.eclipse.uomo.core/libs/unit-api-0.6.1.jar b/bundles/org.eclipse.uomo.core/libs/unit-api-0.6.1.jar new file mode 100644 index 0000000..af84a8a --- /dev/null +++ b/bundles/org.eclipse.uomo.core/libs/unit-api-0.6.1.jar Binary files differ
diff --git a/bundles/org.eclipse.uomo.core/pom.xml b/bundles/org.eclipse.uomo.core/pom.xml index b8794b1..bebefe4 100644 --- a/bundles/org.eclipse.uomo.core/pom.xml +++ b/bundles/org.eclipse.uomo.core/pom.xml
@@ -13,18 +13,26 @@ <properties> <site.basedir>${project.parent.basedir}</site.basedir> </properties> + <repositories> + <repository> + <id>atlassian</id> + <url>https://maven.atlassian.com/repository/public</url> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + </repositories> <dependencies> <dependency> <groupId>org.eclipse.core</groupId> <artifactId>runtime</artifactId> <version>3.10.0-v20140318-2214</version> </dependency> -<!-- - <dependency> - <groupId>org.unitsofmeasurement</groupId> - <artifactId>unit-api</artifactId> - <version>0.6.1</version> - </dependency> ---> </dependencies> </project>
diff --git a/bundles/org.eclipse.uomo.ucum/.classpath b/bundles/org.eclipse.uomo.ucum/.classpath index c892e36..cda3236 100644 --- a/bundles/org.eclipse.uomo.ucum/.classpath +++ b/bundles/org.eclipse.uomo.ucum/.classpath
@@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> + <classpathentry exported="true" kind="lib" path="lib/unit-api-0.6.1.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry exported="true" kind="lib" path="lib/icu4j-50_1_1.jar"/>
diff --git a/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF index e37c1b8..f848069 100644 --- a/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF
@@ -14,9 +14,10 @@ org.eclipse.uomo.util;bundle-version="0.2.6", org.eclipse.uomo.xml;bundle-version="0.2.0", org.eclipse.uomo.units;bundle-version="0.6.0", - org.apache.commons.lang;bundle-version="2.3.0", - org.unitsofmeasurement.unit-api;bundle-version="0.6.1" + org.apache.commons.lang;bundle-version="2.3.0" Bundle-Vendor: Eclipse OSBP Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.eclipse.osgi.util;version="1.1.0" -Bundle-ClassPath: lib/icu4j-50_1_1.jar,. +Bundle-ClassPath: lib/icu4j-50_1_1.jar, + lib/unit-api-0.6.1.jar, + .
diff --git a/bundles/org.eclipse.uomo.ucum/build.properties b/bundles/org.eclipse.uomo.ucum/build.properties index 01949b5..2bd44c4 100644 --- a/bundles/org.eclipse.uomo.ucum/build.properties +++ b/bundles/org.eclipse.uomo.ucum/build.properties
@@ -1,4 +1,5 @@ source.. = src/main/java/ bin.includes = META-INF/,\ .,\ - lib/icu4j-50_1_1.jar + lib/icu4j-50_1_1.jar,\ + lib/unit-api-0.6.1.jar
diff --git a/bundles/org.eclipse.uomo.ucum/lib/README b/bundles/org.eclipse.uomo.ucum/lib/README new file mode 100644 index 0000000..9edcad5 --- /dev/null +++ b/bundles/org.eclipse.uomo.ucum/lib/README
@@ -0,0 +1,3 @@ +This jar file is included here because it cannot be downloaded from a public p2 repository at this time. + +If this file is included in Orbit - it can be removed. \ No newline at end of file
diff --git a/bundles/org.eclipse.uomo.ucum/lib/unit-api-0.6.1.jar b/bundles/org.eclipse.uomo.ucum/lib/unit-api-0.6.1.jar new file mode 100644 index 0000000..af84a8a --- /dev/null +++ b/bundles/org.eclipse.uomo.ucum/lib/unit-api-0.6.1.jar Binary files differ
diff --git a/bundles/org.eclipse.uomo.units/.classpath b/bundles/org.eclipse.uomo.units/.classpath index a227bcc..3de4529 100644 --- a/bundles/org.eclipse.uomo.units/.classpath +++ b/bundles/org.eclipse.uomo.units/.classpath
@@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> + <classpathentry exported="true" kind="lib" path="libs/unit-api-0.6.1.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry exported="true" kind="lib" path="libs/icu4j-50_1_1.jar"/>
diff --git a/bundles/org.eclipse.uomo.units/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.units/META-INF/MANIFEST.MF index 034321e..56e4cc7 100644 --- a/bundles/org.eclipse.uomo.units/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.uomo.units/META-INF/MANIFEST.MF
@@ -26,7 +26,8 @@ uses:="org.unitsofmeasurement.unit, org.eclipse.uomo.units, org.unitsofmeasurement.service" -Require-Bundle: org.eclipse.uomo.core;bundle-version="0.6.0", - org.unitsofmeasurement.unit-api;bundle-version="0.6.1" +Require-Bundle: org.eclipse.uomo.core;bundle-version="0.6.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Bundle-ClassPath: libs/icu4j-50_1_1.jar,. +Bundle-ClassPath: libs/icu4j-50_1_1.jar, + libs/unit-api-0.6.1.jar, + .
diff --git a/bundles/org.eclipse.uomo.units/build.properties b/bundles/org.eclipse.uomo.units/build.properties index 1f1733f..3bab9aa 100644 --- a/bundles/org.eclipse.uomo.units/build.properties +++ b/bundles/org.eclipse.uomo.units/build.properties
@@ -3,4 +3,5 @@ bin.includes = META-INF/,\ .,\ plugin.xml,\ - libs/icu4j-50_1_1.jar + libs/icu4j-50_1_1.jar,\ + libs/unit-api-0.6.1.jar
diff --git a/bundles/org.eclipse.uomo.units/libs/README b/bundles/org.eclipse.uomo.units/libs/README new file mode 100644 index 0000000..9edcad5 --- /dev/null +++ b/bundles/org.eclipse.uomo.units/libs/README
@@ -0,0 +1,3 @@ +This jar file is included here because it cannot be downloaded from a public p2 repository at this time. + +If this file is included in Orbit - it can be removed. \ No newline at end of file
diff --git a/bundles/org.eclipse.uomo.units/libs/unit-api-0.6.1.jar b/bundles/org.eclipse.uomo.units/libs/unit-api-0.6.1.jar new file mode 100644 index 0000000..af84a8a --- /dev/null +++ b/bundles/org.eclipse.uomo.units/libs/unit-api-0.6.1.jar Binary files differ
diff --git a/pom.xml b/pom.xml index 3d82689..0d87b11 100644 --- a/pom.xml +++ b/pom.xml
@@ -190,12 +190,13 @@ <url>http://maven.geotoolkit.org/</url> </repository> + <repository> <id>nexus-geomatys.com</id> <name>GeoToolkit Repository for Maven</name> <url>http://nexus.geomatys.com/repository/geotoolkit</url> </repository> - + </repositories>