Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o remove aspectj 

o update compat log with CLI changes
o update everything to release versions, we have no snapshots anymore


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726521 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2008-12-14 19:51:59 +00:00
parent a5ab9893ad
commit 6d5eab14f6
6 changed files with 31 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maven-compat/compatibility.cfl
View File

@ -39,3 +39,7 @@ h3. Unsupported Compatibility
* org.apache.maven.artifact.resolver.metadata.* * org.apache.maven.artifact.resolver.metadata.*
* org.apache.maven.artifact.resolver.transform.* * org.apache.maven.artifact.resolver.transform.*
* org.apache.maven.artifact.resolver.versioning.* * 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

4
maven-core/pom.xml
View File

@ -111,8 +111,8 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven.shared</groupId> <groupId>org.sonatype.spice</groupId>
<artifactId>maven-shared-model</artifactId> <artifactId>model-builder</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>

5
maven-embedder/pom.xml
View File

@ -56,11 +56,6 @@
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId> <artifactId>wagon-file</artifactId>
</dependency> </dependency>
<!-- Needed for compat and cache-control aspects. -->
<dependency>
<groupId>aspectj</groupId>
<artifactId>aspectjrt</artifactId>
</dependency>
<dependency> <dependency>
<groupId>easymock</groupId> <groupId>easymock</groupId>
<artifactId>easymock</artifactId> <artifactId>easymock</artifactId>

5
maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
View File

@ -148,10 +148,9 @@ public class PomTransformer
List<ModelProperty> transformedProperties = new ArrayList<ModelProperty>(); List<ModelProperty> transformedProperties = new ArrayList<ModelProperty>();
for ( ModelProperty mp : managementContainer.getProperties() ) for ( ModelProperty mp : managementContainer.getProperties() )
{ {
if ( mp.getUri().startsWith( ProjectUri.DependencyManagement.xUri ) ) if ( mp.getUri().startsWith( ProjectUri.Build.PluginManagement.xUri ) )
{ {
transformedProperties.add( new ModelProperty( transformedProperties.add( new ModelProperty( mp.getUri().replace( ProjectUri.Build.PluginManagement.xUri, ProjectUri.Build.xUri ), mp.getResolvedValue() ) );
mp.getUri().replace( ProjectUri.DependencyManagement.xUri, ProjectUri.xUri ), mp.getResolvedValue() ) );
} }
} }

8
maven-project/pom.xml
View File

@ -52,10 +52,6 @@ under the License.
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId> <artifactId>plexus-container-default</artifactId>
</dependency> </dependency>
<dependency>
<groupId>aspectj</groupId>
<artifactId>aspectjrt</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId> <artifactId>wagon-file</artifactId>
@ -66,8 +62,8 @@ under the License.
<artifactId>wstx-asl</artifactId> <artifactId>wstx-asl</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven.shared</groupId> <groupId>org.sonatype.spice</groupId>
<artifactId>maven-shared-model</artifactId> <artifactId>model-builder</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>

57
pom.xml
View File

@ -42,6 +42,23 @@ under the License.
</description> </description>
<url>http://maven.apache.org/</url> <url>http://maven.apache.org/</url>
<inceptionYear>2001</inceptionYear> <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> <issueManagement>
<system>jira</system> <system>jira</system>
<url>http://jira.codehaus.org/browse/MNG</url> <url>http://jira.codehaus.org/browse/MNG</url>
@ -155,15 +172,6 @@ under the License.
<target>1.5</target> <target>1.5</target>
</configuration> </configuration>
</plugin> </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> <plugin>
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
<configuration> <configuration>
@ -246,23 +254,6 @@ under the License.
<module>maven-toolchain</module> <module>maven-toolchain</module>
<module>maven-compat</module> <module>maven-compat</module>
</modules> </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--> <!--start-->
<dependencies> <dependencies>
<dependency> <dependency>
@ -404,9 +395,9 @@ under the License.
</dependency> </dependency>
<!-- Maven Shared --> <!-- Maven Shared -->
<dependency> <dependency>
<groupId>org.apache.maven.shared</groupId> <groupId>org.sonatype.spice</groupId>
<artifactId>maven-shared-model</artifactId> <artifactId>model-builder</artifactId>
<version>${mavenSharedModel}</version> <version>${modelBuilderVersion}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.woodstox</groupId> <groupId>org.codehaus.woodstox</groupId>
@ -440,16 +431,10 @@ under the License.
<artifactId>mercury-external</artifactId> <artifactId>mercury-external</artifactId>
<version>${mercuryVersion}</version> <version>${mercuryVersion}</version>
</dependency> </dependency>
<!-- Needed for backward compat aspect. -->
<dependency>
<groupId>aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>${aspectjVersion}</version>
</dependency>
<dependency> <dependency>
<groupId>org.sonatype.plexus</groupId> <groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-plugin-manager</artifactId> <artifactId>plexus-plugin-manager</artifactId>
<version>1.0-SNAPSHOT</version> <version>${plexusPluginManagerVersion}</version>
</dependency> </dependency>
<!--start--> <!--start-->
<dependency> <dependency>