Skip to content

Commit

Permalink
324: Quantities#getQuantity(CharSequence) doesn't work with
Browse files Browse the repository at this point in the history
Dimensionless quantities

Task-Url: #324
  • Loading branch information
keilw committed Feb 8, 2021
1 parent 4528026 commit 8d92b42
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 49 deletions.
69 changes: 26 additions & 43 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>tech.uom</groupId>
<artifactId>uom-parent</artifactId>
<version>2.1</version>
<version>2.1.1-SNAPSHOT</version>
</parent>
<version>2.1.2-SNAPSHOT</version>

Expand Down Expand Up @@ -44,7 +44,7 @@
<project.reporting.outputEncoding>${sourceEncoding}</project.reporting.outputEncoding>
<jdkVersion>8</jdkVersion>
<!-- The oldest Java version supported by this tool. -->
<!-- Will control compilation of the main code and the unit tests. -->
<!-- Will control compilation of main code and the unit tests. -->
<base.java.version>8</base.java.version>

<project.build.javaVersion>${jdkVersion}</project.build.javaVersion>
Expand All @@ -53,16 +53,14 @@
<additionalparam>-Xdoclint:none</additionalparam>
<maven.surefire.version>2.22.2</maven.surefire.version>
<spec.vendor>Jean-Marie Dautelle, Werner Keil, Otavio Santana</spec.vendor>
<thisYear>2020</thisYear>
<thisYear>2021</thisYear>

<!-- OSGI support -->
<osgi.version>5.0.0</osgi.version>
<osgi.compendium.version>${osgi.version}</osgi.compendium.version>
<osgi.annotation.version>6.0.0</osgi.annotation.version>

<!-- Test settings -->
<junit.platform.version>1.7.0</junit.platform.version>
<hamcrest.version>2.2</hamcrest.version>
<excludedTests>**/Local*Test.java</excludedTests>
</properties>

Expand Down Expand Up @@ -556,42 +554,28 @@

<!-- Additional repositories -->
<!-- Helps to resolve Parent POM and Snapshot artifacts -->
<repositories>
<repository>
<id>jcenter</id>
<name>JCenter</name>
<url>https://jcenter.bintray.com</url>
</repository>
<repository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>bintray-release</id>
<name>libs-release</name>
<url>https://oss.jfrog.org/artifactory/libs-release</url>
</repository>
<repository>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>bintray-snapshot</id>
<name>libs-snapshot</name>
<url>https://oss.jfrog.org/artifactory/libs-snapshot</url>
</repository>
</repositories>

<distributionManagement>
<repository>
<id>bintray-release</id>
<name>oss-jfrog-artifactory-release</name>
<url>https://oss.jfrog.org/artifactory/oss-release-local</url>
</repository>
<snapshotRepository>
<id>bintray-snapshot</id>
<name>oss-jfrog-artifactory-snapshot</name>
<url>https://oss.jfrog.org/artifactory/oss-snapshot-local</url>
</snapshotRepository>
</distributionManagement>
<repositories>
<repository>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>ossrh-snapshot</id>
<name>OSSRH Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</repository>
</repositories>

<!-- Deployment to public servers -->
<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
<ciManagement>
<system>CircleCI</system>
<url>https://circleci.com/gh/unitsofmeasurement/indriya</url>
Expand Down Expand Up @@ -677,7 +661,6 @@
<!-- Run the unit tests with the JVM used to run maven -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>

<configuration>
<jvm>${env.JAVA_HOME}/bin/java</jvm>
<!-- this shows that the Java 9 code isn't tested -->
Expand All @@ -704,7 +687,7 @@

<build>
<plugins>
<!-- enable java9 - java11 compilations -->
<!-- enable java9 - java14 compilations -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down
7 changes: 1 addition & 6 deletions settings.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<servers>
<server>
<id>bintray-snapshot</id>
<username>${env.CI_DEPLOY_USERNAME}</username>
<password>${env.CI_DEPLOY_PASSWORD}</password>
</server>
<server>
<id>bintray-release</id>
<id>ossrh</id>
<username>${env.CI_DEPLOY_USERNAME}</username>
<password>${env.CI_DEPLOY_PASSWORD}</password>
</server>
Expand Down

0 comments on commit 8d92b42

Please sign in to comment.