Skip to content

Commit c16b86b

Browse files
committed
Merge pull request #20 from ColinHebert/java_encoding
Set the java version and encoding through properties rather than plugin definition
2 parents d6334f5 + 738df36 commit c16b86b

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

pom.xml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,15 @@
4343
<url>https://github.com/fluent/fluent-logger-java/issues</url>
4444
</issueManagement>
4545

46+
<properties>
47+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
48+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
49+
50+
<!-- maven-compiler-plugin config -->
51+
<maven.compiler.source>6</maven.compiler.source>
52+
<maven.compiler.target>6</maven.compiler.target>
53+
</properties>
54+
4655
<dependencies>
4756
<dependency>
4857
<groupId>org.msgpack</groupId>
@@ -69,15 +78,6 @@
6978

7079
<build>
7180
<plugins>
72-
<plugin>
73-
<artifactId>maven-compiler-plugin</artifactId>
74-
<version>2.3.2</version>
75-
<configuration>
76-
<source>1.6</source>
77-
<target>1.6</target>
78-
<encoding>UTF-8</encoding>
79-
</configuration>
80-
</plugin>
8181
<plugin>
8282
<artifactId>maven-assembly-plugin</artifactId>
8383
<version>2.2</version>
@@ -135,7 +135,6 @@
135135
<doctitle>${project.name} ${project.version} API</doctitle>
136136
<aggregate>true</aggregate>
137137
<locale>en_US</locale>
138-
<encoding>UTF-8</encoding>
139138
</configuration>
140139
</plugin>
141140
<plugin>
@@ -159,7 +158,6 @@
159158
<doctitle>${project.name} ${project.version} API</doctitle>
160159
<aggregate>true</aggregate>
161160
<locale>en_US</locale>
162-
<encoding>UTF-8</encoding>
163161
</configuration>
164162
</plugin>
165163
<plugin>

0 commit comments

Comments
 (0)