Skip to content

Commit f9ea979

Browse files
committed
Update to new parent pom to simplify configuration
1 parent 5254c37 commit f9ea979

File tree

1 file changed

+17
-43
lines changed

1 file changed

+17
-43
lines changed

pom.xml

Lines changed: 17 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

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

1111
<groupId>com.fasterxml.jackson.core</groupId>
@@ -67,11 +67,6 @@
6767
libs for which we use reflection for code, but direct dep for testing
6868
-->
6969

70-
<dependency>
71-
<groupId>junit</groupId>
72-
<artifactId>junit</artifactId>
73-
<scope>test</scope>
74-
</dependency>
7570
<dependency>
7671
<groupId>org.powermock</groupId>
7772
<artifactId>powermock-module-junit4</artifactId>
@@ -95,6 +90,18 @@
9590

9691
<build>
9792
<plugins>
93+
<!-- Important: enable enforcer plug-in: -->
94+
<plugin>
95+
<artifactId>maven-enforcer-plugin</artifactId>
96+
<executions> <!-- or? combine.children="merge"> -->
97+
<execution>
98+
<id>enforce-properties</id>
99+
<phase>validate</phase>
100+
<goals><goal>enforce</goal></goals>
101+
</execution>
102+
</executions>
103+
</plugin>
104+
98105
<plugin>
99106
<groupId>org.apache.maven.plugins</groupId>
100107
<version>${version.plugin.surefire}</version>
@@ -109,35 +116,22 @@
109116
</configuration>
110117
</plugin>
111118

119+
<!-- parent definitions should be ok, but need to add more links -->
112120
<plugin>
113121
<groupId>org.apache.maven.plugins</groupId>
114122
<artifactId>maven-javadoc-plugin</artifactId>
115-
<version>${version.plugin.javadoc}</version>
116123
<configuration>
117-
<!-- Only works on Java 8:
118-
<additionalparam>-Xdoclint:none</additionalparam>
119-
-->
120-
<!-- so with Java 7, use this: -->
121-
<failOnError>false</failOnError>
122-
<links>
123-
<link>http://docs.oracle.com/javase/7/docs/api/</link>
124+
<links combine.children="append">
124125
<link>http://fasterxml.github.com/jackson-annotations/javadoc/2.9</link>
125126
<link>http://fasterxml.github.com/jackson-core/javadoc/2.9</link>
126127
</links>
127128
</configuration>
128129
</plugin>
129130

130-
<!-- May want to configure debug info -->
131+
<!-- settings are fine, but needed to trigger execution! -->
131132
<plugin>
132-
<!-- Inherited from oss-base. Generate PackageVersion.java.-->
133133
<groupId>com.google.code.maven-replacer-plugin</groupId>
134134
<artifactId>replacer</artifactId>
135-
<executions>
136-
<execution>
137-
<id>process-packageVersion</id>
138-
<phase>process-sources</phase>
139-
</execution>
140-
</executions>
141135
</plugin>
142136

143137
<!-- 18-Oct-2016, tatu: Try to make coveralls work -->
@@ -146,26 +140,6 @@
146140
<artifactId>coveralls-maven-plugin</artifactId>
147141
<version>4.3.0</version>
148142
</plugin>
149-
150-
<!-- 08-Aug-2017, tatu: Need newer version of cobertura... -->
151-
<plugin>
152-
<groupId>org.codehaus.mojo</groupId>
153-
<artifactId>cobertura-maven-plugin</artifactId>
154-
<version>2.7</version>
155-
</plugin>
156-
157-
<!-- 06-Sep-2017, tatu: Try to generate "automatic module name" -->
158-
<plugin>
159-
<groupId>org.apache.felix</groupId>
160-
<artifactId>maven-bundle-plugin</artifactId>
161-
<configuration>
162-
<!-- note: usually would use `packageVersion.package`, but need slight variation here -->
163-
<instructions combine.children="merge">
164-
<Automatic-Module-Name>${jdk.module.name}</Automatic-Module-Name>
165-
</instructions>
166-
</configuration>
167-
</plugin>
168-
169143
</plugins>
170144
</build>
171145

0 commit comments

Comments
 (0)