mirror of https://github.com/apache/maven.git
o Decoupled it0018 from production dependencies and re-enabled it for the IT suite
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@699730 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann
parent
e762352634
commit
1cfb4ec292
|
|
@ -238,6 +238,7 @@ MavenITmng3645POMSyntaxErrorTest
|
|||
suite.addTestSuite( MavenIT0022Test.class );
|
||||
suite.addTestSuite( MavenIT0021Test.class );
|
||||
suite.addTestSuite( MavenIT0019Test.class );
|
||||
suite.addTestSuite( MavenIT0018Test.class );
|
||||
suite.addTestSuite( MavenIT0014Test.class );
|
||||
suite.addTestSuite( MavenIT0012Test.class );
|
||||
suite.addTestSuite( MavenIT0011Test.class );
|
||||
|
|
@ -265,11 +266,6 @@ MavenITmng3645POMSyntaxErrorTest
|
|||
// suite.addTestSuite( MavenITmng3284UsingCachedPluginsTest.class );
|
||||
// suite.addTestSuite( MavenITmng3530DynamicPOMInterpolationTest.class );
|
||||
|
||||
// Test 18 always fails because it is trying to delete a
|
||||
// commonly used artifact (commons-logging-1.0.3) that is in use
|
||||
// in the repo. It should be redone using fake artifacts.
|
||||
// suite.addTestSuite( MavenIT0018Test.class );
|
||||
|
||||
// this test is flakey on windows and isn't a test of the core.
|
||||
// suite.addTestSuite( MavenIT0020Test.class );
|
||||
|
||||
|
|
|
|||
|
|
@ -38,13 +38,11 @@ public class MavenIT0018Test
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0018" );
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
verifier.deleteArtifact( "commons-logging", "commons-logging", "1.0.3", "jar" );
|
||||
verifier.executeGoal( "package" );
|
||||
// TODO: I would like to build some small core-it artifacts for this purpose instead
|
||||
verifier.assertArtifactPresent( "commons-logging", "commons-logging", "1.0.3", "jar" );
|
||||
verifier.deleteArtifact( "org.apache.maven.its.it0018", "managed-dep", "1.0.3", "jar" );
|
||||
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution::compile" );
|
||||
verifier.assertArtifactPresent( "org.apache.maven.its.it0018", "managed-dep", "1.0.3", "jar" );
|
||||
verifier.verifyErrorFreeLog();
|
||||
verifier.resetStreams();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,31 +1,51 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!--
|
||||
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>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<name>Maven Integration Test :: it0018</name>
|
||||
|
||||
<groupId>org.apache.maven.its.it0018</groupId>
|
||||
<artifactId>maven-it-it0018</artifactId>
|
||||
<description>Ensure that managed dependencies for dependency POMs are calculated
|
||||
correctly when resolved. Removes commons-logging-1.0.3 and checks it is
|
||||
redownloaded.</description>
|
||||
<version>1.0</version>
|
||||
|
||||
<name>Maven Integration Test :: it0018</name>
|
||||
<description>
|
||||
Ensure that managed dependencies for dependency POMs are calculated
|
||||
correctly when resolved. Removes managed-dep-1.0.3 and checks it is
|
||||
redownloaded.
|
||||
</description>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>marmalade</groupId>
|
||||
<artifactId>marmalade-el-commons</artifactId>
|
||||
<version>1.0-alpha-2</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>servletapi</groupId>
|
||||
<artifactId>servletapi</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>3.8.1</version>
|
||||
<scope>test</scope>
|
||||
<groupId>org.apache.maven.its.it0018</groupId>
|
||||
<artifactId>sub-project</artifactId>
|
||||
<version>1</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>it0018</id>
|
||||
<url>file:///${basedir}/repo</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
</project>
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -0,0 +1 @@
|
|||
95ae9dee2b472d807bc4b350a0ca793a
|
||||
|
|
@ -0,0 +1 @@
|
|||
9d0573a18105c41577ed9dddb95ae034eec2d7e6
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!--
|
||||
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>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>org.apache.maven.its.it0018</groupId>
|
||||
<artifactId>managed-dep</artifactId>
|
||||
<version>1.0.3</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>it0018</id>
|
||||
<url>file:///${basedir}/repo</url>
|
||||
</repository>
|
||||
</distributionManagement>
|
||||
</project>
|
||||
|
|
@ -0,0 +1 @@
|
|||
a02f8e13a0c33d602c3bf269cf33c835
|
||||
|
|
@ -0,0 +1 @@
|
|||
f1bf07a984c1e6b98829c23a6a2a6effd2bdd7ba
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?><metadata>
|
||||
<groupId>org.apache.maven.its.it0018</groupId>
|
||||
<artifactId>managed-dep</artifactId>
|
||||
<version>1.0.3</version>
|
||||
<versioning>
|
||||
<versions>
|
||||
<version>1.0.3</version>
|
||||
</versions>
|
||||
<lastUpdated>20080927182553</lastUpdated>
|
||||
</versioning>
|
||||
</metadata>
|
||||
|
|
@ -0,0 +1 @@
|
|||
3cdd36c7a6ab8be5691a86b65face942
|
||||
|
|
@ -0,0 +1 @@
|
|||
efa4553a270db522dab004bd2bc2f1360474704b
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!--
|
||||
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>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>org.apache.maven.its.it0018</groupId>
|
||||
<artifactId>parent</artifactId>
|
||||
<version>1</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<modules>
|
||||
<module>sub-project</module>
|
||||
</modules>
|
||||
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>it0018</id>
|
||||
<url>file:///${basedir}/repo</url>
|
||||
</repository>
|
||||
</distributionManagement>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven.its.it0018</groupId>
|
||||
<artifactId>managed-dep</artifactId>
|
||||
<version>1.0.3</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
</project>
|
||||
|
|
@ -0,0 +1 @@
|
|||
66cb8fca769881525257daecbf8a0e20
|
||||
|
|
@ -0,0 +1 @@
|
|||
44586adf8825654ae9562495e0a41deef5d0b1ce
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?><metadata>
|
||||
<groupId>org.apache.maven.its.it0018</groupId>
|
||||
<artifactId>parent</artifactId>
|
||||
<version>1</version>
|
||||
<versioning>
|
||||
<versions>
|
||||
<version>1</version>
|
||||
</versions>
|
||||
<lastUpdated>20080927182600</lastUpdated>
|
||||
</versioning>
|
||||
</metadata>
|
||||
|
|
@ -0,0 +1 @@
|
|||
2f0fd6ea53dedb2d0b4d127175d5fc3e
|
||||
|
|
@ -0,0 +1 @@
|
|||
bc704d6c71427307803323023ef7ac9489bb1b1c
|
||||
Binary file not shown.
|
|
@ -0,0 +1 @@
|
|||
2a60ab122d2933575af458e8b15c09dc
|
||||
|
|
@ -0,0 +1 @@
|
|||
87ce06681ae31a632077b8b76ecc2bdf094e0ace
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!--
|
||||
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>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>org.apache.maven.its.it0018</groupId>
|
||||
<artifactId>parent</artifactId>
|
||||
<version>1</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>sub-project</artifactId>
|
||||
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>it0018</id>
|
||||
<url>file:///${basedir}/repo</url>
|
||||
</repository>
|
||||
</distributionManagement>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven.its.it0018</groupId>
|
||||
<artifactId>managed-dep</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
|
@ -0,0 +1 @@
|
|||
39c49fb7d860e1d7aedbfcd57d2d60e9
|
||||
|
|
@ -0,0 +1 @@
|
|||
371461cbe34e7f569a464b2ea36c0dbebb8eeee3
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?><metadata>
|
||||
<groupId>org.apache.maven.its.it0018</groupId>
|
||||
<artifactId>sub-project</artifactId>
|
||||
<version>1</version>
|
||||
<versioning>
|
||||
<versions>
|
||||
<version>1</version>
|
||||
</versions>
|
||||
<lastUpdated>20080927182601</lastUpdated>
|
||||
</versioning>
|
||||
</metadata>
|
||||
|
|
@ -0,0 +1 @@
|
|||
751c690736dd033ab64a554738dc52f2
|
||||
|
|
@ -0,0 +1 @@
|
|||
79a48c196131211f80827db27c824e184f36458b
|
||||
Loading…
Reference in New Issue