continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject svn commit: r191374 - in /maven/continuum/trunk: continuum-cc/pom.xml continuum-model/pom.xml continuum-plexus-application/build.sh continuum-plexus-application/pom.xml continuum-plexus-application/src/conf/application.xml continuum-xmlrpc/pom.xml
Date Mon, 20 Jun 2005 01:28:18 GMT
Author: jvanzyl
Date: Sun Jun 19 18:28:17 2005
New Revision: 191374

URL: http://svn.apache.org/viewcvs?rev=191374&view=rev
Log:
o updating the POMs to use plugin/mojo configuration which will be used for
  m2 release.
  

Modified:
    maven/continuum/trunk/continuum-cc/pom.xml
    maven/continuum/trunk/continuum-model/pom.xml
    maven/continuum/trunk/continuum-plexus-application/build.sh
    maven/continuum/trunk/continuum-plexus-application/pom.xml
    maven/continuum/trunk/continuum-plexus-application/src/conf/application.xml
    maven/continuum/trunk/continuum-xmlrpc/pom.xml

Modified: maven/continuum/trunk/continuum-cc/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-cc/pom.xml?rev=191374&r1=191373&r2=191374&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-cc/pom.xml (original)
+++ maven/continuum/trunk/continuum-cc/pom.xml Sun Jun 19 18:28:17 2005
@@ -19,11 +19,13 @@
       <plugin>
         <artifactId>maven-plexus-plugin</artifactId>
         <version>1.1-alpha-3-SNAPSHOT</version>
-        <goals>
-          <goal>
-            <id>descriptor</id>
-          </goal>
-        </goals>
+        <executions>
+          <execution>
+            <goals>
+              <goal>descriptor</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>

Modified: maven/continuum/trunk/continuum-model/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/pom.xml?rev=191374&r1=191373&r2=191374&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-model/pom.xml (original)
+++ maven/continuum/trunk/continuum-model/pom.xml Sun Jun 19 18:28:17 2005
@@ -17,8 +17,16 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jpox-plugin</artifactId>
         <version>1.0-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>enhance</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.codehaus.modello</groupId>
@@ -29,22 +37,15 @@
           <packageWithVersion>false</packageWithVersion>
           <model>src/main/resources/continuum.mdo</model>
         </configuration>
-        <goals>
-          <goal>
-            <id>java</id>
-          </goal>
-          <goal>
-            <id>jpox-jdo-mapping</id>
-            <configuration>
-              <outputDirectory>target/classes</outputDirectory>
-            </configuration>
-          </goal>
-          <goal>
-            <id>jpox-store</id>
-            <configuration>
-            </configuration>
-          </goal>
-        </goals>
+        <executions>
+          <execution>
+            <goals>
+              <goal>java</goal>
+              <goal>jpox-jdo-mapping</goal>
+              <goal>jpox-store</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>

Modified: maven/continuum/trunk/continuum-plexus-application/build.sh
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-plexus-application/build.sh?rev=191374&r1=191373&r2=191374&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-plexus-application/build.sh (original)
+++ maven/continuum/trunk/continuum-plexus-application/build.sh Sun Jun 19 18:28:17 2005
@@ -1 +1 @@
-m2 clean:clean package plexus:bundle-application plexus:test-runtime "$@"
+m2 -o clean:clean package plexus:bundle-application plexus:test-runtime "$@"

Modified: maven/continuum/trunk/continuum-plexus-application/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-plexus-application/pom.xml?rev=191374&r1=191373&r2=191374&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-plexus-application/pom.xml (original)
+++ maven/continuum/trunk/continuum-plexus-application/pom.xml Sun Jun 19 18:28:17 2005
@@ -132,31 +132,29 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven</groupId>
         <artifactId>maven-plexus-plugin</artifactId>
         <version>1.1-alpha-3-SNAPSHOT</version>
