continuum-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Emmanuel Venisse <emman...@venisse.net>
Subject Re: svn commit: r498659 - in /maven/continuum/trunk: ./ continuum-plexus-application/ continuum-plexus-runtime/ continuum-release/ continuum-store/src/test/java/org/apache/maven/continuum/store/ continuum-webapp/
Date Mon, 22 Jan 2007 15:59:35 GMT
I wanted to test modello-aplha-14 (MODELLO-80) with maven-2.0.5 before to use this patch

Emmanuel

jvanzyl@apache.org a écrit :
> Author: jvanzyl
> Date: Mon Jan 22 07:46:49 2007
> New Revision: 498659
> 
> URL: http://svn.apache.org/viewvc?view=rev&rev=498659
> Log:
> CONTINUUM-1101 Updating continuum to the lastest app server
> Submitted by: Andy Williams
> 
> Modified:
>     maven/continuum/trunk/continuum-plexus-application/pom.xml
>     maven/continuum/trunk/continuum-plexus-runtime/pom.xml
>     maven/continuum/trunk/continuum-release/pom.xml
>     maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTestCase.java
>     maven/continuum/trunk/continuum-webapp/pom.xml
>     maven/continuum/trunk/pom.xml
> 
> Modified: maven/continuum/trunk/continuum-plexus-application/pom.xml
> URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-plexus-application/pom.xml?view=diff&rev=498659&r1=498658&r2=498659
> ==============================================================================
> --- maven/continuum/trunk/continuum-plexus-application/pom.xml (original)
> +++ maven/continuum/trunk/continuum-plexus-application/pom.xml Mon Jan 22 07:46:49 2007
> @@ -32,7 +32,7 @@
>        <plugin>
>          <groupId>org.codehaus.plexus</groupId>
>          <artifactId>plexus-appserver-maven-plugin</artifactId>
> -        <version>2.0-alpha-5</version>
> +        <version>2.0-alpha-7-SNAPSHOT</version>
>          <extensions>true</extensions>
>          <configuration>
>            <applicationConfiguration>src/conf/application.xml</applicationConfiguration>
> 
> Modified: maven/continuum/trunk/continuum-plexus-runtime/pom.xml
> URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-plexus-runtime/pom.xml?view=diff&rev=498659&r1=498658&r2=498659
> ==============================================================================
> --- maven/continuum/trunk/continuum-plexus-runtime/pom.xml (original)
> +++ maven/continuum/trunk/continuum-plexus-runtime/pom.xml Mon Jan 22 07:46:49 2007
> @@ -39,13 +39,13 @@
>      <dependency>
>        <groupId>org.codehaus.plexus</groupId>
>        <artifactId>plexus-appserver-host</artifactId>
> -      <version>2.0-alpha-5</version>
> +      <version>2.0-alpha-7-SNAPSHOT</version>
>      </dependency>
>      <!-- Services -->
>      <dependency>
>        <groupId>org.codehaus.plexus</groupId>
>        <artifactId>plexus-appserver-service-jetty</artifactId>
> -      <version>2.0-alpha-5</version>
> +      <version>2.0-alpha-7-SNAPSHOT</version>
>        <type>plexus-service</type>
>      </dependency>
>      <!-- Plexus applications -->
> @@ -90,7 +90,7 @@
>        <plugin>
>          <groupId>org.codehaus.plexus</groupId>
>          <artifactId>plexus-appserver-maven-plugin</artifactId>
> -        <version>2.0-alpha-5</version>
> +        <version>2.0-alpha-7-SNAPSHOT</version>
>          <extensions>true</extensions>
>          <executions>
>            <execution>
> 
> Modified: maven/continuum/trunk/continuum-release/pom.xml
> URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/pom.xml?view=diff&rev=498659&r1=498658&r2=498659
> ==============================================================================
> --- maven/continuum/trunk/continuum-release/pom.xml (original)
> +++ maven/continuum/trunk/continuum-release/pom.xml Mon Jan 22 07:46:49 2007
> @@ -63,6 +63,12 @@
>        <groupId>org.apache.maven.release</groupId>
>        <artifactId>maven-release-manager</artifactId>
>        <version>1.0-SNAPSHOT</version>
> +      <exclusions>
> +        <exclusion>
> +          <groupId>classworlds</groupId>
> +          <artifactId>classworlds</artifactId>
> +        </exclusion>
> +      </exclusions>
>      </dependency>
>      <dependency>
>        <groupId>org.codehaus.plexus</groupId>
> 
> Modified: maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTestCase.java
> URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTestCase.java?view=diff&rev=498659&r1=498658&r2=498659
> ==============================================================================
> --- maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTestCase.java
(original)
> +++ maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTestCase.java
Mon Jan 22 07:46:49 2007
> @@ -430,6 +430,8 @@
>      {
>          super.tearDown();
>  
> +        store.eraseDatabase();
> +
>          store.closeStore();
>      }
>  
> 
> Modified: maven/continuum/trunk/continuum-webapp/pom.xml
> URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/pom.xml?view=diff&rev=498659&r1=498658&r2=498659
> ==============================================================================
> --- maven/continuum/trunk/continuum-webapp/pom.xml (original)
> +++ maven/continuum/trunk/continuum-webapp/pom.xml Mon Jan 22 07:46:49 2007
> @@ -253,7 +253,7 @@
>      <dependency>
>        <groupId>org.codehaus.plexus</groupId>
>        <artifactId>plexus-xwork-integration</artifactId>
> -      <version>1.0-alpha-3</version>
> +      <version>1.0-alpha-5-SNAPSHOT</version>
>      </dependency>
>      <dependency>
>        <groupId>javax.servlet</groupId>
> 
> Modified: maven/continuum/trunk/pom.xml
> URL: http://svn.apache.org/viewvc/maven/continuum/trunk/pom.xml?view=diff&rev=498659&r1=498658&r2=498659
> ==============================================================================
> --- maven/continuum/trunk/pom.xml (original)
> +++ maven/continuum/trunk/pom.xml Mon Jan 22 07:46:49 2007
> @@ -140,8 +140,13 @@
>      </dependency>
>      <dependency>
>        <groupId>org.codehaus.plexus</groupId>
> +      <artifactId>plexus-component-api</artifactId>
> +      <version>1.0-alpha-16-SNAPSHOT</version>
> +    </dependency>
> +    <dependency>
> +      <groupId>org.codehaus.plexus</groupId>
>        <artifactId>plexus-container-default</artifactId>
> -      <version>1.0-alpha-10</version>
> +      <version>1.0-alpha-16-SNAPSHOT</version>
>      </dependency>
>    </dependencies>
>    <dependencyManagement>
> @@ -150,6 +155,12 @@
>          <groupId>org.apache.maven</groupId>
>          <artifactId>maven-core</artifactId>
>          <version>${maven.version}</version>
> +        <exclusions>
> +          <exclusion>
> +            <groupId>classworlds</groupId>
> +            <artifactId>classworlds</artifactId>
> +          </exclusion>
> +        </exclusions>
>        </dependency>
>        <dependency>
>          <groupId>org.apache.maven</groupId>
> @@ -393,7 +404,7 @@
>        <dependency>
>          <groupId>org.codehaus.plexus</groupId>
>          <artifactId>plexus-utils</artifactId>
> -        <version>1.3</version>
> +        <version>1.4</version>
>        </dependency>
>        <dependency>
>          <groupId>org.codehaus.plexus</groupId>
> @@ -404,23 +415,11 @@
>          <groupId>org.codehaus.plexus</groupId>
>          <artifactId>plexus-formica</artifactId>
>          <version>1.0-beta-13-SNAPSHOT</version>
> -        <exclusions>
> -          <exclusion>
> -            <groupId>org.codehaus.plexus</groupId>
> -            <artifactId>plexus-component-api</artifactId>
> -          </exclusion>
> -        </exclusions>
>        </dependency>
>        <dependency>
>          <groupId>org.codehaus.plexus</groupId>
>          <artifactId>plexus-velocity</artifactId>
> -        <version>1.1.3</version>
> -        <exclusions>
> -          <exclusion>
> -            <groupId>plexus</groupId>
> -            <artifactId>plexus-utils</artifactId>
> -          </exclusion>
> -        </exclusions>
> +        <version>1.1.4</version>
>        </dependency>
>        <dependency>
>          <groupId>org.codehaus.plexus</groupId>
> 
> 
> 
> 
> 


Mime
View raw message