Author: jvanzyl
Date: Sun Dec 14 11:51:59 2008
New Revision: 726521
URL: http://svn.apache.org/viewvc?rev=726521&view=rev
Log:
o remove aspectj
o update compat log with CLI changes
o update everything to release versions, we have no snapshots anymore
Modified:
maven/components/trunk/maven-compat/compatibility.cfl
maven/components/trunk/maven-core/pom.xml
maven/components/trunk/maven-embedder/pom.xml
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
maven/components/trunk/maven-project/pom.xml
maven/components/trunk/pom.xml
Modified: maven/components/trunk/maven-compat/compatibility.cfl
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/compatibility.cfl?rev=726521&r1=726520&r2=726521&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/compatibility.cfl (original)
+++ maven/components/trunk/maven-compat/compatibility.cfl Sun Dec 14 11:51:59
2008
@@ -39,3 +39,7 @@
* org.apache.maven.artifact.resolver.metadata.*
* org.apache.maven.artifact.resolver.transform.*
* org.apache.maven.artifact.resolver.versioning.*
+
+h2. Changes to the CLI
+* Log file support has been added i.e mvn -l log.txt clean install
+* Plugin registry option has not been supported in the core and it lagged
around in the CLI
\ No newline at end of file
Modified: maven/components/trunk/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=726521&r1=726520&r2=726521&view=diff
==============================================================================
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Sun Dec 14 11:51:59 2008
@@ -111,8 +111,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-model</artifactId>
+ <groupId>org.sonatype.spice</groupId>
+ <artifactId>model-builder</artifactId>
</dependency>
</dependencies>
<build>
Modified: maven/components/trunk/maven-embedder/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?rev=726521&r1=726520&r2=726521&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Sun Dec 14 11:51:59 2008
@@ -56,11 +56,6 @@
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
</dependency>
- <!-- Needed for compat and cache-control aspects. -->
- <dependency>
- <groupId>aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- </dependency>
<dependency>
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java?rev=726521&r1=726520&r2=726521&view=diff
==============================================================================
---
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
(original)
+++
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
Sun Dec 14 11:51:59 2008
@@ -148,10 +148,9 @@
List<ModelProperty> transformedProperties = new
ArrayList<ModelProperty>();
for ( ModelProperty mp : managementContainer.getProperties() )
{
- if ( mp.getUri().startsWith(
ProjectUri.DependencyManagement.xUri ) )
+ if ( mp.getUri().startsWith(
ProjectUri.Build.PluginManagement.xUri ) )
{
- transformedProperties.add( new ModelProperty(
- mp.getUri().replace(
ProjectUri.DependencyManagement.xUri, ProjectUri.xUri ), mp.getResolvedValue()
) );
+ transformedProperties.add( new ModelProperty(
mp.getUri().replace( ProjectUri.Build.PluginManagement.xUri,
ProjectUri.Build.xUri ), mp.getResolvedValue() ) );
}
}
Modified: maven/components/trunk/maven-project/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/pom.xml?rev=726521&r1=726520&r2=726521&view=diff
==============================================================================
--- maven/components/trunk/maven-project/pom.xml (original)
+++ maven/components/trunk/maven-project/pom.xml Sun Dec 14 11:51:59 2008
@@ -53,10 +53,6 @@
<artifactId>plexus-container-default</artifactId>
</dependency>
<dependency>
- <groupId>aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
<scope>test</scope>
@@ -66,8 +62,8 @@
<artifactId>wstx-asl</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-model</artifactId>
+ <groupId>org.sonatype.spice</groupId>
+ <artifactId>model-builder</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Modified: maven/components/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=726521&r1=726520&r2=726521&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Sun Dec 14 11:51:59 2008
@@ -42,6 +42,23 @@
</description>
<url>http://maven.apache.org/</url>
<inceptionYear>2001</inceptionYear>
+ <properties>
+ <classWorldsVersion>1.3</classWorldsVersion>
+ <commonsCliVersion>1.0</commonsCliVersion>
+ <doxiaVersion>1.0-alpha-9</doxiaVersion>
+ <easyMockVersion>1.2_Java1.3</easyMockVersion>
+ <junitVersion>3.8.1</junitVersion>
+ <plexusVersion>1.0-beta-3.0.1</plexusVersion>
+ <plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
+ <plexusInterpolationVersion>1.1</plexusInterpolationVersion>
+ <plexusPluginManagerVersion>1.0-alpha-1</plexusPluginManagerVersion>
+ <plexusUtilsVersion>1.5.5</plexusUtilsVersion>
+ <wagonVersion>1.0-beta-4</wagonVersion>
+ <modelBuilderVersion>1.0</modelBuilderVersion>
+ <mercuryVersion>1.0.0-alpha-2</mercuryVersion>
+ <woodstoxVersion>3.2.6</woodstoxVersion>
+ <modelloVersion>1.0-alpha-22</modelloVersion>
+ </properties>
<issueManagement>
<system>jira</system>
<url>http://jira.codehaus.org/browse/MNG</url>
@@ -156,15 +173,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>aspectj-maven-plugin</artifactId>
- <version>1.0-beta-2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<tagBase>https://svn.apache.org/repos/asf/maven/components/tags</tagBase>
@@ -246,23 +254,6 @@
<module>maven-toolchain</module>
<module>maven-compat</module>
</modules>
- <properties>
- <aspectjVersion>1.5.3</aspectjVersion>
- <classWorldsVersion>1.3</classWorldsVersion>
- <commonsCliVersion>1.0</commonsCliVersion>
- <doxiaVersion>1.0-alpha-9</doxiaVersion>
- <easyMockVersion>1.2_Java1.3</easyMockVersion>
- <junitVersion>3.8.1</junitVersion>
- <plexusVersion>1.0-beta-3.0.1</plexusVersion>
- <plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
- <plexusInterpolationVersion>1.1</plexusInterpolationVersion>
- <plexusUtilsVersion>1.5.5</plexusUtilsVersion>
- <wagonVersion>1.0-beta-4</wagonVersion>
- <mavenSharedModel>1.0-SNAPSHOT</mavenSharedModel>
- <mercuryVersion>1.0.0-alpha-2</mercuryVersion>
- <woodstoxVersion>3.2.6</woodstoxVersion>
- <modelloVersion>1.0-alpha-22</modelloVersion>
- </properties>
<!--start-->
<dependencies>
<dependency>
@@ -404,9 +395,9 @@
</dependency>
<!-- Maven Shared -->
<dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-model</artifactId>
- <version>${mavenSharedModel}</version>
+ <groupId>org.sonatype.spice</groupId>
+ <artifactId>model-builder</artifactId>
+ <version>${modelBuilderVersion}</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
@@ -440,16 +431,10 @@
<artifactId>mercury-external</artifactId>
<version>${mercuryVersion}</version>
</dependency>
- <!-- Needed for backward compat aspect. -->
- <dependency>
- <groupId>aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <version>${aspectjVersion}</version>
- </dependency>
<dependency>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-plugin-manager</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${plexusPluginManagerVersion}</version>
</dependency>
<!--start-->
<dependency>
