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

Commit 04ae096

Browse files
keilwkeilw
committed
3: Verify UCUM prefix parsing
Task-Url: https://github.com/unitsofmeasurement/jackson-module-unitsofmeasure/issues/issues/3
2 parents a8abb86 + aed1651 commit 04ae096

1 file changed

Lines changed: 131 additions & 0 deletions

File tree

‎pom.xml‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<<<<<<< HEAD
12
<?xml version="1.0" encoding="UTF-8"?>
23
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
34
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -126,3 +127,133 @@
126127
</pluginManagement>
127128
</build>
128129
</project>
130+
=======
131+
<?xml version="1.0" encoding="UTF-8"?>
132+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
133+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
134+
135+
<modelVersion>4.0.0</modelVersion>
136+
<parent>
137+
<version>4.0.1</version>
138+
<artifactId>opower-parent</artifactId>
139+
<groupId>com.opower</groupId>
140+
</parent>
141+
<groupId>com.opower.unitsofmeasure</groupId>
142+
<artifactId>jackson-module-unitsofmeasure</artifactId>
143+
<packaging>jar</packaging>
144+
<version>1.3.5-SNAPSHOT</version>
145+
146+
<name>Jackson Units of Measurement Module</name>
147+
<description>Contains custom serializers and deserializers for JSR 363.</description>
148+
149+
<!-- ======================================================= -->
150+
<!-- Build Settings -->
151+
<!-- ======================================================= -->
152+
<properties>
153+
<project.build.javaVersion>1.8</project.build.javaVersion>
154+
<jdkVersion>1.8</jdkVersion>
155+
<maven.compile.targetLevel>1.6</maven.compile.targetLevel>
156+
<maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
157+
<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>
161+
<jackson.version>2.2.2</jackson.version>
162+
<junit.version>4.12</junit.version>
163+
</properties>
164+
165+
<dependencies>
166+
<!-- =========================================================================================================== -->
167+
<!-- The units of measurement interface is in the javax.measure package. -->
168+
<!-- The implementation is provided by JSR 363 -->
169+
<!-- =========================================================================================================== -->
170+
<dependency>
171+
<groupId>javax.measure</groupId>
172+
<artifactId>unit-api</artifactId>
173+
<version>${api.version}</version>
174+
</dependency>
175+
<dependency>
176+
<groupId>tec.uom</groupId>
177+
<artifactId>uom-se</artifactId>
178+
<version>${impl.version}</version>
179+
</dependency>
180+
<dependency>
181+
<groupId>systems.uom</groupId>
182+
<artifactId>systems-quantity</artifactId>
183+
<version>${ucum.version}</version>
184+
</dependency>
185+
<dependency>
186+
<groupId>systems.uom</groupId>
187+
<artifactId>systems-ucum-java8</artifactId>
188+
<version>${ucum.version}</version>
189+
</dependency>
190+
191+
<!-- =========================================================================================================== -->
192+
<!-- Jackson library for JSON-parsing -->
193+
<!-- =========================================================================================================== -->
194+
<dependency>
195+
<groupId>com.fasterxml.jackson.core</groupId>
196+
<artifactId>jackson-core</artifactId>
197+
<version>${jackson.version}</version>
198+
</dependency>
199+
<dependency>
200+
<groupId>com.fasterxml.jackson.core</groupId>
201+
<artifactId>jackson-databind</artifactId>
202+
<version>${jackson.version}</version>
203+
</dependency>
204+
205+
<dependency>
206+
<groupId>junit</groupId>
207+
<artifactId>junit</artifactId>
208+
<version>${junit.version}</version>
209+
<scope>test</scope>
210+
</dependency>
211+
</dependencies>
212+
213+
<build>
214+
<plugins>
215+
<plugin>
216+
<groupId>org.apache.maven.plugins</groupId>
217+
<artifactId>maven-compiler-plugin</artifactId>
218+
<configuration>
219+
<source>${jdkVersion}</source>
220+
<target>${jdkVersion}</target>
221+
</configuration>
222+
</plugin>
223+
</plugins>
224+
<pluginManagement>
225+
<plugins>
226+
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
227+
<plugin>
228+
<groupId>org.eclipse.m2e</groupId>
229+
<artifactId>lifecycle-mapping</artifactId>
230+
<version>1.0.0</version>
231+
<configuration>
232+
<lifecycleMappingMetadata>
233+
<pluginExecutions>
234+
<pluginExecution>
235+
<pluginExecutionFilter>
236+
<groupId>org.jacoco</groupId>
237+
<artifactId>
238+
jacoco-maven-plugin
239+
</artifactId>
240+
<versionRange>
241+
[0.7.0.201403182114,)
242+
</versionRange>
243+
<goals>
244+
<goal>prepare-agent</goal>
245+
</goals>
246+
</pluginExecutionFilter>
247+
<action>
248+
<ignore></ignore>
249+
</action>
250+
</pluginExecution>
251+
</pluginExecutions>
252+
</lifecycleMappingMetadata>
253+
</configuration>
254+
</plugin>
255+
</plugins>
256+
</pluginManagement>
257+
</build>
258+
</project>
259+
>>>>>>> branch 'master' of https://github.com/unitsofmeasurement/jackson-module-unitsofmeasure.git

0 commit comments

Comments
 (0)