Author: sisbell
Date: Wed Aug 27 13:49:08 2008
New Revision: 689611
URL: http://svn.apache.org/viewvc?rev=689611&view=rev
Log:
Added back in default injector.
Modified:
maven/components/branches/sisbell-maven-2.1-profile/a.xml
maven/components/branches/sisbell-maven-2.1-profile/maven-core-it-runner/pom.xml
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/aspect/org/apache/maven/project/aspect/PBEDerivativeReporterAspect.aj
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
maven/components/branches/sisbell-maven-2.1-profile/pom.xml
Modified: maven/components/branches/sisbell-maven-2.1-profile/a.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/a.xml?rev=689611&r1=689610&r2=689611&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/a.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/a.xml Wed Aug 27
13:49:08 2008
@@ -1,644 +1,316 @@
-<project>
+<project schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven</artifactId>
- <version>2.0.6</version>
- <relativePath>../pom/maven/pom.xml</relativePath>
+ <groupId>org.codehaus.tycho</groupId>
+ <artifactId>tycho</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>maven-toolchain</artifactId>
- <name>Maven Toolchains</name>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>2.0.6</version>
- </dependency>
- <dependency>
- <version>2.0.6</version>
- <artifactId>maven-artifact</artifactId>
- <groupId>org.apache.maven</groupId>
- </dependency>
- <dependency>
- <scope>test</scope>
- <version>3.8.1</version>
- <artifactId>junit</artifactId>
- <groupId>junit</groupId>
- </dependency>
- </dependencies>
+ <artifactId>tycho-osgi-components</artifactId>
+ <name>Tycho OSGi Components</name>
+ <description>Components for OSGi operations</description>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <excludes>
+ <exclude>META-INF/plexus/components.xml</exclude>
+ </excludes>
+ </resource>
+ </resources>
<plugins>
<plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <version>1.3.8</version>
<executions>
<execution>
+ <phase>process-classes</phase>
<goals>
- <goal>xdoc</goal>
+ <goal>descriptor</goal>
+ <goal>merge-descriptors</goal>
</goals>
- <phase>pre-site</phase>
- <id>site-docs</id>
+ <configuration>
+ <fileName>generated-components.xml</fileName>
+ <descriptors>
+
<descriptor>${project.build.outputDirectory}/generated-components.xml</descriptor>
+
<descriptor>src/main/resources/META-INF/plexus/components.xml</descriptor>
+ </descriptors>
+ </configuration>
</execution>
</executions>
- <configuration>
- <model>src/main/mdo/toolchains.xml</model>
- <packageWithVersion>false</packageWithVersion>
- <version>1.0.0</version>
- </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0</version>
<executions>
- <execution>
- <goals>
- <goal>java</goal>
- <goal>xsd</goal>
- <goal>xpp3-reader</goal>
- </goals>
- </execution>
- </executions>
- <version>1.0-alpha-14</version>
- <artifactId>modello-maven-plugin</artifactId>
- <groupId>org.codehaus.modello</groupId>
</plugin>
<plugin>
- <artifactId>maven-shade-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>1.0-alpha-15</version>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-1</version>
<executions>
<execution>
- <id>shading</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
<configuration>
- <artifactSet>
- <includes>
-
<include>${project.groupId}:${project.artifactId}</include>
- </includes>
- </artifactSet>
- <relocations>
- <relocation>
- <pattern>org.codehaus.plexus.util</pattern>
- <excludes>
-
<exclude>org.codehaus.plexus.util.xml.Xpp3Dom</exclude>
-
<exclude>org.codehaus.plexus.util.xml.pull.*</exclude>
- </excludes>
- </relocation>
- </relocations>
+ <artifactItems>
+ <artifactItem>
+
<outputDirectory>target/dependency</outputDirectory>
+ <type>zip</type>
+
<version>${tycho-p2-runtime-version}</version>
+ <artifactId>tycho-p2-runtime</artifactId>
+ <groupId>org.codehaus.tycho</groupId>
+ </artifactItem>
+ </artifactItems>
+ <archiveBaseDirectory>/</archiveBaseDirectory>
+ <appendAssemblyId>false</appendAssemblyId>
+ <finalName>p2</finalName>
+ <outputDirectory>target</outputDirectory>
+
<descriptor>src/test/assembly/test-assembly.xml</descriptor>
</configuration>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <phase>generate-test-resources</phase>
+ <id>p2-client</id>
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>tycho.p2.location</name>
+
<value>${project.basedir}/target/p2.dir/p2/p2</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
- <artifactId>maven-release-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
<configuration>
-
<tagBase>https://svn.apache.org/repos/asf/maven/components/tags</tagBase>
+ <useSystemClassLoader>false</useSystemClassLoader>
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-13</version>
- <executions>
- <execution>
- <id>site-docs</id>
- <phase>pre-site</phase>
- <goals>
- <goal>xdoc</goal>
- <goal>xsd</goal>
- </goals>
- </execution>
- <execution>
- <id>standard</id>
- <goals>
- <goal>java</goal>
- <goal>xpp3-reader</goal>
- <goal>xpp3-writer</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
- </plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <artifactId>maven-ear-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-ejb-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>2.4.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-rar-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
</plugin>
<plugin>
- <artifactId>maven-site-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
<version>2.0-beta-7</version>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- </plugin>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.1-alpha-1</version>
+ <configuration>
+
<tagBase>https://svn.sonatype.org/m2eclipse/tycho/tags</tagBase>
+ </configuration>
</plugin>
</plugins>
</pluginManagement>
- <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
-
<scriptSourceDirectory>${project.basedir}/src/main/scripts</scriptSourceDirectory>
-
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
-
<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
- <directory>${project.basedir}/target</directory>
- <finalName>${project.artifactId}-${project.version}</finalName>
</build>
- <groupId schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- org.apache.maven
- </groupId>
- <description>Maven is a project development management and comprehension
tool. Based on the concept of a project
- object model: builds, dependency management, documentation creation,
site publication, and distribution
- publication are all controlled from the declarative file. Maven can be
extended by plugins to utilise a number
- of other development tools for reporting or the build process.
- </description>
- <issueManagement>
- <system>jira</system>
- <url>http://jira.codehaus.org/browse/MNG</url>
- </issueManagement>
- <inceptionYear>2001</inceptionYear>
- <mailingLists>
- <mailingList>
- <name>Maven User List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
- <post>[EMAIL PROTECTED]</post>
-
<archive>http://mail-archives.apache.org/mod_mbox/maven-users</archive>
- <otherArchives>
- <otherArchive>http://www.mail-archive.com/[EMAIL
PROTECTED]/</otherArchive>
-
<otherArchive>http://www.nabble.com/Maven---Users-f178.html</otherArchive>
- </otherArchives>
- </mailingList>
- <mailingList>
- <name>Maven Announcements List</name>
- <post>[EMAIL PROTECTED]</post>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
-
<archive>http://mail-archives.apache.org/mod_mbox/maven-announce/</archive>
- </mailingList>
- <mailingList>
- <name>Maven Issues List</name>
- <post>[EMAIL PROTECTED]</post>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
-
<archive>http://mail-archives.apache.org/mod_mbox/maven-issues/</archive>
- </mailingList>
- <mailingList>
- <name>Maven Notifications List</name>
- <post>[EMAIL PROTECTED]</post>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
-
<archive>http://mail-archives.apache.org/mod_mbox/maven-notifications/</archive>
- </mailingList>
- <mailingList>
- <name>Apache Announce List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
- <post>[EMAIL PROTECTED]</post>
-
<archive>http://mail-archives.apache.org/mod_mbox/www-announce/</archive>
- </mailingList>
- </mailingLists>
- <scm>
-
<connection>scm:svn:https://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.6/maven-toolchain
- </connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.6/maven-toolchain
- </developerConnection>
-
<url>https://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.6/maven-toolchain</url>
- </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.artifact</groupId>
+ <artifactId>maven-artifact</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.tycho</groupId>
+ <artifactId>tycho-p2-app</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.tycho</groupId>
+ <artifactId>tycho-testing-harness</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+ <version>0.3.0-SNAPSHOT</version>
+ <groupId>org.codehaus.tycho</groupId>
<properties>
- <mavenVersion>2.0.6</mavenVersion>
+ <maven-version>3.0-SNAPSHOT</maven-version>
+ <maven-artifact-version>3.0-alpha-1</maven-artifact-version>
+
<tycho-p2-runtime-version>0.3.0-SNAPSHOT-TEMP</tycho-p2-runtime-version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>${mavenVersion}</version>
+ <version>${maven-version}</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-api</artifactId>
- <version>${mavenVersion}</version>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${maven-version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-repository-metadata</artifactId>
- <version>${mavenVersion}</version>
+ <artifactId>maven-core</artifactId>
+ <version>${maven-version}</version>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
+ <groupId>org.apache.maven.artifact</groupId>
<artifactId>maven-artifact</artifactId>
- <version>${mavenVersion}</version>
+ <version>${maven-artifact-version}</version>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact-manager</artifactId>
- <version>${mavenVersion}</version>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.5.5</version>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact-test</artifactId>
- <version>${mavenVersion}</version>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <version>1.0-alpha-7</version>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-settings</artifactId>
- <version>${mavenVersion}</version>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler-api</artifactId>
+ <version>1.5.2</version>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-parameter-documenter</artifactId>
- <version>${mavenVersion}</version>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler-manager</artifactId>
+ <version>1.5.2</version>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-profile</artifactId>
- <version>${mavenVersion}</version>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.4.0.v20080605-1900</version>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-registry</artifactId>
- <version>${mavenVersion}</version>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.jdt.core</artifactId>
+ <version>3.4.0.v_874</version>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>${mavenVersion}</version>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bndlib</artifactId>
+ <version>0.0.236</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-osgi</artifactId>
+ <version>0.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-monitor</artifactId>
- <version>${mavenVersion}</version>
+ <artifactId>maven-archiver</artifactId>
+ <version>2.0</version>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-9-stable-1</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0</version>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.4.1</version>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-booter</artifactId>
+ <version>2.4.3</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- <version>1.0-beta-2</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.1</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh</artifactId>
- <version>1.0-beta-2</version>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>org.apache.ant</artifactId>
+ <version>1.6.5</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh-external</artifactId>
- <version>1.0-beta-2</version>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ <version>1.6.5</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-file</artifactId>
- <version>1.0-beta-2</version>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.6.5</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-lightweight</artifactId>
- <version>1.0-beta-2</version>
+ <groupId>bcel</groupId>
+ <artifactId>bcel</artifactId>
+ <version>5.1</version>
</dependency>
<dependency>
- <groupId>easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>1.2_Java1.3</version>
- <scope>test</scope>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-48</version>
</dependency>
<dependency>
- <groupId>classworlds</groupId>
- <artifactId>classworlds</artifactId>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-plugin-testing-harness</artifactId>
<version>1.1</version>
</dependency>
</dependencies>
</dependencyManagement>
+ <scm>
+
<connection>scm:svn:http://svn.sonatype.org/m2eclipse/tycho/trunk/tycho-osgi-components</connection>
+
<developerConnection>scm:svn:http://svn.sonatype.org/m2eclipse/tycho/trunk/tycho-osgi-components
+ </developerConnection>
+ </scm>
<distributionManagement>
- <site>
- <id>apache.website</id>
-
<url>scp://people.apache.org/www/maven.apache.org/ref/${project.version}/</url>
- </site>
- <repository>
- <id>apache.releases</id>
- <name>Apache Release Distribution Repository</name>
-
<url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- </repository>
<snapshotRepository>
- <id>apache.snapshots</id>
- <name>Apache Development Snapshot Repository</name>
-
<url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+ <id>forge-snapshots</id>
+ <name>forge-snapshots</name>
+
<url>http://repository.sonatype.org/content/repositories/eclipse-snapshots/</url>
</snapshotRepository>
</distributionManagement>
- <ciManagement>
- <system>continuum</system>
- <url>http://maven.zones.apache.org/continuum</url>
- <notifiers>
- <notifier>
- <type>mail</type>
- <configuration>
- <address>[EMAIL PROTECTED]</address>
- </configuration>
- </notifier>
- </notifiers>
- </ciManagement>
- <developers>
- <developer>
- <id>jvanzyl</id>
- <name>Jason van Zyl</name>
- <email>[EMAIL PROTECTED]</email>
- <organization>ASF</organization>
- <roles>
- <role>PMC Chair</role>
- </roles>
- <timezone>-5</timezone>
- </developer>
- <developer>
- <id>brett</id>
- <name>Brett Porter</name>
- <email>[EMAIL PROTECTED]</email>
- <organization>ASF</organization>
- <roles>
- <role>PMC Member</role>
- </roles>
- <timezone>+10</timezone>
- </developer>
- <developer>
- <id>evenisse</id>
- <name>Emmanuel Venisse</name>
- <email>[EMAIL PROTECTED]</email>
- <organization>ASF</organization>
- <roles>
- <role>PMC Member</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <id>kenney</id>
- <name>Kenney Westerhof</name>
- <email>[EMAIL PROTECTED]</email>
- <organization>Neonics</organization>
- <roles>
- <role>PMC Member</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <id>snicoll</id>
- <name>Stephane Nicoll</name>
- <email>[EMAIL PROTECTED]</email>
- <organization>ASF</organization>
- <roles>
- <role>PMC Member</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <id>vmassol</id>
- <name>Vincent Massol</name>
- <email>[EMAIL PROTECTED]</email>
- <organization>ASF</organization>
- <roles>
- <role>PMC Member</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <id>fgiust</id>
- <name>Fabrizio Giustina</name>
- <email>[EMAIL PROTECTED]</email>
- <organization>openmind</organization>
- <roles>
- <role>PMC Member</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <id>epunzalan</id>
- <name>Edwin Punzalan</name>
- <email>[EMAIL PROTECTED]</email>
- <organization>Mergere</organization>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>+8</timezone>
- </developer>
- <developer>
- <id>mperham</id>
- <name>Mike Perham</name>
- <email>[EMAIL PROTECTED]</email>
- <organization>IBM</organization>
- <roles>
- <role>PMC Member</role>
- </roles>
- <timezone>-6</timezone>
- </developer>
- <developer>
- <id>jdcasey</id>
- <name>John Casey</name>
- <email>[EMAIL PROTECTED]</email>
- <organization>ASF</organization>
- <roles>
- <role>PMC Member</role>
- </roles>
- <timezone>-5</timezone>
- </developer>
- <developer>
- <id>trygvis</id>
- <name>Trygve Laugstol</name>
- <email>[EMAIL PROTECTED]</email>
- <organization>ASF</organization>
- <roles>
- <role>PMC Member</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <id>vsiveton</id>
- <name>Vincent Siveton</name>
- <email>[EMAIL PROTECTED]</email>
- <organization>ASF</organization>
- <roles>
- <role>PMC Member</role>
- </roles>
- <timezone>-5</timezone>
- </developer>
- <developer>
- <id>carlos</id>
- <name>Carlos Sanchez</name>
- <email>[EMAIL PROTECTED]</email>
- <organization>ASF</organization>
- <roles>
- <role>PMC Member</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <id>dennisl</id>
- <name>Dennis Lundberg</name>
- <email>[EMAIL PROTECTED]</email>
- <organization>ASF</organization>
- <roles>
- <role>PMC Member</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <id>aheritier</id>
- <name>Arnaud Heritier</name>
- <email>[EMAIL PROTECTED]</email>
- <organization>ASF</organization>
- <roles>
- <role>PMC Member</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <id>handyande</id>
- <name>Andrew Williams</name>
- <email>[EMAIL PROTECTED]</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>0</timezone>
- </developer>
- <developer>
- <id>jtolentino</id>
- <name>Ernesto Tolentino Jr.</name>
- <email>[EMAIL PROTECTED]</email>
- <organization>ASF</organization>
- <roles>
- <role>PMC Member</role>
- </roles>
- <timezone>+8</timezone>
- </developer>
- <developer>
- <id>joakime</id>
- <name>Joakim Erdfelt</name>
- <email>[EMAIL PROTECTED]</email>
- <organization>ASF</organization>
- <roles>
- <role>PMC Member</role>
- </roles>
- <timezone>-5</timezone>
- </developer>
- <developer>
- <id>jmcconnell</id>
- <name>Jesse McConnell</name>
- <email>[EMAIL PROTECTED]</email>
- <organization>ASF</organization>
- <roles>
- <role>PMC Member</role>
- </roles>
- <timezone>-6</timezone>
- </developer>
- <developer>
- <id>wsmoak</id>
- <name>Wendy Smoak</name>
- <email>[EMAIL PROTECTED]</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>-7</timezone>
- </developer>
- </developers>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- <repository>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>central</id>
- <name>Maven Repository Switchboard</name>
- <url>http://repo1.maven.org/maven2</url>
- </repository>
- </repositories>
- <reporting>
- <outputDirectory>${project.build.directory}/site</outputDirectory>
- </reporting>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-core-it-runner/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core-it-runner/pom.xml?rev=689611&r1=689610&r2=689611&view=diff
==============================================================================
---
maven/components/branches/sisbell-maven-2.1-profile/maven-core-it-runner/pom.xml
(original)
+++
maven/components/branches/sisbell-maven-2.1-profile/maven-core-it-runner/pom.xml
Wed Aug 27 13:49:08 2008
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.maven.its</groupId>
<artifactId>core-integration-tests</artifactId>
- <version>${project.version}</version>
+ <version>2.1-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/aspect/org/apache/maven/project/aspect/PBEDerivativeReporterAspect.aj
URL:
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/aspect/org/apache/maven/project/aspect/PBEDerivativeReporterAspect.aj?rev=689611&r1=689610&r2=689611&view=diff
==============================================================================
---
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/aspect/org/apache/maven/project/aspect/PBEDerivativeReporterAspect.aj
(original)
+++
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/aspect/org/apache/maven/project/aspect/PBEDerivativeReporterAspect.aj
Wed Aug 27 13:49:08 2008
@@ -33,12 +33,12 @@
call( ArtifactRepository
MavenTools+.buildDeploymentArtifactRepository( DeploymentRepository ) )
&& args( repo );
- private pointcut pbldr_processProjectLogic( MavenProject project, File
pomFile ):
- execution( private MavenProject
DefaultMavenProjectBuilder.processProjectLogic( MavenProject, File, .. ) )
+ private pointcut pbldr_interpolateModelAndInjectDefault( MavenProject
project, File pomFile ):
+ execution( private MavenProject
DefaultMavenProjectBuilder.interpolateModelAndInjectDefault( MavenProject,
File, .. ) )
&& args( project, pomFile, .. );
- private pointcut within_pbldr_processProjectLogic( MavenProject project,
File pomFile ):
- withincode( private MavenProject
DefaultMavenProjectBuilder.processProjectLogic( MavenProject, File, .. ) )
+ private pointcut within_pbldr_interpolateModelAndInjectDefault(
MavenProject project, File pomFile ):
+ withincode( private MavenProject
DefaultMavenProjectBuilder.interpolateModelAndInjectDefault( MavenProject,
File, .. ) )
&& args( project, pomFile, .. );
private pointcut within_DefaultMavenProjectBuilder():
@@ -53,7 +53,7 @@
// DefaultMavenProjectBuilder.build(..)
// --> DefaultMavenProjectBuilder.buildFromSourceFileInternal(..) (private)
// --> DefaultMavenProjectBuilder.buildInternal(..) (private)
- // --> DefaultMavenProjectBuilder.processProjectLogic(..) (private)
+ // -->
DefaultMavenProjectBuilder.interpolateModelAndInjectDefault(..) (private)
// --> DefaultMavenTools.buildDeploymentArtifactRepository(..)
// <-- UnknownRepositoryLayoutException
// <---------- ProjectBuildingException
@@ -61,7 +61,7 @@
after( MavenProject project, File pomFile, DeploymentRepository repo )
throwing( InvalidRepositoryException cause ):
mavenTools_buildDeploymentArtifactRepository( repo ) &&
- cflow( pbldr_processProjectLogic( project, pomFile ) )
+ cflow( pbldr_interpolateModelAndInjectDefault( project, pomFile ) )
&& within_DefaultMavenProjectBuilder()
{
getReporter().reportErrorCreatingDeploymentArtifactRepository(
project, pomFile, repo, cause );
@@ -79,7 +79,7 @@
// DefaultMavenProjectBuilder.build(..)
// --> DefaultMavenProjectBuilder.buildFromSourceFileInternal(..) (private)
// --> DefaultMavenProjectBuilder.buildInternal(..) (private)
- // --> DefaultMavenProjectBuilder.processProjectLogic(..) (private)
+ // -->
DefaultMavenProjectBuilder.interpolateModelAndInjectDefault(..) (private)
// --> DefaultMavenTools.buildArtifactRepositories(..)
// --> DefaultMavenTools.buildArtifactRepository(..)
// <------ UnknownRepositoryLayoutException
@@ -87,7 +87,7 @@
//
=========================================================================
after( MavenProject project, File pomFile, Repository repo ) throwing(
InvalidRepositoryException cause ):
mavenTools_buildArtifactRepository( repo )
- && cflow( pbldr_processProjectLogic( project, pomFile ) )
+ && cflow( pbldr_interpolateModelAndInjectDefault( project, pomFile ) )
{
getReporter().reportErrorCreatingArtifactRepository( project.getId(),
pomFile, repo, cause );
}
@@ -125,13 +125,13 @@
// DefaultMavenProjectBuilder.build(..)
// --> DefaultMavenProjectBuilder.buildFromSourceFileInternal(..) (private)
// --> DefaultMavenProjectBuilder.buildInternal(..) (private)
- // --> DefaultMavenProjectBuilder.processProjectLogic(..) (private)
+ // -->
DefaultMavenProjectBuilder.interpolateModelAndInjectDefault(..) (private)
// --> ModelInterpolator.interpolate(..)
// <-- ModelInterpolationException
// <---------- ProjectBuildingException
//
=========================================================================
after( MavenProject project, File pomFile ) throwing(
ModelInterpolationException cause ):
- pbldr_processProjectLogic( project, pomFile )
+ pbldr_interpolateModelAndInjectDefault( project, pomFile )
{
getReporter().reportErrorInterpolatingModel( project, pomFile, cause );
}
@@ -152,7 +152,7 @@
// DefaultMavenProjectBuilder.build(..)
// --> DefaultMavenProjectBuilder.buildFromSourceFileInternal(..) (private)
// --> DefaultMavenProjectBuilder.buildInternal(..) (private)
- // --> DefaultMavenProjectBuilder.processProjectLogic(..) (private)
+ // -->
DefaultMavenProjectBuilder.interpolateModelAndInjectDefault(..) (private)
// --> DefaultMavenProjectBuilder.createPluginArtifacts(..)
// --> DefaultMavenProjectBuilder.createReportArtifacts(..)
// --> DefaultMavenProjectBuilder.createExtensionArtifacts(..)
@@ -160,7 +160,7 @@
// <---------- ProjectBuildingException
//
=========================================================================
after( MavenProject project, File pomFile ) throwing(
ProjectBuildingException cause ):
- cflow( pbldr_processProjectLogic( project, pomFile ) )
+ cflow( pbldr_interpolateModelAndInjectDefault( project, pomFile ) )
&& pbldr_createNonDependencyArtifacts()
&& within_DefaultMavenProjectBuilder()
{
@@ -178,13 +178,13 @@
// DefaultMavenProjectBuilder.build(..)
// --> DefaultMavenProjectBuilder.buildFromSourceFileInternal(..) (private)
// --> DefaultMavenProjectBuilder.buildInternal(..) (private)
- // --> DefaultMavenProjectBuilder.processProjectLogic(..) (private)
+ // -->
DefaultMavenProjectBuilder.interpolateModelAndInjectDefault(..) (private)
// --> (model validator result)
// <-- InvalidProjectModelException
// <------ ProjectBuildingException
//
=========================================================================
after( MavenProject project, File pomFile ) throwing(
InvalidProjectModelException cause ):
- cflow( pbldr_processProjectLogic( project, pomFile ) )
+ cflow( pbldr_interpolateModelAndInjectDefault( project, pomFile ) )
&& within_DefaultMavenProjectBuilder()
&& execution( void DefaultMavenProjectBuilder.validateModel( .. ) )
{
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=689611&r1=689610&r2=689611&view=diff
==============================================================================
---
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Wed Aug 27 13:49:08 2008
@@ -479,7 +479,7 @@
}
// interpolation is before injection, because interpolation is
off-limits in the injected variables
- // modelDefaultsInjector.injectDefaults(model);
+ modelDefaultsInjector.injectDefaults(model);
// We will return a different project object using the new model
(hence the need to return a project, not just modify the parameter)
MavenProject project = new MavenProject(model, artifactFactory,
mavenTools, repositoryHelper, this, config);
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java?rev=689611&r1=689610&r2=689611&view=diff
==============================================================================
---
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
(original)
+++
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
Wed Aug 27 13:49:08 2008
@@ -174,7 +174,7 @@
PomClassicDomainModel transformedDomainModel =
( (PomClassicDomainModel) ctx.transform( domainModels,
transformer, transformer, importModels, properties ) );
-
+ // System.out.println(transformedDomainModel.asString());
Model model = transformedDomainModel.getModel();
try {
MavenProject mavenProject = new MavenProject( model,
artifactFactory, mavenTools, repositoryHelper, null,
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java?rev=689611&r1=689610&r2=689611&view=diff
==============================================================================
---
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
(original)
+++
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
Wed Aug 27 13:49:08 2008
@@ -25,9 +25,13 @@
import org.apache.maven.model.Build;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.Resource;
+import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.WriterFactory;
import java.io.File;
+import java.io.ByteArrayOutputStream;
+import java.io.Writer;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -102,10 +106,13 @@
public void testDuplicatePluginDefinitionsMerged()
throws Exception
{
- File f1 = getTestFile(
"src/test/resources/projects/duplicate-plugins-merged-pom.xml" );
+ File f1 = getTestFile(
"maven-project/src/test/resources/projects/duplicate-plugins-merged-pom.xml" );
MavenProject project = getProject( f1 );
-
+ Writer out = WriterFactory.newXmlWriter( System.out );
+ MavenXpp3Writer writer = new MavenXpp3Writer();
+ writer.write( out, project.getModel() );
+ out.close();
assertEquals( 2, ( (Plugin) project.getBuildPlugins().get( 0 )
).getDependencies().size() );
}
@@ -148,4 +155,41 @@
return r;
}
+
+ public void tetA() throws Exception {
+ ArtifactRepositoryLayout repoLayout = (ArtifactRepositoryLayout)
lookup( ArtifactRepositoryLayout.ROLE,
+
"default" );
+
+ ArtifactRepository r = new DefaultArtifactRepository( "local",
"file://" + "C:\\Documents and Settings\\sisbell\\.m2\\repository\\",
+ repoLayout );
+
+ try {
+ MavenProject mp = projectBuilder.build(new File("C:\\Documents and
Settings\\sisbell\\.m2\\repository\\org\\apache\\maven\\maven-core\\2.0\\maven-core-2.0.pom"),
+ new
DefaultProjectBuilderConfiguration().setLocalRepository(r));
+
+ Writer out = WriterFactory.newXmlWriter( System.out );
+ MavenXpp3Writer writer = new MavenXpp3Writer();
+ writer.write( out, mp.getModel() );
+ out.close();
+ // System.out.println(mp.getModel())
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
}
Modified: maven/components/branches/sisbell-maven-2.1-profile/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/pom.xml?rev=689611&r1=689610&r2=689611&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/pom.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/pom.xml Wed Aug 27
13:49:08 2008
@@ -16,12 +16,7 @@
<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/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-parent</artifactId>
- <version>9-SNAPSHOT</version>
- <relativePath>../pom/maven/pom.xml</relativePath>
- </parent>
+ <groupId>org</groupId>
<artifactId>maven</artifactId>
<version>3.0-SNAPSHOT</version>
<packaging>pom</packaging>
