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/20 12:01:24 UTC

[axis-axis1-java] branch master updated: Make the wsdl2java-maven-plugin tests succeed with an empty local repo

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-axis1-java.git


The following commit(s) were added to refs/heads/master by this push:
     new 1227217  Make the wsdl2java-maven-plugin tests succeed with an empty local repo
1227217 is described below

commit 1227217b7eaccd0840dcc958c5dd364e21a45d4d
Author: Andreas Veithen <an...@gmail.com>
AuthorDate: Sun Dec 20 12:00:18 2020 +0000

    Make the wsdl2java-maven-plugin tests succeed with an empty local repo
---
 maven/wsdl2java-maven-plugin/pom.xml             | 16 +++++--
 maven/wsdl2java-maven-plugin/src/it/settings.xml | 53 ------------------------
 2 files changed, 13 insertions(+), 56 deletions(-)

diff --git a/maven/wsdl2java-maven-plugin/pom.xml b/maven/wsdl2java-maven-plugin/pom.xml
index b5acf24..1e463f3 100644
--- a/maven/wsdl2java-maven-plugin/pom.xml
+++ b/maven/wsdl2java-maven-plugin/pom.xml
@@ -83,12 +83,24 @@
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>com.github.veithen.maven</groupId>
+                        <artifactId>resolver-proxy-maven-plugin</artifactId>
+                        <version>0.2.0</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>start</goal>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
                         <artifactId>maven-invoker-plugin</artifactId>
                         <executions>
                             <execution>
                                 <id>integration-test</id>
                                 <goals>
-                                    <goal>install</goal>
                                     <goal>run</goal>
                                 </goals>
                                 <configuration>
@@ -100,8 +112,6 @@
                                     </pomIncludes>
                                     <preBuildHookScript>setup</preBuildHookScript>
                                     <postBuildHookScript>verify</postBuildHookScript>
-                                    <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-                                    <settingsFile>src/it/settings.xml</settingsFile>
                                     <goals>
                                         <goal>clean</goal>
                                         <goal>install</goal>
diff --git a/maven/wsdl2java-maven-plugin/src/it/settings.xml b/maven/wsdl2java-maven-plugin/src/it/settings.xml
deleted file mode 100644
index 8737d31..0000000
--- a/maven/wsdl2java-maven-plugin/src/it/settings.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements. See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership. The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License. You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<settings>
-  <profiles>
-    <profile>
-      <id>it-repo</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <repositories>
-        <repository>
-          <id>local.central</id>
-          <url>@localRepositoryUrl@</url>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>local.central</id>
-          <url>@localRepositoryUrl@</url>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-  </profiles>
-</settings>