You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by df...@apache.org on 2022/07/05 16:32:22 UTC
[cxf-fediz] 02/04: update apache parent to 26; use plugin versions from here
This is an automated email from the ASF dual-hosted git repository.
dfoulks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
commit c84b710fbb1507ade0369c98421755a6cc5238ae
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Tue Jun 28 22:52:08 2022 +0300
update apache parent to 26; use plugin versions from here
---
plugins/cxf/pom.xml | 5 ----
plugins/jetty9/pom.xml | 5 ----
plugins/spring/pom.xml | 5 ----
plugins/tomcat/pom.xml | 5 ----
plugins/websphere/pom.xml | 5 ----
pom.xml | 61 +++++++++++------------------------------------
6 files changed, 14 insertions(+), 72 deletions(-)
diff --git a/plugins/cxf/pom.xml b/plugins/cxf/pom.xml
index 15256d94..28d28efd 100644
--- a/plugins/cxf/pom.xml
+++ b/plugins/cxf/pom.xml
@@ -83,11 +83,6 @@
<goals>
<goal>single</goal>
</goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/plugins/jetty9/pom.xml b/plugins/jetty9/pom.xml
index 360e88dd..2e704bf5 100644
--- a/plugins/jetty9/pom.xml
+++ b/plugins/jetty9/pom.xml
@@ -76,11 +76,6 @@
<goals>
<goal>single</goal>
</goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 7dba974f..d0b83744 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -84,11 +84,6 @@
<goals>
<goal>single</goal>
</goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/plugins/tomcat/pom.xml b/plugins/tomcat/pom.xml
index f5c6fe34..faac7cb1 100644
--- a/plugins/tomcat/pom.xml
+++ b/plugins/tomcat/pom.xml
@@ -64,11 +64,6 @@
<goals>
<goal>single</goal>
</goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/plugins/websphere/pom.xml b/plugins/websphere/pom.xml
index b37190cd..66f63ef6 100644
--- a/plugins/websphere/pom.xml
+++ b/plugins/websphere/pom.xml
@@ -142,11 +142,6 @@
<goals>
<goal>single</goal>
</goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/pom.xml b/pom.xml
index 5df3dace..aa6de317 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>24</version>
+ <version>26</version>
</parent>
<prerequisites>
@@ -156,6 +156,7 @@
</releases>
</repository>
</repositories>
+
<pluginRepositories>
<pluginRepository>
<id>apache.snapshots</id>
@@ -180,7 +181,6 @@
<enabled>true</enabled>
</releases>
</pluginRepository>
-
</pluginRepositories>
<inceptionYear>2011</inceptionYear>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>