Author: jvanzyl
Date: Tue Oct 4 06:29:49 2005
New Revision: 293602
URL: http://svn.apache.org/viewcvs?rev=293602&view=rev
Log:
o fixing assembly so that old p-d-c is not imported
o adding metadata of maven-core for the runtime info component
Added:
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/org.apache.maven/
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/org.apache.maven/maven-core/
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/org.apache.maven/maven-core/pom.properties
(with props)
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/org.apache.maven/maven-core/pom.xml
(with props)
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/plugin-expressions/
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/plugin-expressions/project.paramdoc.xml
(with props)
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/plugin-expressions/rootless.paramdoc.xml
(with props)
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/plugin-expressions/settings.paramdoc.xml
(with props)
Modified:
maven/components/trunk/maven-embedder/pom.xml
maven/components/trunk/maven-embedder/src/main/assembly/dep.xml
Modified: maven/components/trunk/maven-embedder/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/pom.xml?rev=293602&r1=293601&r2=293602&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Tue Oct 4 06:29:49 2005
@@ -22,13 +22,13 @@
</build>
<dependencies>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </dependency>
+ <dependency>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Modified: maven/components/trunk/maven-embedder/src/main/assembly/dep.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/src/main/assembly/dep.xml?rev=293602&r1=293601&r2=293602&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/assembly/dep.xml (original)
+++ maven/components/trunk/maven-embedder/src/main/assembly/dep.xml Tue Oct 4
06:29:49 2005
@@ -34,7 +34,8 @@
|
-->
<exclude>jsch:jsch</exclude>
- <exclude>org.apache.maven.wagon:wagon-ssh</exclude>
+ <exclude>org.apache.maven.wagon:wagon-ssh</exclude>
+ <exclude>plexus:plexus-container-default</exclude>
</excludes>
</dependencySet>
</dependencySets>
Added:
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/org.apache.maven/maven-core/pom.properties
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/org.apache.maven/maven-core/pom.properties?rev=293602&view=auto
==============================================================================
---
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/org.apache.maven/maven-core/pom.properties
(added)
+++
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/org.apache.maven/maven-core/pom.properties
Tue Oct 4 06:29:49 2005
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Tue Oct 04 07:18:34 GMT-05:00 2005
+version=2.0-beta-3-SNAPSHOT
+groupId=org.apache.maven
+artifactId=maven-core
Propchange:
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/org.apache.maven/maven-core/pom.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/org.apache.maven/maven-core/pom.properties
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/org.apache.maven/maven-core/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/org.apache.maven/maven-core/pom.xml?rev=293602&view=auto
==============================================================================
---
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/org.apache.maven/maven-core/pom.xml
(added)
+++
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/org.apache.maven/maven-core/pom.xml
Tue Oct 4 06:29:49 2005
@@ -0,0 +1,174 @@
+<project>
+ <parent>
+ <artifactId>maven</artifactId>
+ <groupId>org.apache.maven</groupId>
+ <version>2.0-beta-3-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <name>Maven</name>
+ <version>2.0-beta-3-SNAPSHOT</version>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptor>src/assemble/bin.xml</descriptor>
+ <finalName>maven-${version}</finalName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <version>2.0-beta-3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-file</artifactId>
+ <version>1.0-alpha-4</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
+ <version>1.0-alpha-4</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
+ <version>2.0-beta-3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-profile</artifactId>
+ <version>2.0-beta-3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>2.0-beta-3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0-beta-3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <version>1.0-alpha-4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-repository-metadata</artifactId>
+ <version>2.0-beta-3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0-beta-3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-registry</artifactId>
+ <version>2.0-beta-3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0-beta-3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-parameter-documenter</artifactId>
+ <version>2.0-beta-3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-lang</artifactId>
+ <groupId>commons-lang</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-descriptor</artifactId>
+ <version>2.0-beta-3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>plexus</groupId>
+ <artifactId>plexus-input-handler</artifactId>
+ <version>1.0-alpha-2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ <version>2.0-beta-3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-monitor</artifactId>
+ <version>2.0-beta-3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>jsch</groupId>
+ <artifactId>jsch</artifactId>
+ <version>0.1.21</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>1.0-alpha-4</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clover-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+ <distributionManagement>
+ <site>
+ <id>website</id>
+ <url>scp://minotaur.apache.org//www/maven.apache.org/m2</url>
+ </site>
+ </distributionManagement>
+</project>
Propchange:
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/org.apache.maven/maven-core/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/org.apache.maven/maven-core/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/plugin-expressions/project.paramdoc.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/plugin-expressions/project.paramdoc.xml?rev=293602&view=auto
==============================================================================
---
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/plugin-expressions/project.paramdoc.xml
(added)
+++
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/plugin-expressions/project.paramdoc.xml
Tue Oct 4 06:29:49 2005
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<paramdoc 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
../../../../../../../maven-plugin-parameter-documenter/target/generated-site/xsd/paramdoc-1.0.0.xsd
">
+<expressions>
+ <expression>
+ <syntax>project.distributionManagementArtifactRepository</syntax>
+ <configuration>
+ <![CDATA[
+<distributionManagement>
+ <!-- use the following if you're not using a snapshot version. -->
+ <repository>
+ <id>repo</id>
+ <name>Repository Name</name>
+ <url>scp://host/path/to/repo</url>
+ </repository>
+ <!-- use the following if you ARE using a snapshot version. -->
+ <snapshotRepository>
+ <id>repo</id>
+ <name>Repository Name</name>
+ <url>scp://host/path/to/repo</url>
+ </snapshotRepository>
+</distributionManagement>
+ ]]></configuration>
+ <description> This is the ArtifactRepository used to deploy artifacts
built by this
+ Maven.
+ </description>
+ </expression>
+ <expression>
+ <syntax>project.artifact</syntax>
+ <configuration>
+ <![CDATA[
+<groupId>project.group</groupId>
+<artifactId>project-artifact</artifactId>
+<version>0.0.0.0</version>
+<packaging>type</packaging>
+ ]]></configuration>
+ <description> This is the Artifact instance created from the essential
project
+ attributes: groupId, artifactId, version, and packaging (with a default
packaging of
+ 'jar').
+ </description>
+ </expression>
+ <expression>
+ <syntax>project.parent</syntax>
+ <configuration>
+ <![CDATA[
+<parent>
+ <groupId>project.group</groupId>
+ <artifactId>project-artifact</artifactId>
+ <version>0.0.0.0</version>
+</parent>
+ ]]></configuration>
+ <description> This is the MavenProject instance for the parent of the
current POM.
+ </description>
+ </expression>
+ <expression>
+ <syntax>project.file</syntax>
+ <description> This is the File instance that refers to the location of the
current POM on
+ disk.
+ </description>
+ </expression>
+ <expression>
+ <syntax>project.artifacts</syntax>
+ <configuration>
+ <![CDATA[
+<dependencies>
+ ...
+</dependencies>
+ ]]></configuration>
+ <description>
+ <![CDATA[
+ This is a set of Artifact instances resolved from the set of
dependencies for
+ the current project.
+
+ NOTE: This will likely contain much more than the direct dependencies of
the
+ current POM, since Maven uses transitive, or chained, dependency
resolution.
+ ]]></description>
+ </expression>
+ <expression>
+ <syntax>project.parentArtifact</syntax>
+ <configuration>
+ <![CDATA[
+ <parent>
+ <groupId>project.group</groupId>
+ <artifactId>project-artifact</artifactId>
+ <version>0.0.0.0</version>
+ </parent>
+ ]]></configuration>
+ <description> This is the Artifact instance for the parent of the current
POM.
+ </description>
+ </expression>
+ <expression>
+ <syntax>project.pluginArtifacts</syntax>
+ <configuration>
+ <![CDATA[
+<build>
+ <plugins>
+ ...
+ </plugins>
+</build>
+ ]]></configuration>
+ <description>
+ <![CDATA[
+ This is the list of Artifact instances for plugins used in the current
build
+ for this project.
+
+ NOTE: This list may contain plugin Artifacts which are implied by the
current POM's
+ packaging and the lifecycle phase being built.
+ ]]></description>
+ </expression>
+ <expression>
+ <syntax>project.remoteArtifactRepositories</syntax>
+ <configuration>
+ <![CDATA[
+<repositories>
+ ...
+</repositories>
+ ]]></configuration>
+ <description>
+ <![CDATA[
+ This is a list of ArtifactRepository instances used to resolve the
Artifacts associated
+ with the current POM.
+
+ NOTE: This list will contain entries for repositories specified by
ancestor POMs, including
+ the default built-in super-POM, which is the parent of all POMs.
+ ]]></description>
+ </expression>
+ <expression>
+ <syntax>project.pluginArtifactRepositories</syntax>
+ <configuration>
+ <![CDATA[
+<pluginRepositories>
+ ...
+</pluginRepositories>
+ ]]></configuration>
+ <description>
+ <![CDATA[
+ This is a list of ArtifactRepository instances used to resolve the
Artifacts associated
+ with plugins used in building the current POM.
+
+ NOTE: This list will contain entries for repositories specified by
ancestor POMs, including
+ the default built-in super-POM, which is the parent of all POMs.
+ ]]></description>
+ </expression>
+ <expression>
+ <syntax>project.attachedArtifacts</syntax>
+ <description>
+ <![CDATA[
+ This is a list of attachments to the main artifact produced by building
the current POM.
+ Attachments are derived works, based on the main build process, such as
an ejb-client jar,
+ project sources jar, etc.
+ ]]></description>
+ </expression>
+</expressions>
+</paramdoc>
\ No newline at end of file
Propchange:
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/plugin-expressions/project.paramdoc.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/plugin-expressions/project.paramdoc.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/plugin-expressions/rootless.paramdoc.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/plugin-expressions/rootless.paramdoc.xml?rev=293602&view=auto
==============================================================================
---
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/plugin-expressions/rootless.paramdoc.xml
(added)
+++
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/plugin-expressions/rootless.paramdoc.xml
Tue Oct 4 06:29:49 2005
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<paramdoc 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
../../../../../../../maven-plugin-parameter-documenter/target/generated-site/xsd/paramdoc-1.0.0.xsd
">
+ <expressions>
+ <expression>
+ <syntax>localRepository</syntax>
+ <configuration>
+ <![CDATA[
+ Inside ~/.m2/settings.xml:
+
+ <localRepository>/path/to/local/repository</localRepository>
+ ]]></configuration>
+ <description>The ArtifactRepository instance referencing the local
artifact
+ repository.</description>
+ <cliOptions>
+ <cliOption>
+ <key>-Dmaven.repo.local=/path/to/local/repo</key>
+ <value>Override the local repository location on a per-build
basis.</value>
+ </cliOption>
+ </cliOptions>
+ </expression>
+ <expression>
+ <syntax>reactorProjects</syntax>
+ <description>This is the current list of projects being built by
+ Maven.</description>
+ </expression>
+ </expressions>
+</paramdoc>
Propchange:
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/plugin-expressions/rootless.paramdoc.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/plugin-expressions/rootless.paramdoc.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/plugin-expressions/settings.paramdoc.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/plugin-expressions/settings.paramdoc.xml?rev=293602&view=auto
==============================================================================
---
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/plugin-expressions/settings.paramdoc.xml
(added)
+++
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/plugin-expressions/settings.paramdoc.xml
Tue Oct 4 06:29:49 2005
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<paramdoc 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
../../../../../../../maven-plugin-parameter-documenter/target/generated-site/xsd/paramdoc-1.0.0.xsd
">
+ <expressions>
+ <expression>
+ <syntax>settings.offline</syntax>
+ <configuration>
+ <![CDATA[
+ <offline>true</offline>
+ ]]></configuration>
+ <description>
+ <![CDATA[
+ Flags the system as offline, to prevent accessing the network to resolve
artifacts or execute plugins.
+
+ NOTE: It's also possible to switch to offline mode on a per-build basis,
using the '-o' command-line option.
+ ]]></description>
+ </expression>
+ <expression>
+ <syntax>settings.interactiveMode</syntax>
+ <configuration>
+ <![CDATA[
+ <interactiveMode>true</interactiveMode>
+ ]]></configuration>
+ <description>
+ <![CDATA[
+ If false, flags the system to skip prompting the user for any
information, or holding up the build
+ waiting for any input.
+
+ NOTE: It's also possible to switch to batch (ie. non-interactive) mode
using the '-B' command-line option.
+ ]]></description>
+ </expression>
+ </expressions>
+</paramdoc>
\ No newline at end of file
Propchange:
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/plugin-expressions/settings.paramdoc.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-embedder/src/main/resources/META-INF/maven/plugin-expressions/settings.paramdoc.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
