Skip to content

Commit

Permalink
Merge pull request #379 from RWS/hotfix/28/CRQ-35343
Browse files Browse the repository at this point in the history 
CRQ-35343 : Plugin updates
  • Loading branch information
@ben-gineer
ben-gineer authored Oct 17, 2023
2 parents ead4171 + 2e9374c commit 38e675b
Showing 1 changed file with 46 additions and 39 deletions.
85 changes: 46 additions & 39 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.sdl</groupId>
Expand Down Expand Up @@ -94,7 +95,7 @@
<guava.version>32.1.2-jre</guava.version>
<httpcomponents.version>4.5.13</httpcomponents.version>
<jackson.version>2.14.2</jackson.version>
<jacoco.version>0.8.5</jacoco.version>
<jacoco.version>0.8.10</jacoco.version>
<junit.version>4.13.1</junit.version>
<logback.version>1.2.11</logback.version>
<mockito.version>2.24.0</mockito.version>
Expand Down Expand Up @@ -433,27 +434,27 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<version>1.6.13</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.0.1</version>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.0</version>
<version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.0-M4</version>
<version>3.0.1</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<releaseProfiles>release</releaseProfiles>
Expand All @@ -462,12 +463,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.2.2</version>
<version>1.5.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.7</version>
<version>2.16.1</version>
<configuration>
<includes>
<include>com.sdl:*</include>
Expand All @@ -477,12 +478,12 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>4.3.1</version>
<version>4.8.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
Expand All @@ -494,17 +495,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.11.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0-M1</version>
<version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
<configuration>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
Expand All @@ -526,12 +527,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.3</version>
<version>3.4.0</version>
</plugin>
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<version>2.0.0</version>
<version>2.2.0</version>
<configuration>
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
<junitxml>.</junitxml>
Expand All @@ -549,7 +550,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.1</version>
<version>3.3.0</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
Expand All @@ -566,27 +567,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M4</version>
<version>3.1.2</version>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>3.0</version>
<configuration>
<properties>
<inceptionYear>${project.inceptionYear}</inceptionYear>
<latestYearOfContribution>${currentYearDynamic}</latestYearOfContribution>
</properties>
<header>${license.header.file}</header>
<excludes>
<exclude>src/license/**</exclude>
</excludes>
</configuration>
<version>4.3</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.1.0</version>
<version>3.4.0</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down Expand Up @@ -691,18 +682,18 @@
<configuration>
<exportAntProperties>true</exportAntProperties>
<target>
<taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath" />
<taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath"/>
<!--suppress MavenModelInspection -->
<echo>parsedVersion.qualifier = ${parsedVersion.qualifier}</echo>
<if>
<!--suppress MavenModelInspection -->
<equals arg1="${parsedVersion.qualifier}" arg2="SNAPSHOT" />
<equals arg1="${parsedVersion.qualifier}" arg2="SNAPSHOT"/>
<then>
<property name="build.version" value="${snapshot.qualifier.version}" />
<property name="build.version" value="${snapshot.qualifier.version}"/>
</then>
<else>
<!--suppress MavenModelInspection -->
<property name="build.version" value="${parsedVersion.qualifier}" />
<property name="build.version" value="${parsedVersion.qualifier}"/>
</else>
</if>
</target>
Expand All @@ -718,11 +709,27 @@
<execution>
<id>process-sources</id>
<configuration>
<includes>
<include>**/*.java</include>
<include>**/*.scala</include>
<include>**/pom.xml</include>
</includes>
<properties>
<inceptionYear>${project.inceptionYear}</inceptionYear>
<latestYearOfContribution>${currentYearDynamic}</latestYearOfContribution>
</properties>
<licenseSets>
<licenseSet>
<header>${license.header.file}</header>
<excludes>
<exclude>src/license/**</exclude>
</excludes>
<includes>
<include>**/*.java</include>
<include>**/*.scala</include>
<include>**/pom.xml</include>
</includes>
</licenseSet>
</licenseSets>
<mapping>
<java>JAVADOC_STYLE</java>
<scala>JAVADOC_STYLE</scala>
</mapping>
</configuration>
<phase>process-sources</phase>
<goals>
Expand Down

0 comments on commit 38e675b

Please sign in to comment.