Skip to content

Commit

Permalink
refactor(pom): upgrade Maven plugins, stop using special JDK9+ profile
Browse files Browse the repository at this point in the history
  • Loading branch information
poikilotherm committed Mar 25, 2021
1 parent ed3ee9e commit 249eacf
Showing 1 changed file with 18 additions and 27 deletions.
45 changes: 18 additions & 27 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
<flyway.version>5.2.4</flyway.version>
<jhove.version>1.20.1</jhove.version>
<jacoco.version>0.8.6</jacoco.version>
<dmp.version>0.34.1</dmp.version>
</properties>
<pluginRepositories>
<pluginRepository>
Expand Down Expand Up @@ -716,10 +717,20 @@
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<release>11</release>
<!-- for use with `mvn -DcompilerArgument=-Xlint:unchecked compile` -->
<compilerArgument>${compilerArgument}</compilerArgument>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3</version>
<version>3.2.0</version>
<configuration>
<archive>
<manifest>
Expand All @@ -732,7 +743,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.3</version>
<version>3.3.1</version>
<configuration>
<attachClasses>true</attachClasses>
<failOnMissingWebXml>false</failOnMissingWebXml>
Expand All @@ -747,12 +758,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version>
<version>3.1.2</version>
</plugin>
<plugin>
<groupId>de.qaware.maven</groupId>
<artifactId>go-offline-maven-plugin</artifactId>
<version>1.2.1</version>
<version>1.2.8</version>
<configuration>
<dynamicDependencies>
</dynamicDependencies>
Expand Down Expand Up @@ -800,7 +811,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.2</version>
<configuration>
<configLocation>checkstyle.xml</configLocation>
<encoding>UTF-8</encoding>
Expand All @@ -825,26 +836,6 @@
<id>all-unit-tests</id>
</profile>
<!-- TODO: Add a profile to run API tests (integration tests that end in IT.java. See conf/docker-aio/run-test-suite.sh -->
<profile>
<id>Java9Plus</id>
<activation>
<jdk>[1.9</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<release>11</release>
<!-- for use with `mvn -DcompilerArgument=-Xlint:unchecked compile` -->
<compilerArgument>${compilerArgument}</compilerArgument>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>tc</id>
<properties>
Expand Down Expand Up @@ -886,7 +877,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.34.1</version>
<version>${dmp.version}</version>
<configuration>
<images>
<!-- Dataverse K8s image -->
Expand Down Expand Up @@ -921,7 +912,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.34.1</version>
<version>${dmp.version}</version>
<configuration>
<images>
<!-- Solr K8s image -->
Expand Down

0 comments on commit 249eacf

Please sign in to comment.