Skip to content

Commit 94bd927

Browse files
committed
simplify pom.xml a bit based on newly reorgnized parent poms, defaults
1 parent 8f2a977 commit 94bd927

File tree

1 file changed

+8
-53
lines changed

1 file changed

+8
-53
lines changed

pom.xml

Lines changed: 8 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@
44

55
<parent>
66
<groupId>com.fasterxml.jackson</groupId>
7-
<artifactId>jackson-bom</artifactId>
7+
<artifactId>jackson-base</artifactId>
88
<version>3.0.0-SNAPSHOT</version>
99
</parent>
1010

1111
<groupId>com.fasterxml.jackson.core</groupId>
1212
<artifactId>jackson-databind</artifactId>
13-
<!--
1413
<version>3.0.0-SNAPSHOT</version>
15-
-->
1614
<name>jackson-databind</name>
1715
<packaging>bundle</packaging>
1816
<description>General data-binding functionality for Jackson: works on core streaming API</description>
@@ -27,18 +25,16 @@
2725
</scm>
2826

2927
<properties>
30-
<!-- Jackson 3.x requires Java 8
31-
-->
32-
<javac.src.version>1.8</javac.src.version>
33-
<javac.target.version>1.8</javac.target.version>
34-
3528
<!-- Can not use default, since group id != Java package name here -->
3629
<osgi.export>com.fasterxml.jackson.databind.*;version=${project.version}</osgi.export>
3730
<!-- but imports should work fine with defaults -->
3831

3932
<!-- Generate PackageVersion.java into this directory. -->
4033
<packageVersion.dir>com/fasterxml/jackson/databind/cfg</packageVersion.dir>
4134
<packageVersion.package>com.fasterxml.jackson.databind.cfg</packageVersion.package>
35+
36+
<!-- Automatic Module Name default needs changing -->
37+
<jdk.module.name>com.fasterxml.jackson.databind</jdk.module.name>
4238
</properties>
4339

4440
<dependencies>
@@ -55,21 +51,12 @@
5551
<dependency>
5652
<groupId>com.fasterxml.jackson.core</groupId>
5753
<artifactId>jackson-core</artifactId>
58-
<version>3.0.0-SNAPSHOT</version>
59-
<!--
6054
<version>${jackson.version.core}</version>
61-
-->
6255
</dependency>
6356

6457
<!-- and for testing we need a few libraries
6558
libs for which we use reflection for code, but direct dep for testing
6659
-->
67-
68-
<dependency>
69-
<groupId>junit</groupId>
70-
<artifactId>junit</artifactId>
71-
<scope>test</scope>
72-
</dependency>
7360
<dependency>
7461
<groupId>org.powermock</groupId>
7562
<artifactId>powermock-module-junit4</artifactId>
@@ -113,30 +100,17 @@
113100
<artifactId>maven-javadoc-plugin</artifactId>
114101
<version>${version.plugin.javadoc}</version>
115102
<configuration>
116-
<!-- Only works on Java 8:
117-
<additionalparam>-Xdoclint:none</additionalparam>
118-
-->
119-
<!-- so with Java 7, use this: -->
120-
<failOnError>false</failOnError>
121-
<links>
122-
<link>http://docs.oracle.com/javase/7/docs/api/</link>
123-
<link>http://fasterxml.github.com/jackson-annotations/javadoc/2.7</link>
124-
<link>http://fasterxml.github.com/jackson-core/javadoc/2.7</link>
103+
<links combine.children="append">
104+
<link>http://fasterxml.github.com/jackson-annotations/javadoc/3.0</link>
105+
<link>http://fasterxml.github.com/jackson-core/javadoc/3.0</link>
125106
</links>
126107
</configuration>
127108
</plugin>
128109

129-
<!-- May want to configure debug info -->
130-
<plugin>
110+
<plugin> <!-- default settings are fine, just need to enable here -->
131111
<!-- Inherited from oss-base. Generate PackageVersion.java.-->
132112
<groupId>com.google.code.maven-replacer-plugin</groupId>
133113
<artifactId>replacer</artifactId>
134-
<executions>
135-
<execution>
136-
<id>process-packageVersion</id>
137-
<phase>process-sources</phase>
138-
</execution>
139-
</executions>
140114
</plugin>
141115

142116
<!-- 18-Oct-2016, tatu: Try to make coveralls work -->
@@ -145,28 +119,9 @@
145119
<artifactId>coveralls-maven-plugin</artifactId>
146120
<version>4.3.0</version>
147121
</plugin>
148-
149-
<!-- 08-Aug-2017, tatu: Need newer version of cobertura... -->
150-
<plugin>
151-
<groupId>org.codehaus.mojo</groupId>
152-
<artifactId>cobertura-maven-plugin</artifactId>
153-
<version>2.7</version>
154-
</plugin>
155122
</plugins>
156123
</build>
157124

158-
<!--
159-
<reporting>
160-
<plugins>
161-
<plugin>
162-
<groupId>org.codehaus.mojo</groupId>
163-
<artifactId>cobertura-maven-plugin</artifactId>
164-
<version>2.7</version>
165-
</plugin>
166-
</plugins>
167-
</reporting>
168-
-->
169-
170125
<profiles>
171126
<profile>
172127
<id>release</id>

0 commit comments

Comments
 (0)