You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2020/12/27 11:08:55 UTC

[axis-axis2-java-core] branch master updated: Update alta-maven-plugin

This is an automated email from the ASF dual-hosted git repository.

veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
     new 7dd258e  Update alta-maven-plugin
7dd258e is described below

commit 7dd258effb4970cf580a82f23b7ce4b2583ec7de
Author: Andreas Veithen <an...@gmail.com>
AuthorDate: Sun Dec 27 11:08:44 2020 +0000

    Update alta-maven-plugin
---
 modules/distribution/pom.xml   |  14 +++---
 modules/osgi-tests/pom.xml     | 107 +++++++++++++++++++++--------------------
 modules/transport/jms/pom.xml  |  14 +++---
 modules/transport/mail/pom.xml |  14 +++---
 pom.xml                        |   2 +-
 systests/webapp-tests/pom.xml  |  28 ++++++-----
 6 files changed, 95 insertions(+), 84 deletions(-)

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index f08fede..c3402bd 100755
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -346,12 +346,14 @@
                         <configuration>
                             <name>webapp</name>
                             <value>%file%</value>
-                            <dependencySet>
-                                <scope>test</scope>
-                                <includes>
-                                    <include>*:axis2-webapp:war:*</include>
-                                </includes>
-                            </dependencySet>
+                            <artifactSet>
+                                <dependencySet>
+                                    <scope>test</scope>
+                                    <includes>
+                                        <include>*:axis2-webapp:war:*</include>
+                                    </includes>
+                                </dependencySet>
+                            </artifactSet>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/modules/osgi-tests/pom.xml b/modules/osgi-tests/pom.xml
index d52797a..5a96b01 100644
--- a/modules/osgi-tests/pom.xml
+++ b/modules/osgi-tests/pom.xml
@@ -96,59 +96,60 @@
                         <configuration>
                             <name>%bundle.symbolicName%.link</name>
                             <value>%url%</value>
-                            <dependencySet>
-                                <scope>test</scope>
-                            </dependencySet>
-                            <artifacts>
-                                <artifact>
-                                    <groupId>org.apache.felix</groupId>
-                                    <artifactId>org.apache.felix.http.jetty</artifactId>
-                                    <version>2.2.2</version>
-                                </artifact>
-                                <artifact>
-                                    <groupId>org.apache.felix</groupId>
-                                    <artifactId>org.apache.felix.http.whiteboard</artifactId>
-                                    <version>2.2.2</version>
-                                </artifact>
-                                <artifact>
-                                    <groupId>org.apache.felix</groupId>
-                                    <artifactId>org.apache.felix.configadmin</artifactId>
-                                    <version>1.8.0</version>
-                                </artifact>
-                                <artifact>
-                                    <groupId>org.apache.servicemix.bundles</groupId>
-                                    <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
-                                    <version>1.6.2_6</version>
-                                </artifact>
-                                <artifact>
-                                    <groupId>org.apache.geronimo.specs</groupId>
-                                    <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                                    <version>1.2</version>
-                                </artifact>
-                                <artifact>
-                                    <groupId>com.sun.activation</groupId>
-                                    <artifactId>javax.activation</artifactId>
-                                </artifact>
-                                <artifact>
-                                    <groupId>org.apache.servicemix.bundles</groupId>
-                                    <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
-                                    <version>3.1_7</version>
-                                </artifact>
-                                <artifact>
-                                    <groupId>org.apache.servicemix.bundles</groupId>
-                                    <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
-                                    <version>1.3_5</version>
-                                </artifact>
-                                <artifact>
-                                    <groupId>org.apache.httpcomponents</groupId>
-                                    <artifactId>httpcore-osgi</artifactId>
-                                </artifact>
-                                <artifact>
-                                    <groupId>org.apache.httpcomponents</groupId>
-                                    <artifactId>httpclient-osgi</artifactId>
-                                </artifact>
-                            </artifacts>
-                            <paxExam>${exam.version}</paxExam>
+                            <artifactSet>
+                                <dependencySet>
+                                    <scope>test</scope>
+                                </dependencySet>
+                                <artifacts>
+                                    <artifact>
+                                        <groupId>org.apache.felix</groupId>
+                                        <artifactId>org.apache.felix.http.jetty</artifactId>
+                                        <version>2.2.2</version>
+                                    </artifact>
+                                    <artifact>
+                                        <groupId>org.apache.felix</groupId>
+                                        <artifactId>org.apache.felix.http.whiteboard</artifactId>
+                                        <version>2.2.2</version>
+                                    </artifact>
+                                    <artifact>
+                                        <groupId>org.apache.felix</groupId>
+                                        <artifactId>org.apache.felix.configadmin</artifactId>
+                                        <version>1.8.0</version>
+                                    </artifact>
+                                    <artifact>
+                                        <groupId>org.apache.servicemix.bundles</groupId>
+                                        <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
+                                        <version>1.6.2_6</version>
+                                    </artifact>
+                                    <artifact>
+                                        <groupId>org.apache.geronimo.specs</groupId>
+                                        <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                                        <version>1.2</version>
+                                    </artifact>
+                                    <artifact>
+                                        <groupId>com.sun.activation</groupId>
+                                        <artifactId>javax.activation</artifactId>
+                                    </artifact>
+                                    <artifact>
+                                        <groupId>org.apache.servicemix.bundles</groupId>
+                                        <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
+                                        <version>3.1_7</version>
+                                    </artifact>
+                                    <artifact>
+                                        <groupId>org.apache.servicemix.bundles</groupId>
+                                        <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
+                                        <version>1.3_5</version>
+                                    </artifact>
+                                    <artifact>
+                                        <groupId>org.apache.httpcomponents</groupId>
+                                        <artifactId>httpcore-osgi</artifactId>
+                                    </artifact>
+                                    <artifact>
+                                        <groupId>org.apache.httpcomponents</groupId>
+                                        <artifactId>httpclient-osgi</artifactId>
+                                    </artifact>
+                                </artifacts>
+                            </artifactSet>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/modules/transport/jms/pom.xml b/modules/transport/jms/pom.xml
index 0909486..2c8b1f7 100644
--- a/modules/transport/jms/pom.xml
+++ b/modules/transport/jms/pom.xml
@@ -54,12 +54,14 @@
                         <configuration>
                             <name>aspectjweaver</name>
                             <value>%file%</value>
