maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r941241 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-0956/ resources/mng-0956/repo/org/apache/maven/its/it0081/ resources/mng-0956/repo/org/apache/maven/its/mng0956/ resources/mn...
Date Wed, 05 May 2010 10:59:47 GMT
Author: bentmann
Date: Wed May  5 10:59:47 2010
New Revision: 941241

URL: http://svn.apache.org/viewvc?rev=941241&view=rev
Log:
o Renamed artifact to match issue number

Added:
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/repo/org/apache/maven/its/mng0956/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/repo/org/apache/maven/its/mng0956/component/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/repo/org/apache/maven/its/mng0956/component/0.1/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/repo/org/apache/maven/its/mng0956/component/0.1/component-0.1.jar
  (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/repo/org/apache/maven/its/mng0956/component/0.1/component-0.1.pom
Removed:
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/repo/org/apache/maven/its/it0081/
Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/pom.xml

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java?rev=941241&r1=941240&r2=941241&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java
Wed May  5 10:59:47 2010
@@ -49,7 +49,7 @@ public class MavenITmng0956ComponentInje
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.deleteArtifacts( "org.apache.maven.its.it0081" );
+        verifier.deleteArtifacts( "org.apache.maven.its.mng0956" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties()
);
         verifier.getCliOptions().add( "--settings" );
         verifier.getCliOptions().add( "settings.xml" );
@@ -58,7 +58,7 @@ public class MavenITmng0956ComponentInje
         verifier.resetStreams();
 
         Properties apiProps = verifier.loadProperties( "target/component.properties" );
-        assertEquals( "true", apiProps.getProperty( "org.apache.maven.its.it0081.DefaultComponent"
) );
+        assertEquals( "true", apiProps.getProperty( "org.apache.maven.plugin.coreit.DefaultComponent"
) );
     }
 
 }

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/pom.xml?rev=941241&r1=941240&r2=941241&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/pom.xml
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/pom.xml
Wed May  5 10:59:47 2010
@@ -22,12 +22,12 @@ under the License.
 <project>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.maven.its.it0081</groupId>
+  <groupId>org.apache.maven.its.mng0956</groupId>
   <artifactId>test</artifactId>
   <version>0.1</version>
   <packaging>pom</packaging>
 
-  <name>Maven Integration Test :: it0081</name> 
+  <name>Maven Integration Test :: MNG-956</name> 
   <description>
     Test component injection from project-level plugin dependencies.
   </description>
@@ -54,7 +54,7 @@ under the License.
         <dependencies>
           <!-- load component into plugin realm -->
           <dependency>
-            <groupId>org.apache.maven.its.it0081</groupId>
+            <groupId>org.apache.maven.its.mng0956</groupId>
             <artifactId>component</artifactId>
             <version>0.1</version>
           </dependency>

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/repo/org/apache/maven/its/mng0956/component/0.1/component-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/repo/org/apache/maven/its/mng0956/component/0.1/component-0.1.jar?rev=941241&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/repo/org/apache/maven/its/mng0956/component/0.1/component-0.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/repo/org/apache/maven/its/mng0956/component/0.1/component-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/repo/org/apache/maven/its/mng0956/component/0.1/component-0.1.pom?rev=941241&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/repo/org/apache/maven/its/mng0956/component/0.1/component-0.1.pom
(added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/repo/org/apache/maven/its/mng0956/component/0.1/component-0.1.pom
Wed May  5 10:59:47 2010
@@ -0,0 +1,71 @@
+<?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.it0081</groupId>
+  <artifactId>component</artifactId>
+  <version>0.1</version>
+  <packaging>jar</packaging>
+
+  <distributionManagement>
+    <repository>
+      <id>maven-core-it</id>
+      <url>file:///${basedir}/repo</url>
+    </repository>
+  </distributionManagement>
+
+  <properties>
+    <maven.test.skip>true</maven.test.skip>
+  </properties>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>pom.xml</include>
+          <include>src/**</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-maven-plugin</artifactId>
+        <version>1.3.8</version>
+        <executions>
+          <execution>
+            <id>create-component-descriptor</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>descriptor</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>



Mime
View raw message