You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/05/29 22:36:37 UTC
svn commit: r780103 - in /maven/components/trunk: maven-core/pom.xml
maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
maven-embedder/pom.xml maven-repository/pom.xml maven-toolchain/pom.xml
Author: jvanzyl
Date: Fri May 29 20:36:34 2009
New Revision: 780103
URL: http://svn.apache.org/viewvc?rev=780103&view=rev
Log:
o if compile time deps are not specified maven will now complain
Modified:
maven/components/trunk/maven-core/pom.xml
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
maven/components/trunk/maven-embedder/pom.xml
maven/components/trunk/maven-repository/pom.xml
maven/components/trunk/maven-toolchain/pom.xml
Modified: maven/components/trunk/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=780103&r1=780102&r2=780103&view=diff
==============================================================================
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Fri May 29 20:36:34 2009
@@ -79,6 +79,10 @@
<artifactId>commons-jxpath</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java?rev=780103&r1=780102&r2=780103&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java Fri May 29 20:36:34 2009
@@ -51,7 +51,6 @@
}
ArtifactFilter scopeFilter = new ScopeArtifactFilter( scope );
- // ArtifactFilter scopeFilter = new AndArtifactFilter( Arrays.asList( new ArtifactFilter[]{ new ScopeArtifactFilter( scope ), new ScopeArtifactFilter( Artifact.SCOPE_SYSTEM ) } ) );
ArtifactFilter filter;
Modified: maven/components/trunk/maven-embedder/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?rev=780103&r1=780102&r2=780103&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Fri May 29 20:36:34 2009
@@ -26,17 +26,41 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-toolchain</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-repository</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model-builder</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId>
</dependency>
@@ -47,8 +71,12 @@
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
Modified: maven/components/trunk/maven-repository/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/pom.xml?rev=780103&r1=780102&r2=780103&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/pom.xml (original)
+++ maven/components/trunk/maven-repository/pom.xml Fri May 29 20:36:34 2009
@@ -51,6 +51,14 @@
<artifactId>plexus-container-default</artifactId>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
<scope>test</scope>
Modified: maven/components/trunk/maven-toolchain/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-toolchain/pom.xml?rev=780103&r1=780102&r2=780103&view=diff
==============================================================================
--- maven/components/trunk/maven-toolchain/pom.xml (original)
+++ maven/components/trunk/maven-toolchain/pom.xml Fri May 29 20:36:34 2009
@@ -1,21 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to you under the Apache License, Version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under
- the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
- OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and
- limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
+ file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
+ governing permissions and limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -37,6 +33,22 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ </dependency>
</dependencies>
<build>
Re: svn commit: r780103 - in /maven/components/trunk: maven-core/pom.xml maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java maven-embedder/pom.xml maven-repository/pom.xml maven-toolchain/pom.xml
Posted by Brett Porter <br...@apache.org>.
On 30/05/2009, at 6:36 AM, jvanzyl@apache.org wrote:
> Author: jvanzyl
> Date: Fri May 29 20:36:34 2009
> New Revision: 780103
>
> URL: http://svn.apache.org/viewvc?rev=780103&view=rev
> Log:
> o if compile time deps are not specified maven will now complain
is this a bootstrap specific change, or change in the repository layer
by flipping compile > runtime scope if it is transitive?
- Brett
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org