-        <goals>
-          <goal>
-            <id>app</id>
-            <configuration>
-              <applicationConfiguration>src/conf/application.xml</applicationConfiguration>
-              <configurationsDirectory>src/conf</configurationsDirectory>
-              <configurationProperties>app.properties</configurationProperties>
-              <applicationName>continuum</applicationName>
-            </configuration>
-          </goal>
-          <goal>
-            <id>bundle-runtime</id>
-          </goal>
-          <goal>
-            <id>test-runtime</id>
-            <configuration>
-              <testRuntimeConfiguration>src/test/conf/test-runtime-configuration.xml</testRuntimeConfiguration>
-              <testRuntimeConfigurationProperties>app.properties</testRuntimeConfigurationProperties>
-            </configuration>
-          </goal>
-        </goals>
+        <configuration>
+          <applicationConfiguration>src/conf/application.xml</applicationConfiguration>
+          <configurationsDirectory>src/conf</configurationsDirectory>
+          <configurationProperties>app.properties</configurationProperties>
+          <applicationName>continuum</applicationName>
+          <testRuntimeConfiguration>src/test/conf/test-runtime-configuration.xml</testRuntimeConfiguration>
+          <testRuntimeConfigurationProperties>app.properties</testRuntimeConfigurationProperties>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>app</goal>
+              <goal>bundle-runtime</goal>
+              <goal>test-runtime</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <version>2.0-alpha-1</version>
         <configuration>
@@ -164,6 +162,11 @@
           <!-- TODO: isn't this the default? if not, can we use the ${pom.} expression?
-->
           <finalName>continuum-1.0-alpha-3-SNAPSHOT</finalName>
         </configuration>
+        <executions>
+          <goals>
+            <goal>assembly</goal>
+          </goals>
+        </executions>
       </plugin>
     </plugins>
   </build>

Modified: maven/continuum/trunk/continuum-plexus-application/src/conf/application.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-plexus-application/src/conf/application.xml?rev=191374&r1=191373&r2=191374&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-plexus-application/src/conf/application.xml (original)
+++ maven/continuum/trunk/continuum-plexus-application/src/conf/application.xml Sun Jun 19
18:28:17 2005
@@ -112,59 +112,6 @@
     </component>
 
     <!--
-    | The irc notifier
-    |-->
-    <component>
-      <role>org.codehaus.plexus.notification.notifier.Notifier</role>
-      <role-hint>irc</role-hint>
-      <implementation>org.apache.maven.continuum.notification.irc.IrcContinuumNotifier</implementation>
-      <requirements>
-        <requirement>
-          <role>org.codehaus.plexus.ircbot.IrcBot</role>
-          <role-hint>client</role-hint>
-        </requirement>
-      </requirements>
-    </component>
-
-    <!--
-    | The jabber notifier
-    |-->
-    <component>
-      <role>org.codehaus.plexus.notification.notifier.Notifier</role>
-      <role-hint>jabber</role-hint>
-      <implementation>org.apache.maven.continuum.notification.jabber.JabberContinuumNotifier</implementation>
-      <requirements>
-        <requirement>
-          <role>org.codehaus.plexus.jabber.JabberClient</role>
-        </requirement>
-      </requirements>
-      <!-- configuration>
-        <from-address/>
-        <from-password/>
-        <host/>
-        <port/>
-      </configuration -->
-    </component>
-
-    <!--
-    | The MSN notifier
-    |-->
-    <component>
-      <role>org.codehaus.plexus.notification.notifier.Notifier</role>
-      <role-hint>msn</role-hint>
-      <implementation>org.apache.maven.continuum.notification.msn.MsnContinuumNotifier</implementation>
-      <requirements>
-        <requirement>
-          <role>org.codehaus.plexus.msn.MsnClient</role>
-        </requirement>
-      </requirements>
-      <!-- configuration>
-        <from-address/>
-        <from-password/>
-      </configuration -->
-    </component>
-
-    <!--
     | The alarm trigger
     |-->
     <component>

Modified: maven/continuum/trunk/continuum-xmlrpc/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-xmlrpc/pom.xml?rev=191374&r1=191373&r2=191374&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-xmlrpc/pom.xml (original)
+++ maven/continuum/trunk/continuum-xmlrpc/pom.xml Sun Jun 19 18:28:17 2005
@@ -23,11 +23,13 @@
       <plugin>
         <artifactId>maven-plexus-plugin</artifactId>
         <version>1.1-alpha-3-SNAPSHOT</version>
-        <goals>
-          <goal>
-            <id>descriptor</id>
-          </goal>
-        </goals>
+        <executions>
+          <execution>
+            <goals>
+              <goal>descriptor</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>



Mime
View raw message