Skip to content
This repository was archived by the owner on Nov 12, 2019. It is now read-only.

Commit 42d93b3

Browse files
committed
- Change groupId and artifactId to prevent conflit with origin library (jp.skypencil.java-diff-utils:diffutils)
- Update artifact version - Update dependencies and plugins version
1 parent 3384e80 commit 42d93b3

File tree

1 file changed

+21
-32
lines changed

1 file changed

+21
-32
lines changed

Diff for: pom.xml

+21-32
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
22
<modelVersion>4.0.0</modelVersion>
3-
<groupId>jp.skypencil.java-diff-utils</groupId>
4-
<artifactId>diffutils</artifactId>
3+
<groupId>com.github.java-diff-utils</groupId>
4+
<artifactId>java-diff-utils</artifactId>
55
<packaging>jar</packaging>
6-
<version>1.5.1-SNAPSHOT</version>
6+
<version>2.0.0-SNAPSHOT</version>
77

88
<name>java-diff-utils</name>
99
<description>The DiffUtils library for computing diffs, applying patches, generationg side-by-side view in Java.</description>
@@ -15,9 +15,9 @@
1515
<version>7</version>
1616
</parent>
1717
<scm>
18-
<connection>scm:git:[email protected]:eller86/java-diff-utils.git</connection>
19-
<developerConnection>scm:git:[email protected]:eller86/java-diff-utils.git</developerConnection>
20-
<url>[email protected]:eller86/java-diff-utils.git</url>
18+
<connection>scm:git:[email protected]:jcronier/java-diff-utils.git</connection>
19+
<developerConnection>scm:git:[email protected]:jcronier/java-diff-utils.git</developerConnection>
20+
<url>[email protected]:jcronier/java-diff-utils.git</url>
2121
</scm>
2222
<developers>
2323
<developer>
@@ -31,6 +31,10 @@
3131
<name>andreaskumlehn</name>
3232
<url>https://github.com/andreaskumlehn</url>
3333
</contributor>
34+
<contributor>
35+
<name>JY Cr</name>
36+
<url>https://github.com/jcronier</url>
37+
</contributor>
3438
</contributors>
3539
<licenses>
3640
<license>
@@ -42,60 +46,48 @@
4246
</licenses>
4347

4448
<properties>
49+
<maven.compiler.target>1.7</maven.compiler.target>
4550
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
51+
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
52+
<maven.compiler.encoding>${project.build.sourceEncoding}</maven.compiler.encoding>
53+
<maven.compiler.source>${maven.compiler.target}</maven.compiler.source>
4654
</properties>
4755

4856
<dependencies>
4957
<dependency>
5058
<groupId>com.google.guava</groupId>
5159
<artifactId>guava</artifactId>
52-
<version>15.0</version>
60+
<version>18.0</version>
5361
</dependency>
5462
<dependency>
5563
<groupId>com.google.code.findbugs</groupId>
5664
<artifactId>jsr305</artifactId>
57-
<version>2.0.2</version>
65+
<version>3.0.0</version>
5866
<optional>true</optional>
5967
</dependency>
6068
<dependency>
6169
<groupId>org.hamcrest</groupId>
6270
<artifactId>hamcrest-library</artifactId>
63-
<version>1.2.1</version>
71+
<version>1.3</version>
6472
<scope>test</scope>
6573
</dependency>
6674
<dependency>
6775
<groupId>junit</groupId>
6876
<artifactId>junit</artifactId>
69-
<version>4.11</version>
77+
<version>4.12</version>
7078
<scope>test</scope>
7179
</dependency>
7280
</dependencies>
7381

7482
<build>
7583
<plugins>
76-
<plugin>
77-
<groupId>org.apache.maven.plugins</groupId>
78-
<artifactId>maven-compiler-plugin</artifactId>
79-
<version>2.5.1</version>
80-
<configuration>
81-
<source>1.7</source>
82-
<target>1.7</target>
83-
<encoding>${project.build.sourceEncoding}</encoding>
84-
</configuration>
85-
</plugin>
86-
<plugin>
87-
<groupId>org.apache.maven.plugins</groupId>
88-
<artifactId>maven-javadoc-plugin</artifactId>
89-
<version>2.9.1</version>
90-
</plugin>
91-
9284
<!-- Make this JAR OSGi ready -->
9385
<!-- We want to keep packaging type as jar. Therefore we need to customize the MANIFEST.MF.
9486
See http://felix.apache.org/site/apache-felix-maven-bundle-plugin-bnd.html
9587
-->
9688
<plugin>
9789
<artifactId>maven-jar-plugin</artifactId>
98-
<version>2.4</version>
90+
<version>2.6</version>
9991
<configuration>
10092
<archive>
10193
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -105,7 +97,7 @@
10597
<plugin>
10698
<groupId>org.apache.felix</groupId>
10799
<artifactId>maven-bundle-plugin</artifactId>
108-
<version>2.3.7</version>
100+
<version>2.5.3</version>
109101
<executions>
110102
<execution>
111103
<id>bundle-manifest</id>
@@ -116,9 +108,6 @@
116108
</execution>
117109
</executions>
118110
</plugin>
119-
120111
</plugins>
121112
</build>
122-
123-
</project>
124-
113+
</project>

0 commit comments

Comments
 (0)