Skip to content

Commit

Permalink
update apache parent to 26; use plugin versions from here
Browse files Browse the repository at this point in the history
  • Loading branch information
@amarkevich
amarkevich committed Jun 28, 2022
1 parent 51e4de6 commit c84b710
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 72 deletions.
5 changes: 0 additions & 5 deletions plugins/cxf/pom.xml
View file
Expand Up @@ -83,11 +83,6 @@
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
5 changes: 0 additions & 5 deletions plugins/jetty9/pom.xml
View file
Expand Up @@ -76,11 +76,6 @@
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
5 changes: 0 additions & 5 deletions plugins/spring/pom.xml
View file
Expand Up @@ -84,11 +84,6 @@
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
5 changes: 0 additions & 5 deletions plugins/tomcat/pom.xml
View file
Expand Up @@ -64,11 +64,6 @@
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
5 changes: 0 additions & 5 deletions plugins/websphere/pom.xml
View file
Expand Up @@ -142,11 +142,6 @@
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
61 changes: 14 additions & 47 deletions pom.xml
View file
Expand Up @@ -29,7 +29,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>24</version>
<version>26</version>
</parent>

<prerequisites>
Expand Down Expand Up @@ -156,6 +156,7 @@
</releases>
</repository>
</repositories>

<pluginRepositories>
<pluginRepository>
<id>apache.snapshots</id>
Expand All @@ -180,7 +181,6 @@
<enabled>true</enabled>
</releases>
</pluginRepository>

</pluginRepositories>

<inceptionYear>2011</inceptionYear>
Expand Down Expand Up @@ -309,7 +309,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.0-M5</version>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<preparationGoals>clean install</preparationGoals>
Expand All @@ -321,7 +320,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.0</version>
<configuration>
<attach>true</attach>
<source>${jdk.version}</source>
Expand All @@ -333,15 +331,9 @@
<!--subpackages>org.apache.cxf</subpackages-->
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<configuration>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
Expand All @@ -353,36 +345,12 @@
<path>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
<version>2.3.4</version>
<!-- the latest version to support running on JDK 8 -->
<version>2.10.0</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.22.2</version>
</plugin>
<!-- TODO commented out for now
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -395,8 +363,16 @@
</manifestEntries>
</archive>
</configuration>
</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
</configuration>
</plugin>
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
Expand Down Expand Up @@ -514,7 +490,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
<configuration>
<includes>
<include>**/*Test.java</include>
Expand Down Expand Up @@ -574,7 +549,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.12</version>
<configuration>
<numUnapprovedLicenses>350</numUnapprovedLicenses>
<excludeSubProjects>false</excludeSubProjects>
Expand Down Expand Up @@ -612,13 +586,7 @@
<version>2.1</version>
</dependency>
</dependencies>
</plugin>
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.3.2</version>
</plugin>
</plugin>-->
</plugins>
</pluginManagement>
<plugins>
Expand Down Expand Up @@ -646,7 +614,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<configuration>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
Expand Down

0 comments on commit c84b710

Please sign in to comment.