Skip to content

Commit e352cac

Browse files
authored
Streamline child pom's (extract common stuff to parent) (#120)
1 parent e6d9b6d commit e352cac

File tree

6 files changed

+10
-91
lines changed

6 files changed

+10
-91
lines changed

jr-annotation-support/pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,6 @@
6666
</execution>
6767
</executions>
6868
</plugin>
69-
<plugin>
70-
<groupId>org.apache.maven.plugins</groupId>
71-
<artifactId>maven-surefire-plugin</artifactId>
72-
<configuration>
73-
<redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
74-
<excludes>
75-
<exclude>**/failing/*.java</exclude>
76-
</excludes>
77-
</configuration>
78-
</plugin>
7969
<!-- 11-Mar-2019, tatu: Add basic JDK8-includable module-info, generated by Moditect -->
8070
<plugin>
8171
<groupId>org.moditect</groupId>

jr-extension-javatime/pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,6 @@
4545

4646
<build>
4747
<plugins>
48-
<plugin>
49-
<groupId>org.apache.maven.plugins</groupId>
50-
<artifactId>maven-surefire-plugin</artifactId>
51-
<configuration>
52-
<redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
53-
<excludes>
54-
<exclude>**/failing/*.java</exclude>
55-
</excludes>
56-
</configuration>
57-
</plugin>
5848
<!-- 11-Mar-2019, tatu: Add basic JDK8-includable module-info, generated by Moditect -->
5949
<plugin>
6050
<groupId>org.moditect</groupId>

jr-objects/pom.xml

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -49,58 +49,14 @@ has no other dependencies, and provides additional builder-style content generat
4949
<artifactId>maven-javadoc-plugin</artifactId>
5050
<configuration>
5151
<links combine.children="append">
52-
<link>https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-core/2.13/</link>
52+
<link>https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-core/2.17/</link>
5353
</links>
5454
</configuration>
5555

5656
</plugin>
5757
<plugin>
5858
<groupId>com.google.code.maven-replacer-plugin</groupId>
5959
<artifactId>replacer</artifactId>
60-
<executions>
61-
<execution>
62-
<id>process-packageVersion</id>
63-
<goals>
64-
<goal>replace</goal>
65-
</goals>
66-
<phase>generate-sources</phase>
67-
<!--
68-
<phase>process-sources</phase>
69-
-->
70-
</execution>
71-
</executions>
72-
<configuration>
73-
<file>${packageVersion.template.input}</file>
74-
<outputFile>${packageVersion.template.output}</outputFile>
75-
<replacements>
76-
<replacement>
77-
<token>@package@</token>
78-
<value>${packageVersion.package}</value>
79-
</replacement>
80-
<replacement>
81-
<token>@projectversion@</token>
82-
<value>${project.version}</value>
83-
</replacement>
84-
<replacement>
85-
<token>@projectgroupid@</token>
86-
<value>${project.groupId}</value>
87-
</replacement>
88-
<replacement>
89-
<token>@projectartifactid@</token>
90-
<value>${project.artifactId}</value>
91-
</replacement>
92-
</replacements>
93-
</configuration>
94-
</plugin>
95-
<plugin>
96-
<groupId>org.apache.maven.plugins</groupId>
97-
<artifactId>maven-surefire-plugin</artifactId>
98-
<configuration>
99-
<redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
100-
<excludes>
101-
<exclude>**/failing/*.java</exclude>
102-
</excludes>
103-
</configuration>
10460
</plugin>
10561
<!-- 11-Mar-2019, tatu: Add basic JDK8-includable module-info, generated by Moditect -->
10662
<plugin>

jr-retrofit2/pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,6 @@ ${project.groupId}.retrofit2;version=${project.version}
5959

6060
<build>
6161
<plugins>
62-
<plugin>
63-
<groupId>org.apache.maven.plugins</groupId>
64-
<artifactId>maven-surefire-plugin</artifactId>
65-
<configuration>
66-
<redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
67-
<excludes>
68-
<exclude>**/failing/*.java</exclude>
69-
</excludes>
70-
</configuration>
71-
</plugin>
7262
<!-- 11-Mar-2019, tatu: Add basic JDK8-includable module-info, generated by Moditect -->
7363
<plugin>
7464
<groupId>org.moditect</groupId>

jr-stree/pom.xml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,6 @@ has no other dependencies.
6161
<!-- Inherited from oss-base. Generate PackageVersion.java.-->
6262
<groupId>com.google.code.maven-replacer-plugin</groupId>
6363
<artifactId>replacer</artifactId>
64-
<executions>
65-
<execution>
66-
<id>process-packageVersion</id>
67-
<phase>generate-sources</phase>
68-
</execution>
69-
</executions>
70-
</plugin>
71-
<plugin>
72-
<groupId>org.apache.maven.plugins</groupId>
73-
<artifactId>maven-surefire-plugin</artifactId>
74-
<configuration>
75-
<redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
76-
<excludes>
77-
<exclude>**/failing/*.java</exclude>
78-
</excludes>
79-
</configuration>
8064
</plugin>
8165
<!-- 11-Mar-2019, tatu: Add basic JDK8-includable module-info, generated by Moditect -->
8266
<plugin>

pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,15 @@
6666
<build>
6767
<plugins>
6868

69+
<plugin>
70+
<groupId>org.apache.maven.plugins</groupId>
71+
<artifactId>maven-surefire-plugin</artifactId>
72+
<configuration>
73+
<excludes>
74+
<exclude>com/fasterxml/jackson/**/failing/*.java</exclude>
75+
</excludes>
76+
</configuration>
77+
</plugin>
6978
<plugin>
7079
<groupId>org.jacoco</groupId>
7180
<artifactId>jacoco-maven-plugin</artifactId>

0 commit comments

Comments
 (0)