Simplify poms 1

Upgrade maven-surefire-plugin 2.22.1 -> 2.22.2
Upgrade maven-jar-plugin 3.1.0 (in ags) to -> 3.2.0 (was in repo)
Upgrade alfresco-maven-plugin 2.1.1 (ags), 3.0.1 (c-pack) -> 4.0.1 (was in e-pack)

swagger-ui.version 3.38  moved to community-repo
stripped out java versions from ags poms
alfresco-maven-plugin removed snapshotToTimestamp as we now use releases in ags
moved project...Encoding to the 2 top level ags poms - did not want to try system wide - too big a change

[ags]

(cherry picked from commit 1237c3c810)
This commit is contained in:
alandavis
2021-05-05 21:22:47 +01:00
parent 9b721592fb
commit 2f9f5698cb
3 changed files with 20 additions and 32 deletions

View File

@@ -38,9 +38,6 @@
<maven.javadoc.skip>true</maven.javadoc.skip> <maven.javadoc.skip>true</maven.javadoc.skip>
<maven.war.plugin.version>3.2.2</maven.war.plugin.version> <maven.war.plugin.version>3.2.2</maven.war.plugin.version>
<maven.alfresco.includeDependencies>false</maven.alfresco.includeDependencies> <maven.alfresco.includeDependencies>false</maven.alfresco.includeDependencies>
<java.version>11</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<testJavaVersion>${java.version}</testJavaVersion> <testJavaVersion>${java.version}</testJavaVersion>
<maven.buildhelper.version>1.9.1</maven.buildhelper.version> <maven.buildhelper.version>1.9.1</maven.buildhelper.version>
<maven.compiler.version>3.8.0</maven.compiler.version> <maven.compiler.version>3.8.0</maven.compiler.version>
@@ -252,7 +249,6 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-install-plugin</artifactId> <artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
<executions> <executions>
<execution> <execution>
<id>default-install</id> <id>default-install</id>
@@ -353,35 +349,10 @@
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version>
<configuration>
<argLine>
--illegal-access=permit
</argLine>
</configuration>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin> <plugin>
<groupId>org.alfresco.maven.plugin</groupId> <groupId>org.alfresco.maven.plugin</groupId>
<artifactId>alfresco-maven-plugin</artifactId> <artifactId>alfresco-maven-plugin</artifactId>
<version>2.1.1</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration>
<snapshotToTimestamp>true</snapshotToTimestamp>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
@@ -604,7 +575,6 @@
<dependency> <dependency>
<groupId>org.alfresco.maven.plugin</groupId> <groupId>org.alfresco.maven.plugin</groupId>
<artifactId>alfresco-maven-plugin</artifactId> <artifactId>alfresco-maven-plugin</artifactId>
<version>2.1.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
<configuration> <configuration>

View File

@@ -12,8 +12,6 @@
<properties> <properties>
<maven.javadoc.skip>false</maven.javadoc.skip> <maven.javadoc.skip>false</maven.javadoc.skip>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties> </properties>
<build> <build>

20
pom.xml
View File

@@ -85,6 +85,7 @@
<dependency.activemq.version>5.16.1</dependency.activemq.version> <dependency.activemq.version>5.16.1</dependency.activemq.version>
<dependency.apache.taglibs.version>1.2.5</dependency.apache.taglibs.version> <dependency.apache.taglibs.version>1.2.5</dependency.apache.taglibs.version>
<dependency.awaitility.version>4.0.3</dependency.awaitility.version> <dependency.awaitility.version>4.0.3</dependency.awaitility.version>
<swagger-ui.version>3.38.0</swagger-ui.version>
<dependency.jakarta-jaxb-api.version>2.3.3</dependency.jakarta-jaxb-api.version> <dependency.jakarta-jaxb-api.version>2.3.3</dependency.jakarta-jaxb-api.version>
<dependency.jakarta-ws-api.version>2.3.3</dependency.jakarta-ws-api.version> <dependency.jakarta-ws-api.version>2.3.3</dependency.jakarta-ws-api.version>
@@ -824,6 +825,25 @@
<artifactId>docker-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<version>0.34.1</version> <version>0.34.1</version>
</plugin> </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<runOrder>alphabetical</runOrder>
<argLine>
--illegal-access=permit
</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.alfresco.maven.plugin</groupId>
<artifactId>alfresco-maven-plugin</artifactId>
<configuration>
<attachClasses>true</attachClasses>
<ampBuildDirectory>${project.build.directory}/${project.build.finalName}</ampBuildDirectory>
</configuration>
</plugin>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version> <version>3.2.0</version>