maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r894184 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-4275/ resources/mng-4275/dependencies/ resources/mng-4275/project/ resources/mng-4275/repo/ resources/mng-4275/repo/org/ reso...
Date Mon, 28 Dec 2009 15:17:32 GMT
Author: bentmann
Date: Mon Dec 28 15:17:30 2009
New Revision: 894184

URL: http://svn.apache.org/viewvc?rev=894184&view=rev
Log:
o Decoupled IT from production plugins

Added:
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/pom.xml
  (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocated/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocated/1/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocated/1/relocated-1.jar
  (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocated/1/relocated-1.pom
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocated/maven-metadata.xml
  (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocation/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocation/1/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocation/1/relocation-1.jar
  (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocation/1/relocation-1.pom
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocation/maven-metadata.xml
  (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/settings-template.xml
  (with props)
Removed:
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/dependencies/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/project/
Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java?rev=894184&r1=894183&r2=894184&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java
Mon Dec 28 15:17:30 2009
@@ -36,34 +36,29 @@
 
     public MavenITmng4275RelocationWarningTest()
     {
-        super( "[2.0,2.0.9),[2.2.1,)" );
+        super( "[2.0,2.0.9),[2.2.1,3.0-alpha-1),[3.0-alpha-3,)" );
     }
 
+    /**
+     * Verify that relocations are logged (at warning level).
+     */
     public void testit()
         throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4275"
);
-        File depsDir = new File( testDir, "dependencies" );
-        File projectDir = new File( testDir, "project" );
 
-        Verifier verifier = new Verifier( depsDir.getAbsolutePath() );
-        
-        verifier.deleteArtifacts( "org.apache.maven.it.mng4275" );
-        
-        verifier.executeGoal( "install" );
-        
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-        
-        // now, build the project that depends on the above.
-        verifier = new Verifier( projectDir.getAbsolutePath() );
-        
-        verifier.executeGoal( "install" );
-        
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.setAutoclean( false );
+        verifier.deleteDirectory( "target" );
+        verifier.deleteArtifacts( "org.apache.maven.its.mng4275" );
+        verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties()
);
+        verifier.getCliOptions().add( "--settings" );
+        verifier.getCliOptions().add( "settings.xml" );
+        verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
         
-        List lines = verifier.loadFile( new File( projectDir, verifier.getLogFileName() ),
false );
+        List lines = verifier.loadFile( new File( testDir, verifier.getLogFileName() ), false
);
         boolean foundWarning = false;
         for ( Iterator it = lines.iterator(); it.hasNext(); )
         {
@@ -73,10 +68,10 @@
             {
                 assertTrue(
                             "Relocation target should have been logged right after warning.",
-                            line.indexOf( "This artifact has been relocated to org.apache.maven.it.mng4275:relocated:1"
) > -1 );
+                            line.indexOf( "This artifact has been relocated to org.apache.maven.its.mng4275:relocated:1"
) > -1 );
                 break;
             }
-            else if ( line.startsWith( "[WARNING] While downloading org.apache.maven.it.mng4275:relocation:1"
) )
+            else if ( line.startsWith( "[WARNING] While downloading org.apache.maven.its.mng4275:relocation:1"
) )
             {
                 foundWarning = true;
             }

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/pom.xml?rev=894184&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/pom.xml
(added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/pom.xml
Mon Dec 28 15:17:30 2009
@@ -0,0 +1,61 @@
+<?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.mng4275</groupId>
+  <artifactId>project</artifactId>
+  <packaging>jar</packaging>
+  <version>1</version>
+
+  <name>Maven Integration Test :: MNG-4275</name>
+  <description>
+    Verify that relocations are logged (at warning level).
+  </description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.its.mng4275</groupId>
+      <artifactId>relocation</artifactId>
+      <version>1</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-dependency-resolution</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocated/1/relocated-1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocated/1/relocated-1.jar?rev=894184&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocated/1/relocated-1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocated/1/relocated-1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocated/1/relocated-1.pom?rev=894184&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocated/1/relocated-1.pom
(added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocated/1/relocated-1.pom
Mon Dec 28 15:17:30 2009
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.mng4275</groupId>
+  <artifactId>relocated</artifactId>
+  <version>1</version>
+  
+  <name>relocated</name>
+</project>

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocated/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocated/maven-metadata.xml?rev=894184&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocated/maven-metadata.xml
(added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocated/maven-metadata.xml
Mon Dec 28 15:17:30 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.apache.maven.its.mng4275</groupId>
+  <artifactId>relocated</artifactId>
+  <version>1</version>
+  <versioning>
+    <versions>
+      <version>1</version>
+    </versions>
+    <lastUpdated>20091228142805</lastUpdated>
+  </versioning>
+</metadata>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocated/maven-metadata.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocated/maven-metadata.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocation/1/relocation-1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocation/1/relocation-1.jar?rev=894184&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocation/1/relocation-1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocation/1/relocation-1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocation/1/relocation-1.pom?rev=894184&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocation/1/relocation-1.pom
(added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocation/1/relocation-1.pom
Mon Dec 28 15:17:30 2009
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.mng4275</groupId>
+  <artifactId>relocation</artifactId>
+  <version>1</version>
+
+  <distributionManagement>
+    <relocation>
+      <groupId>org.apache.maven.its.mng4275</groupId>
+      <artifactId>relocated</artifactId>
+      <version>1</version>
+      <message>Relocation Test!</message>
+    </relocation>
+  </distributionManagement>
+</project>

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocation/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocation/maven-metadata.xml?rev=894184&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocation/maven-metadata.xml
(added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocation/maven-metadata.xml
Mon Dec 28 15:17:30 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.apache.maven.its.mng4275</groupId>
+  <artifactId>relocation</artifactId>
+  <version>1</version>
+  <versioning>
+    <versions>
+      <version>1</version>
+    </versions>
+    <lastUpdated>20091228142804</lastUpdated>
+  </versioning>
+</metadata>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocation/maven-metadata.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/repo/org/apache/maven/its/mng4275/relocation/maven-metadata.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/settings-template.xml?rev=894184&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/settings-template.xml
(added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/settings-template.xml
Mon Dec 28 15:17:30 2009
@@ -0,0 +1,43 @@
+<?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.
+-->
+
+<settings>
+  <profiles>
+    <profile>
+      <id>maven-core-it-repo</id>
+      <repositories>
+        <repository>
+          <id>maven-core-it</id>
+          <url>@baseurl@/repo</url>
+          <releases>
+            <checksumPolicy>ignore</checksumPolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
+  <activeProfiles>
+    <activeProfile>maven-core-it-repo</activeProfile>
+  </activeProfiles>
+</settings>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/settings-template.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4275/settings-template.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision



Mime
View raw message