-                            <artifacts>
-                                <artifact>
-                                    <groupId>org.aspectj</groupId>
-                                    <artifactId>aspectjweaver</artifactId>
-                                </artifact>
-                            </artifacts>
+                            <artifactSet>
+                                <artifacts>
+                                    <artifact>
+                                        <groupId>org.aspectj</groupId>
+                                        <artifactId>aspectjweaver</artifactId>
+                                    </artifact>
+                                </artifacts>
+                            </artifactSet>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/modules/transport/mail/pom.xml b/modules/transport/mail/pom.xml
index a0e9e5e..762527e 100644
--- a/modules/transport/mail/pom.xml
+++ b/modules/transport/mail/pom.xml
@@ -75,12 +75,14 @@
                         <configuration>
                             <name>aspectjweaver</name>
                             <value>%file%</value>
-                            <artifacts>
-                                <artifact>
-                                    <groupId>org.aspectj</groupId>
-                                    <artifactId>aspectjweaver</artifactId>
-                                </artifact>
-                            </artifacts>
+                            <artifactSet>
+                                <artifacts>
+                                    <artifact>
+                                        <groupId>org.aspectj</groupId>
+                                        <artifactId>aspectjweaver</artifactId>
+                                    </artifact>
+                                </artifacts>
+                            </artifactSet>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/pom.xml b/pom.xml
index 9a34c33..69317d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1231,7 +1231,7 @@
                 <plugin>
                     <groupId>com.github.veithen.alta</groupId>
                     <artifactId>alta-maven-plugin</artifactId>
-                    <version>0.6.2</version>
+                    <version>0.7.0</version>
                 </plugin>
                 <plugin>
                     <groupId>com.github.veithen.maven</groupId>
diff --git a/systests/webapp-tests/pom.xml b/systests/webapp-tests/pom.xml
index 74e0745..6597f8c 100644
--- a/systests/webapp-tests/pom.xml
+++ b/systests/webapp-tests/pom.xml
@@ -82,12 +82,14 @@
                         <configuration>
                             <name>webapp</name>
                             <value>%file%</value>
-                            <dependencySet>
-                                <scope>test</scope>
-                                <includes>
-                                    <include>*:axis2-webapp:war:*</include>
-                                </includes>
-                            </dependencySet>
+                            <artifactSet>
+                                <dependencySet>
+                                    <scope>test</scope>
+                                    <includes>
+                                        <include>*:axis2-webapp:war:*</include>
+                                    </includes>
+                                </dependencySet>
+                            </artifactSet>
                         </configuration>
                     </execution>
                     <execution>
@@ -98,12 +100,14 @@
                         <configuration>
                             <name>echo-service-location.txt</name>
                             <value>%file%</value>
-                            <dependencySet>
-                                <scope>test</scope>
-                                <includes>
-                                    <include>*:echo:aar:*</include>
-                                </includes>
-                            </dependencySet>
+                            <artifactSet>
+                                <dependencySet>
+                                    <scope>test</scope>
+                                    <includes>
+                                        <include>*:echo:aar:*</include>
+                                    </includes>
+                                </dependencySet>
+                            </artifactSet>
                         </configuration>
                     </execution>
                 </executions>