Skip to content

Commit

Permalink
Streamline child pom's (extract common stuff to parent) (#120)
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder authored Feb 21, 2024
1 parent e6d9b6d commit e352cac
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 91 deletions.
10 changes: 0 additions & 10 deletions jr-annotation-support/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
<excludes>
<exclude>**/failing/*.java</exclude>
</excludes>
</configuration>
</plugin>
<!-- 11-Mar-2019, tatu: Add basic JDK8-includable module-info, generated by Moditect -->
<plugin>
<groupId>org.moditect</groupId>
Expand Down
10 changes: 0 additions & 10 deletions jr-extension-javatime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
<excludes>
<exclude>**/failing/*.java</exclude>
</excludes>
</configuration>
</plugin>
<!-- 11-Mar-2019, tatu: Add basic JDK8-includable module-info, generated by Moditect -->
<plugin>
<groupId>org.moditect</groupId>
Expand Down
46 changes: 1 addition & 45 deletions jr-objects/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,58 +49,14 @@ has no other dependencies, and provides additional builder-style content generat
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<links combine.children="append">
<link>https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-core/2.13/</link>
<link>https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-core/2.17/</link>
</links>
</configuration>

</plugin>
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<executions>
<execution>
<id>process-packageVersion</id>
<goals>
<goal>replace</goal>
</goals>
<phase>generate-sources</phase>
<!--
<phase>process-sources</phase>
-->
</execution>
</executions>
<configuration>
<file>${packageVersion.template.input}</file>
<outputFile>${packageVersion.template.output}</outputFile>
<replacements>
<replacement>
<token>@package@</token>
<value>${packageVersion.package}</value>
</replacement>
<replacement>
<token>@projectversion@</token>
<value>${project.version}</value>
</replacement>
<replacement>
<token>@projectgroupid@</token>
<value>${project.groupId}</value>
</replacement>
<replacement>
<token>@projectartifactid@</token>
<value>${project.artifactId}</value>
</replacement>
</replacements>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
<excludes>
<exclude>**/failing/*.java</exclude>
</excludes>
</configuration>
</plugin>
<!-- 11-Mar-2019, tatu: Add basic JDK8-includable module-info, generated by Moditect -->
<plugin>
Expand Down
10 changes: 0 additions & 10 deletions jr-retrofit2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,6 @@ ${project.groupId}.retrofit2;version=${project.version}

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
<excludes>
<exclude>**/failing/*.java</exclude>
</excludes>
</configuration>
</plugin>
<!-- 11-Mar-2019, tatu: Add basic JDK8-includable module-info, generated by Moditect -->
<plugin>
<groupId>org.moditect</groupId>
Expand Down
16 changes: 0 additions & 16 deletions jr-stree/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,22 +61,6 @@ has no other dependencies.
<!-- Inherited from oss-base. Generate PackageVersion.java.-->
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<executions>
<execution>
<id>process-packageVersion</id>
<phase>generate-sources</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
<excludes>
<exclude>**/failing/*.java</exclude>
</excludes>
</configuration>
</plugin>
<!-- 11-Mar-2019, tatu: Add basic JDK8-includable module-info, generated by Moditect -->
<plugin>
Expand Down
9 changes: 9 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,15 @@
<build>
<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<exclude>com/fasterxml/jackson/**/failing/*.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
Expand Down

0 comments on commit e352cac

Please sign in to comment.