continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r935925 - in /continuum/trunk: continuum-core/pom.xml continuum-core/src/main/resources/META-INF/plexus/components-fragment.xml continuum-core/src/main/resources/META-INF/plexus/components.xml pom.xml
Date Tue, 20 Apr 2010 13:58:37 GMT
Author: brett
Date: Tue Apr 20 13:58:37 2010
New Revision: 935925

URL: http://svn.apache.org/viewvc?rev=935925&view=rev
Log:
fix descriptor handling so unit tests run in IDEA

Added:
    continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components-fragment.xml
  (contents, props changed)
      - copied, changed from r935833, continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
Removed:
    continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
Modified:
    continuum/trunk/continuum-core/pom.xml
    continuum/trunk/pom.xml

Modified: continuum/trunk/continuum-core/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/pom.xml?rev=935925&r1=935924&r2=935925&view=diff
==============================================================================
--- continuum/trunk/continuum-core/pom.xml (original)
+++ continuum/trunk/continuum-core/pom.xml Tue Apr 20 13:58:37 2010
@@ -282,20 +282,21 @@ under the License.
         <executions>
           <execution>
             <id>generate</id>
+            <phase>generate-resources</phase>
             <goals>
               <goal>descriptor</goal>
             </goals>
           </execution>
           <execution>
             <id>merge</id>
-            <!--
+            <phase>process-resources</phase>
             <configuration>
               <descriptors>
-                <descriptor>${basedir}/src/main/resources/META-INF/plexus/components.xml</descriptor>
-                <descriptor>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+                <descriptor>${basedir}/src/main/resources/META-INF/plexus/components-fragment.xml</descriptor>
+                <descriptor>${project.build.outputDirectory}/META-INF/plexus/components.xml</descriptor>
               </descriptors>
+              <output>${project.build.outputDirectory}/META-INF/plexus/components.xml</output>
             </configuration>
-            -->
             <goals>
               <goal>merge-descriptors</goal>
             </goals>

Copied: continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components-fragment.xml
(from r935833, continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml)
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components-fragment.xml?p2=continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components-fragment.xml&p1=continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml&r1=935833&r2=935925&rev=935925&view=diff
==============================================================================
    (empty)

Propchange: continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components-fragment.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components-fragment.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/pom.xml?rev=935925&r1=935924&r2=935925&view=diff
==============================================================================
--- continuum/trunk/pom.xml (original)
+++ continuum/trunk/pom.xml Tue Apr 20 13:58:37 2010
@@ -126,7 +126,7 @@ under the License.
         <plugin>
           <groupId>org.codehaus.plexus</groupId>
           <artifactId>plexus-maven-plugin</artifactId>
-          <version>1.3.4</version>
+          <version>1.3.8</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.modello</groupId>



Mime
View raw message