Skip to content
This repository was archived by the owner on Sep 21, 2020. It is now read-only.

Commit 716ee67

Browse files
keilwkeilw
committed
3: Verify UCUM prefix parsing
Task-Url: https://github.com/unitsofmeasurement/jackson-module-unitsofmeasure/issues/issues/3
1 parent 04ae096 commit 716ee67

2 files changed

Lines changed: 5 additions & 136 deletions

File tree

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Dependencies
77
------------
88

99
* The final version version (`1.0`) of the [JSR 363 API](../../../unit-api)
10-
* Latest version (`1.0.5`) of the [SE Port](../../../uom-se)
11-
* **UCUM** [System](../../../uom-systems) (`0.7`)
10+
* Latest version (`1.0.7`) of the [SE Port](../../../uom-se)
11+
* **UCUM** [System](../../../uom-systems) (`0.7.1`)
1212

1313
Provided in JFrog OSS Snapshot repo, JCenter or MavenCentral (Sonatype).

‎pom.xml‎

Lines changed: 3 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -1,133 +1,3 @@
1-
<<<<<<< HEAD
2-
<?xml version="1.0" encoding="UTF-8"?>
3-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
5-
6-
<modelVersion>4.0.0</modelVersion>
7-
<parent>
8-
<version>4.0.1</version>
9-
<artifactId>opower-parent</artifactId>
10-
<groupId>com.opower</groupId>
11-
</parent>
12-
<groupId>com.opower.unitsofmeasure</groupId>
13-
<artifactId>jackson-module-unitsofmeasure</artifactId>
14-
<packaging>jar</packaging>
15-
<version>1.3.5-SNAPSHOT</version>
16-
17-
<name>Jackson Units of Measurement Module</name>
18-
<description>Contains custom serializers and deserializers for JSR 363.</description>
19-
20-
<!-- ======================================================= -->
21-
<!-- Build Settings -->
22-
<!-- ======================================================= -->
23-
<properties>
24-
<project.build.javaVersion>1.8</project.build.javaVersion>
25-
<jdkVersion>1.8</jdkVersion>
26-
<maven.compile.targetLevel>1.6</maven.compile.targetLevel>
27-
<maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
28-
<api.version>1.0</api.version>
29-
<impl.version>1.0.5</impl.version>
30-
<lib.version>1.0</lib.version> <!-- currently unused -->
31-
<ucum.version>0.7</ucum.version>
32-
<jackson.version>2.2.2</jackson.version>
33-
<junit.version>4.12</junit.version>
34-
</properties>
35-
36-
<dependencies>
37-
<!-- =========================================================================================================== -->
38-
<!-- The units of measurement interface is in the javax.measure package. -->
39-
<!-- The implementation is provided by JSR 363 -->
40-
<!-- =========================================================================================================== -->
41-
<dependency>
42-
<groupId>javax.measure</groupId>
43-
<artifactId>unit-api</artifactId>
44-
<version>${api.version}</version>
45-
</dependency>
46-
<dependency>
47-
<groupId>tec.uom</groupId>
48-
<artifactId>uom-se</artifactId>
49-
<version>${impl.version}</version>
50-
</dependency>
51-
<dependency>
52-
<groupId>systems.uom</groupId>
53-
<artifactId>systems-quantity</artifactId>
54-
<version>${ucum.version}</version>
55-
</dependency>
56-
<dependency>
57-
<groupId>systems.uom</groupId>
58-
<artifactId>systems-ucum-java8</artifactId>
59-
<version>${ucum.version}</version>
60-
</dependency>
61-
62-
<!-- =========================================================================================================== -->
63-
<!-- Jackson library for JSON-parsing -->
64-
<!-- =========================================================================================================== -->
65-
<dependency>
66-
<groupId>com.fasterxml.jackson.core</groupId>
67-
<artifactId>jackson-core</artifactId>
68-
<version>${jackson.version}</version>
69-
</dependency>
70-
<dependency>
71-
<groupId>com.fasterxml.jackson.core</groupId>
72-
<artifactId>jackson-databind</artifactId>
73-
<version>${jackson.version}</version>
74-
</dependency>
75-
76-
<dependency>
77-
<groupId>junit</groupId>
78-
<artifactId>junit</artifactId>
79-
<version>${junit.version}</version>
80-
<scope>test</scope>
81-
</dependency>
82-
</dependencies>
83-
84-
<build>
85-
<plugins>
86-
<plugin>
87-
<groupId>org.apache.maven.plugins</groupId>
88-
<artifactId>maven-compiler-plugin</artifactId>
89-
<configuration>
90-
<source>${jdkVersion}</source>
91-
<target>${jdkVersion}</target>
92-
</configuration>
93-
</plugin>
94-
</plugins>
95-
<pluginManagement>
96-
<plugins>
97-
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
98-
<plugin>
99-
<groupId>org.eclipse.m2e</groupId>
100-
<artifactId>lifecycle-mapping</artifactId>
101-
<version>1.0.0</version>
102-
<configuration>
103-
<lifecycleMappingMetadata>
104-
<pluginExecutions>
105-
<pluginExecution>
106-
<pluginExecutionFilter>
107-
<groupId>org.jacoco</groupId>
108-
<artifactId>
109-
jacoco-maven-plugin
110-
</artifactId>
111-
<versionRange>
112-
[0.7.0.201403182114,)
113-
</versionRange>
114-
<goals>
115-
<goal>prepare-agent</goal>
116-
</goals>
117-
</pluginExecutionFilter>
118-
<action>
119-
<ignore></ignore>
120-
</action>
121-
</pluginExecution>
122-
</pluginExecutions>
123-
</lifecycleMappingMetadata>
124-
</configuration>
125-
</plugin>
126-
</plugins>
127-
</pluginManagement>
128-
</build>
129-
</project>
130-
=======
1311
<?xml version="1.0" encoding="UTF-8"?>
1322
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1333
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -155,9 +25,9 @@
15525
<maven.compile.targetLevel>1.6</maven.compile.targetLevel>
15626
<maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
15727
<api.version>1.0</api.version>
158-
<impl.version>1.0.5</impl.version>
159-
<lib.version>1.0</lib.version> <!-- currently unused -->
160-
<ucum.version>0.7</ucum.version>
28+
<impl.version>1.0.7</impl.version>
29+
<lib.version>1.0.2</lib.version> <!-- currently unused -->
30+
<ucum.version>0.7.1</ucum.version>
16131
<jackson.version>2.2.2</jackson.version>
16232
<junit.version>4.12</junit.version>
16333
</properties>
@@ -256,4 +126,3 @@
256126
</pluginManagement>
257127
</build>
258128
</project>
259-
>>>>>>> branch 'master' of https://github.com/unitsofmeasurement/jackson-module-unitsofmeasure.git

0 commit comments

Comments
 (0)