You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/10/07 13:58:58 UTC
svn commit: r702446 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/it0079/ resources/it0079/jars/
resources/it0079/src/
Author: bentmann
Date: Tue Oct 7 04:58:57 2008
New Revision: 702446
URL: http://svn.apache.org/viewvc?rev=702446&view=rev
Log:
o Decoupled it0079 from production plugins
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0079/jars/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0079/jars/attached.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0079/jars/main.jar (with props)
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0079/src/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0079Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0079/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0079Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0079Test.java?rev=702446&r1=702445&r2=702446&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0079Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0079Test.java Tue Oct 7 04:58:57 2008
@@ -37,14 +37,13 @@
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0079" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "deploy" );
+ verifier.executeGoal( "initialize" );
verifier.assertFilePresent(
"target/test-repo/org/apache/maven/its/it0079/maven-it-it0079/SNAPSHOT/maven-it-it0079-*-1.jar" );
verifier.assertFilePresent(
- "target/test-repo/org/apache/maven/its/it0079/maven-it-it0079/SNAPSHOT/maven-it-it0079-*-1-sources.jar" );
+ "target/test-repo/org/apache/maven/its/it0079/maven-it-it0079/SNAPSHOT/maven-it-it0079-*-1-it.jar" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
}
-}
+}
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0079/jars/attached.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0079/jars/attached.jar?rev=702446&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0079/jars/attached.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0079/jars/main.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0079/jars/main.jar?rev=702446&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0079/jars/main.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0079/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0079/pom.xml?rev=702446&r1=702445&r2=702446&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0079/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0079/pom.xml Tue Oct 7 04:58:57 2008
@@ -1,36 +1,68 @@
<?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.it0079</groupId>
- <artifactId>maven-it-it0079</artifactId>
-
- <description>Test that source attachments have the same build number as the main
- artifact when deployed.</description>
-
- <version>SNAPSHOT</version>
- <distributionManagement>
- <snapshotRepository>
- <id>test</id>
- <name>Test Repo</name>
- <url>file:target/test-repo</url>
- </snapshotRepository>
- </distributionManagement>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.it0079</groupId>
+ <artifactId>maven-it-it0079</artifactId>
+ <version>SNAPSHOT</version>
+
+ <name>Maven Integration Test :: it0079</name>
+ <description>
+ Test that attached artifacts have the same build number as the main
+ artifact when deployed.
+ </description>
+
+ <distributionManagement>
+ <snapshotRepository>
+ <id>test</id>
+ <name>Test Repo</name>
+ <url>file:target/test-repo</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-artifact</artifactId>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>set</goal>
+ <goal>attach-pom</goal>
+ <goal>attach</goal>
+ <goal>install</goal>
+ <goal>deploy</goal>
+ </goals>
+ <configuration>
+ <mainFile>jars/main.jar</mainFile>
+ <attachedFile>jars/attached.jar</attachedFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>