commit ab9c1a21512c9f52d55c7ba2aeb7c1ea9b7d7faf
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Jun 2 13:14:16 2014 +0200
[test] Fix tests for usage with xmvn-resolve wrapper
test/maven_req_test.py | 2 +-
.../require4/maven-metadata/require_dep.xml | 9 +-
test/metadata/require4/maven-poms/pom.xml | 217 +-------------------
3 files changed, 6 insertions(+), 222 deletions(-)
---
diff --git a/test/maven_req_test.py b/test/maven_req_test.py
index bf69222..7829e20 100644
--- a/test/maven_req_test.py
+++ b/test/maven_req_test.py
@@ -215,7 +215,7 @@ class TestMavenReq(unittest.TestCase):
# self.assertEquals(return_value, 0, stderr)
# sout = [x for x in stdout.split('\n') if x]
# want = ("mvn(org.apache.maven.plugins:maven-plugin-plugin)",
"jpackage-utils",
- # "mvn(org.codehaus.plexus:plexus-ant-factory-dep:pom:) = 1.0",
"java-headless")
+ # "mvn(org.fedoraproject.xmvn:xmvn-api:pom:) = 1.0",
"java-headless")
# self.assertEquals(set(want), set(sout))
if __name__ == '__main__':
diff --git a/test/metadata/require4/maven-metadata/require_dep.xml
b/test/metadata/require4/maven-metadata/require_dep.xml
index 5c08934..9d80937 100644
--- a/test/metadata/require4/maven-metadata/require_dep.xml
+++ b/test/metadata/require4/maven-metadata/require_dep.xml
@@ -2,14 +2,11 @@
<uuid>432048235932</uuid>
<artifacts>
<artifact>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-ant-factory-dep</artifactId>
+ <groupId>org.fedoraproject.xmvn</groupId>
+ <artifactId>xmvn-api</artifactId>
<version>1.0</version>
<extension>pom</extension>
- <compatVersions>
- <version>1.0</version>
- </compatVersions>
- <path>/usr/share/maven-poms/plexus-plexus-ant-factory.pom</path>
+ <path>/usr/share/maven-poms/xmvn-api.pom</path>
</artifact>
</artifacts>
</metadata>
diff --git a/test/metadata/require4/maven-poms/pom.xml
b/test/metadata/require4/maven-poms/pom.xml
index 0c595b9..e18483c 100644
--- a/test/metadata/require4/maven-poms/pom.xml
+++ b/test/metadata/require4/maven-poms/pom.xml
@@ -1,29 +1,10 @@
-<!--
-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.
--->
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-ant-factory-dep</artifactId>
+ <groupId>org.fedoraproject.xmvn</groupId>
+ <artifactId>xmvn-api</artifactId>
<version>1.0</version>
- <relativePath>../../pom/maven/pom.xml</relativePath>
</parent>
<groupId>org.apache.maven.plugins</groupId>
@@ -31,91 +12,8 @@ under the License.
<version>25</version>
<packaging>pom</packaging>
- <name>Apache Maven Plugins</name>
- <description>Maven Plugins</description>
- <
url>http://maven.apache.org/plugins/</url>
-
- <scm>
-
<
connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/...
-
<
developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plu...
-
<
url>http://svn.apache.org/viewvc/maven/plugins/tags/maven-plugins-25&l...
- </scm>
- <ciManagement>
- <system>Jenkins</system>
- <
url>https://builds.apache.org/job/maven-plugins/</url>
- </ciManagement>
-
- <distributionManagement>
- <site><!-- to be copied in every plugin pom, since inheritance adds unwanted
artifactId -->
- <id>apache.website</id>
-
<
url>scm:svn:https://svn.apache.org/repos/infra/websites/production/mav...
- </site>
- </distributionManagement>
-
- <properties>
-
<maven.site.path>plugins-archives/${project.artifactId}-LATEST</maven.site.path>
- </properties>
-
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <
url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <version>2.9</version>
- <configuration>
- <issueManagementSystems>
- <issueManagementSystem>JIRA</issueManagementSystem>
- </issueManagementSystems>
- <maxEntries>1000</maxEntries>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <!-- Used by announcement-generate goal -->
- <templateDirectory>org/apache/maven/plugins</templateDirectory>
- <!-- Used by announcement-mail goal -->
- <subject>[ANN] ${project.name} ${project.version}
Released</subject>
- <toAddresses>
- <toAddress
implementation="java.lang.String">announce(a)maven.apache.org</toAddress>
- <toAddress
implementation="java.lang.String">users(a)maven.apache.org</toAddress>
- </toAddresses>
- <ccAddresses>
- <ccAddress
implementation="java.lang.String">dev(a)maven.apache.org</ccAddress>
- </ccAddresses>
- <!-- These values need to be specified as properties in the profile
apache-release in your settings.xml -->
- <fromDeveloperId>${apache.availid}</fromDeveloperId>
- <smtpHost>${smtp.host}</smtpHost>
- </configuration>
- <dependencies>
- <!-- Used by announcement-generate goal -->
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-resources</artifactId>
- <version>1</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
-
<
tagBase>https://svn.apache.org/repos/asf/maven/plugins/tags</tagBas...
- <releaseProfiles>apache-release,rat,run-its</releaseProfiles>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
- <!-- plugin disabled by maintainer:
org.apache.maven.plugins:maven-scm-publish-plugin -->
- <!-- plugin disabled by maintainer: maven-enforcer-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
@@ -130,115 +28,4 @@ under the License.
</plugin>
</plugins>
</build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>3.2</version>
- </plugin>
- </plugins>
- </reporting>
-
- <profiles>
- <profile>
- <id>quality-checks</id>
- <activation>
- <property>
- <name>quality-checks</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-docck-plugin</artifactId>
- <executions>
- <execution>
- <id>docck-check</id>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>run-its</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <configuration>
- <debug>true</debug>
- <projectsDirectory>src/it</projectsDirectory>
-
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- <preBuildHookScript>setup</preBuildHookScript>
- <postBuildHookScript>verify</postBuildHookScript>
-
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <settingsFile>src/it/settings.xml</settingsFile>
- <pomIncludes>
- <pomInclude>*/pom.xml</pomInclude>
- </pomIncludes>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>install</goal>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>reporting</id>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>1.8</version>
- </plugin>
- </plugins>
- </reporting>
- </profile>
- <profile>
- <id>maven-3</id>
- <activation>
- <file>
- <!-- This employs that the basedir expression is only recognized by Maven
3.x (see MNG-2363) -->
- <exists>${basedir}</exists>
- </file>
- </activation>
- <build>
- <plugins>
- <!-- if releasing current pom with Maven 3, site descriptor must be attached
-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>attach-descriptor</id>
- <goals>
- <goal>attach-descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>