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

Commit 93e872b

Browse files
krichter722krichter722
committed
Add checkstyle setup
After #13 has been attempted to merge while ignoring the conflict. The changes need to be applied properly.
1 parent c3cd6b8 commit 93e872b

7 files changed

Lines changed: 378 additions & 380 deletions

File tree

‎pom.xml‎

Lines changed: 159 additions & 161 deletions
Original file line numberDiff line numberDiff line change
@@ -1,171 +1,169 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
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">
3+
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">
55

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>
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>
1616

17-
<name>Jackson Units of Measurement Module</name>
18-
<description>Contains custom serializers and deserializers for JSR 363.</description>
17+
<name>Jackson Units of Measurement Module</name>
18+
<description>Contains custom serializers and deserializers for JSR 363.</description>
1919

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.9</impl.version>
30-
<lib.version>1.0.2</lib.version> <!-- currently unused -->
31-
<ucum.version>0.9</ucum.version>
32-
<jackson.version>2.9.6</jackson.version>
33-
<junit.version>4.12</junit.version>
34-
</properties>
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.9</impl.version>
30+
<lib.version>1.0.2</lib.version> <!-- currently unused -->
31+
<ucum.version>0.9</ucum.version>
32+
<jackson.version>2.9.6</jackson.version>
33+
<junit.version>4.12</junit.version>
34+
</properties>
3535

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>
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>
6161

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>
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>
7575

76-
<dependency>
77-
<groupId>junit</groupId>
78-
<artifactId>junit</artifactId>
79-
<version>${junit.version}</version>
80-
<scope>test</scope>
81-
</dependency>
82-
</dependencies>
76+
<dependency>
77+
<groupId>junit</groupId>
78+
<artifactId>junit</artifactId>
79+
<version>${junit.version}</version>
80+
<scope>test</scope>
81+
</dependency>
82+
</dependencies>
8383

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-
<!--
95-
<plugin>
96-
<groupId>org.apache.maven.plugins</groupId>
97-
<artifactId>maven-checkstyle-plugin</artifactId>
98-
<version>3.0.0</version>
99-
<executions>
100-
<execution>
101-
<id>check_style</id>
102-
<goals>
103-
<goal>check</goal>
104-
</goals>
105-
<phase>validate</phase>
106-
<configuration>
107-
<configLocation>checkstyle-config/check_style.xml</configLocation>
108-
</configuration>
109-
</execution>
110-
</executions>
111-
<configuration>
112-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
113-
</configuration>
114-
</plugin>
115-
-->
116-
</plugins>
117-
<pluginManagement>
118-
<plugins>
119-
<!--This plugin's configuration is used to store Eclipse m2e settings
120-
only. It has no influence on the Maven build itself. -->
121-
<plugin>
122-
<groupId>org.eclipse.m2e</groupId>
123-
<artifactId>lifecycle-mapping</artifactId>
124-
<version>1.0.0</version>
125-
<configuration>
126-
<lifecycleMappingMetadata>
127-
<pluginExecutions>
128-
<pluginExecution>
129-
<pluginExecutionFilter>
130-
<groupId>org.jacoco</groupId>
131-
<artifactId>
132-
jacoco-maven-plugin
133-
</artifactId>
134-
<versionRange>
135-
[0.7.0.201403182114,)
136-
</versionRange>
137-
<goals>
138-
<goal>prepare-agent</goal>
139-
</goals>
140-
</pluginExecutionFilter>
141-
<action>
142-
<ignore></ignore>
143-
</action>
144-
</pluginExecution>
145-
<pluginExecution>
146-
<pluginExecutionFilter>
147-
<groupId>
148-
org.apache.maven.plugins
149-
</groupId>
150-
<artifactId>
151-
maven-checkstyle-plugin
152-
</artifactId>
153-
<versionRange>
154-
[3.0.0,)
155-
</versionRange>
156-
<goals>
157-
<goal>check</goal>
158-
</goals>
159-
</pluginExecutionFilter>
160-
<action>
161-
<ignore></ignore>
162-
</action>
163-
</pluginExecution>
164-
</pluginExecutions>
165-
</lifecycleMappingMetadata>
166-
</configuration>
167-
</plugin>
168-
</plugins>
169-
</pluginManagement>
170-
</build>
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+
<plugin>
95+
<groupId>org.apache.maven.plugins</groupId>
96+
<artifactId>maven-checkstyle-plugin</artifactId>
97+
<version>3.0.0</version>
98+
<executions>
99+
<execution>
100+
<id>check_style</id>
101+
<goals>
102+
<goal>check</goal>
103+
</goals>
104+
<phase>validate</phase>
105+
<configuration>
106+
<configLocation>checkstyle-config/check_style.xml</configLocation>
107+
</configuration>
108+
</execution>
109+
</executions>
110+
<configuration>
111+
<includeTestSourceDirectory>true</includeTestSourceDirectory>
112+
</configuration>
113+
</plugin>
114+
</plugins>
115+
<pluginManagement>
116+
<plugins>
117+
<!--This plugin's configuration is used to store Eclipse m2e settings
118+
only. It has no influence on the Maven build itself. -->
119+
<plugin>
120+
<groupId>org.eclipse.m2e</groupId>
121+
<artifactId>lifecycle-mapping</artifactId>
122+
<version>1.0.0</version>
123+
<configuration>
124+
<lifecycleMappingMetadata>
125+
<pluginExecutions>
126+
<pluginExecution>
127+
<pluginExecutionFilter>
128+
<groupId>org.jacoco</groupId>
129+
<artifactId>
130+
jacoco-maven-plugin
131+
</artifactId>
132+
<versionRange>
133+
[0.7.0.201403182114,)
134+
</versionRange>
135+
<goals>
136+
<goal>prepare-agent</goal>
137+
</goals>
138+
</pluginExecutionFilter>
139+
<action>
140+
<ignore></ignore>
141+
</action>
142+
</pluginExecution>
143+
<pluginExecution>
144+
<pluginExecutionFilter>
145+
<groupId>
146+
org.apache.maven.plugins
147+
</groupId>
148+
<artifactId>
149+
maven-checkstyle-plugin
150+
</artifactId>
151+
<versionRange>
152+
[3.0.0,)
153+
</versionRange>
154+
<goals>
155+
<goal>check</goal>
156+
</goals>
157+
</pluginExecutionFilter>
158+
<action>
159+
<ignore></ignore>
160+
</action>
161+
</pluginExecution>
162+
</pluginExecutions>
163+
</lifecycleMappingMetadata>
164+
</configuration>
165+
</plugin>
166+
</plugins>
167+
</pluginManagement>
168+
</build>
171169
</project>

0 commit comments

Comments
 (0)