You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2023/06/19 14:41:11 UTC
[cxf] 03/03: Clean up plugins in samples/pom.xml
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit f264037f8e2468c9fbaebfde519e05f0e1fbfe2e
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Jun 19 10:40:36 2023 -0400
Clean up plugins in samples/pom.xml
---
.../release/samples/jax_rs/graalvm_basic/pom.xml | 2 +-
.../main/release/samples/jax_rs/minimal_osgi/pom.xml | 3 ---
.../src/main/release/samples/jaxws_graalvm/pom.xml | 2 +-
distribution/src/main/release/samples/pom.xml | 20 ++++++++++++++++++++
.../release/samples/ws_transaction/client/pom.xml | 13 -------------
.../src/main/release/samples/ws_transaction/pom.xml | 1 -
.../release/samples/ws_transaction/ws_first/pom.xml | 11 +----------
.../release/samples/ws_transaction/ws_second/pom.xml | 11 +----------
8 files changed, 24 insertions(+), 39 deletions(-)
diff --git a/distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml b/distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml
index a38384b525..efdd20780e 100644
--- a/distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml
@@ -43,8 +43,8 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-resources</id>
diff --git a/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml b/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
index 4bed78882d..78a8f9d0a7 100644
--- a/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
@@ -125,7 +125,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.1.1</version>
<executions>
<execution>
<id>copy-dependencies</id>
@@ -147,7 +146,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.0</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/descriptor.xml</descriptor>
@@ -168,7 +166,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.6.0</version>
<executions>
<execution>
<goals>
diff --git a/distribution/src/main/release/samples/jaxws_graalvm/pom.xml b/distribution/src/main/release/samples/jaxws_graalvm/pom.xml
index ab188eb2a1..795e054de5 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_graalvm/pom.xml
@@ -68,8 +68,8 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-resources</id>
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 68edb2f2af..fdf8bfe0d5 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -220,6 +220,26 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.2</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.5.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>3.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.5.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.3.1</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --git a/distribution/src/main/release/samples/ws_transaction/client/pom.xml b/distribution/src/main/release/samples/ws_transaction/client/pom.xml
index 4531677271..82c416a935 100644
--- a/distribution/src/main/release/samples/ws_transaction/client/pom.xml
+++ b/distribution/src/main/release/samples/ws_transaction/client/pom.xml
@@ -40,17 +40,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>8</source>
- <target>8</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/distribution/src/main/release/samples/ws_transaction/pom.xml b/distribution/src/main/release/samples/ws_transaction/pom.xml
index a756f165da..a44f0a6677 100644
--- a/distribution/src/main/release/samples/ws_transaction/pom.xml
+++ b/distribution/src/main/release/samples/ws_transaction/pom.xml
@@ -32,7 +32,6 @@
<!-- don't deploy the samples, kind of pointless -->
<maven.deploy.skip>true</maven.deploy.skip>
<maven.test.skip>true</maven.test.skip>
- <spring.boot.version>2.1.3.RELEASE</spring.boot.version>
<narayana.spring.boot.version>2.1.0</narayana.spring.boot.version>
<narayana.version>5.9.0.Final</narayana.version>
<version.org.jboss.ws>1.0.2.Final</version.org.jboss.ws>
diff --git a/distribution/src/main/release/samples/ws_transaction/ws_first/pom.xml b/distribution/src/main/release/samples/ws_transaction/ws_first/pom.xml
index c101c62872..ca708bfbf8 100644
--- a/distribution/src/main/release/samples/ws_transaction/ws_first/pom.xml
+++ b/distribution/src/main/release/samples/ws_transaction/ws_first/pom.xml
@@ -33,16 +33,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>8</source>
- <target>8</target>
- </configuration>
+ <version>${spring.boot.version}</version>
</plugin>
</plugins>
</build>
diff --git a/distribution/src/main/release/samples/ws_transaction/ws_second/pom.xml b/distribution/src/main/release/samples/ws_transaction/ws_second/pom.xml
index 88e389f234..b429b710a7 100644
--- a/distribution/src/main/release/samples/ws_transaction/ws_second/pom.xml
+++ b/distribution/src/main/release/samples/ws_transaction/ws_second/pom.xml
@@ -33,16 +33,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>8</source>
- <target>8</target>
- </configuration>
+ <version>${spring.boot.version}</version>
</plugin>
</plugins>
</build>