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

use new jline-less input handler 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@306535 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-10-06 06:00:25 +00:00
parent af1852142b
commit 98d9d94424
7 changed files with 28 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
maven-core-it/README.txt
View File

@ -117,6 +117,7 @@ it0040: Test the use of a packaging from a plugin
it0041: Test the use of a new type from a plugin it0041: Test the use of a new type from a plugin
it0042: Test that the reactor can establish the artifact location of known projects for dependencies it0042: Test that the reactor can establish the artifact location of known projects for dependencies
First test generate sources to see that it works even when they aren't compiled
it0043: Test for repository inheritence - ensure using the same id overrides the defaults it0043: Test for repository inheritence - ensure using the same id overrides the defaults

2
maven-core-it/it0042/goals.txt
View File

@ -1 +1 @@
package generate-sources

14
maven-core/pom.xml
View File

@ -118,15 +118,9 @@
<version>2.0-beta-4-SNAPSHOT</version> <version>2.0-beta-4-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-input-handler</artifactId> <artifactId>plexus-input-handler-api</artifactId>
<version>1.0-alpha-2</version> <version>1.0-alpha-3</version>
<exclusions>
<exclusion>
<artifactId>plexus-container-default</artifactId>
<groupId>plexus</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
@ -172,4 +166,4 @@
<url>scp://minotaur.apache.org//www/maven.apache.org/m2</url> <url>scp://minotaur.apache.org//www/maven.apache.org/m2</url>
</site> </site>
</distributionManagement> </distributionManagement>
</project> </project>

3
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
View File

@ -1135,7 +1135,6 @@ public class DefaultPluginManager
artifacts.add( "classworlds" ); artifacts.add( "classworlds" );
artifacts.add( "commons-cli" ); artifacts.add( "commons-cli" );
artifacts.add( "doxia-sink-api" ); artifacts.add( "doxia-sink-api" );
artifacts.add( "jline" );
artifacts.add( "jsch" ); artifacts.add( "jsch" );
artifacts.add( "maven-artifact" ); artifacts.add( "maven-artifact" );
artifacts.add( "maven-artifact-manager" ); artifacts.add( "maven-artifact-manager" );
@ -1152,7 +1151,7 @@ public class DefaultPluginManager
artifacts.add( "maven-repository-metadata" ); artifacts.add( "maven-repository-metadata" );
artifacts.add( "maven-settings" ); artifacts.add( "maven-settings" );
artifacts.add( "plexus-container-default" ); artifacts.add( "plexus-container-default" );
artifacts.add( "plexus-input-handler" ); artifacts.add( "plexus-input-handler-api" );
artifacts.add( "plexus-utils" ); artifacts.add( "plexus-utils" );
artifacts.add( "wagon-provider-api" ); artifacts.add( "wagon-provider-api" );
artifacts.add( "wagon-file" ); artifacts.add( "wagon-file" );

34
maven-embedder/pom.xml
View File

@ -2,7 +2,7 @@
<parent> <parent>
<artifactId>maven</artifactId> <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<version>2.0-beta-3-SNAPSHOT</version> <version>2.0-beta-3</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
@ -33,7 +33,7 @@
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId> <artifactId>maven-settings</artifactId>
<version>2.0-beta-3-SNAPSHOT</version> <version>2.0-beta-3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
@ -50,22 +50,22 @@
<dependency> <dependency>
<groupId>org.apache.maven.reporting</groupId> <groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId> <artifactId>maven-reporting-api</artifactId>
<version>2.0-beta-3-SNAPSHOT</version> <version>2.0-beta-3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-profile</artifactId> <artifactId>maven-profile</artifactId>
<version>2.0-beta-3-SNAPSHOT</version> <version>2.0-beta-3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId> <artifactId>maven-model</artifactId>
<version>2.0-beta-3-SNAPSHOT</version> <version>2.0-beta-3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId> <artifactId>maven-artifact</artifactId>
<version>2.0-beta-3-SNAPSHOT</version> <version>2.0-beta-3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
@ -75,17 +75,17 @@
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-repository-metadata</artifactId> <artifactId>maven-repository-metadata</artifactId>
<version>2.0-beta-3-SNAPSHOT</version> <version>2.0-beta-3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId> <artifactId>maven-project</artifactId>
<version>2.0-beta-3-SNAPSHOT</version> <version>2.0-beta-3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-registry</artifactId> <artifactId>maven-plugin-registry</artifactId>
<version>2.0-beta-3-SNAPSHOT</version> <version>2.0-beta-3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-cli</groupId> <groupId>commons-cli</groupId>
@ -95,32 +95,32 @@
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId> <artifactId>maven-plugin-api</artifactId>
<version>2.0-beta-3-SNAPSHOT</version> <version>2.0-beta-3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
<version>2.0-beta-3-SNAPSHOT</version> <version>2.0-beta-3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-input-handler</artifactId> <artifactId>plexus-input-handler-api</artifactId>
<version>1.0-alpha-2</version> <version>1.0-alpha-3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-descriptor</artifactId> <artifactId>maven-plugin-descriptor</artifactId>
<version>2.0-beta-3-SNAPSHOT</version> <version>2.0-beta-3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-monitor</artifactId> <artifactId>maven-monitor</artifactId>
<version>2.0-beta-3-SNAPSHOT</version> <version>2.0-beta-3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId> <artifactId>maven-artifact-manager</artifactId>
<version>2.0-beta-3-SNAPSHOT</version> <version>2.0-beta-3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>

6
maven-embedder/src/main/assembly/dep.xml
View File

@ -22,11 +22,6 @@
<exclude>commons-lang:commons-lang</exclude> <exclude>commons-lang:commons-lang</exclude>
<exclude>commons-logging:commons-logging</exclude> <exclude>commons-logging:commons-logging</exclude>
<exclude>commons-cli:commons-cli</exclude> <exclude>commons-cli:commons-cli</exclude>
<!--
I should be able to exclude this because I don't want tool integrators
to have to use this at all ...
<exclude>jline:jline</exclude>
-->
<!-- <!--
| |
| When the embedder API provides deployment options this can be put | When the embedder API provides deployment options this can be put
@ -35,6 +30,7 @@
--> -->
<exclude>jsch:jsch</exclude> <exclude>jsch:jsch</exclude>
<exclude>org.apache.maven.wagon:wagon-ssh</exclude> <exclude>org.apache.maven.wagon:wagon-ssh</exclude>
<!-- TODO: can probably be removed now -->
<exclude>plexus:plexus-container-default</exclude> <exclude>plexus:plexus-container-default</exclude>
</excludes> </excludes>
</dependencySet> </dependencySet>

6
maven-plugins/maven-release-plugin/pom.xml
View File

@ -26,8 +26,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>plexus</groupId> <groupId>plexus</groupId>
<artifactId>plexus-input-handler</artifactId> <artifactId>plexus-input-handler-api</artifactId>
<version>1.0-alpha-2</version> <version>1.0-alpha-3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven.scm</groupId> <groupId>org.apache.maven.scm</groupId>
@ -55,4 +55,4 @@
<version>1.0-alpha-2</version> <version>1.0-alpha-2</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>