Author: mkleint
Date: Sun Mar 16 13:27:32 2008
New Revision: 637648
URL: http://svn.apache.org/viewvc?rev=637648&view=rev
Log:
MNG-3464 - include toolchains in the final binary. Consequently a new module
project was created that does only the final final assembly, the assembling
part moved out of maven-core.
Added:
maven/components/branches/maven-2.0.x/assembly/ (with props)
maven/components/branches/maven-2.0.x/assembly/LICENSE.txt
- copied unchanged from r637624,
maven/components/branches/maven-2.0.x/maven-core/LICENSE.txt
maven/components/branches/maven-2.0.x/assembly/NOTICE.txt
- copied unchanged from r637624,
maven/components/branches/maven-2.0.x/maven-core/NOTICE.txt
maven/components/branches/maven-2.0.x/assembly/README.txt
- copied unchanged from r637624,
maven/components/branches/maven-2.0.x/maven-core/README.txt
maven/components/branches/maven-2.0.x/assembly/pom.xml
maven/components/branches/maven-2.0.x/assembly/src/
maven/components/branches/maven-2.0.x/assembly/src/assemble/
- copied from r637624,
maven/components/branches/maven-2.0.x/maven-core/src/assemble/
maven/components/branches/maven-2.0.x/assembly/src/bin/
- copied from r637624,
maven/components/branches/maven-2.0.x/maven-core/src/bin/
maven/components/branches/maven-2.0.x/assembly/src/conf/
- copied from r637624,
maven/components/branches/maven-2.0.x/maven-core/src/conf/
maven/components/branches/maven-2.0.x/assembly/src/site/
- copied from r637624,
maven/components/branches/maven-2.0.x/maven-core/src/site/
Removed:
maven/components/branches/maven-2.0.x/maven-core/LICENSE.txt
maven/components/branches/maven-2.0.x/maven-core/NOTICE.txt
maven/components/branches/maven-2.0.x/maven-core/README.txt
maven/components/branches/maven-2.0.x/maven-core/src/assemble/
maven/components/branches/maven-2.0.x/maven-core/src/bin/
maven/components/branches/maven-2.0.x/maven-core/src/conf/
maven/components/branches/maven-2.0.x/maven-core/src/site/
Modified:
maven/components/branches/maven-2.0.x/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java
maven/components/branches/maven-2.0.x/maven-core/pom.xml
maven/components/branches/maven-2.0.x/pom.xml
Propchange: maven/components/branches/maven-2.0.x/assembly/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Mar 16 13:27:32 2008
@@ -0,0 +1 @@
+target
Added: maven/components/branches/maven-2.0.x/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/assembly/pom.xml?rev=637648&view=auto
==============================================================================
--- maven/components/branches/maven-2.0.x/assembly/pom.xml (added)
+++ maven/components/branches/maven-2.0.x/assembly/pom.xml Sun Mar 16 13:27:32
2008
@@ -0,0 +1,179 @@
+<?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.
+-->
+
+<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>
+ <artifactId>maven</artifactId>
+ <groupId>org.apache.maven</groupId>
+ <version>2.0.9-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>assembly</artifactId>
+ <name>Maven Core Assembly</name>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>apache.snapshots</id>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ </pluginRepository>
+ </pluginRepositories>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.0-beta-2-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <finalName>maven-${pom.version}-uber</finalName>
+ <createDependencyReducedPom>
+ false
+ </createDependencyReducedPom>
+ <keepDependenciesWithProvidedScope>
+ true
+ </keepDependenciesWithProvidedScope>
+ <transformers>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"
/>
+ </transformers>
+ <artifactSet>
+ <excludes>
+ <exclude>
+ org.codehaus.plexus:plexus-component-api
+ </exclude>
+ <exclude>classworlds:classworlds</exclude>
+ <exclude>junit:junit</exclude>
+ <exclude>jmock:jmock</exclude>
+ <exclude>xml-apis:xml-apis</exclude>
+ </excludes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>org.jdom</pattern>
+ </relocation>
+ <relocation>
+ <pattern>de.zeigermann.xml</pattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.webdav</pattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.commons.httpclient</pattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.commons.logging</pattern>
+ </relocation>
+ <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>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <descriptor>src/assemble/bin.xml</descriptor>
+ <finalName>apache-maven-${version}</finalName>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-toolchain</artifactId>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>include-site</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-plugin</artifactId>
+ <configuration>
+
<connectionUrl>scm:svn:http://svn.apache.org/repos/asf/maven/site/trunk</connectionUrl>
+
<checkoutDirectory>${project.build.directory}/maven-site</checkoutDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>checkout</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <configuration>
+
<projectsDirectory>${project.build.directory}/maven-site</projectsDirectory>
+ <pom>${project.build.directory}/maven-site/pom.xml</pom>
+ <goals>
+ <goal>clean</goal>
+ <goal>site</goal>
+ </goals>
+ </configuration>
+ <executions>
+ <execution>
+ <id>initialize</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Modified:
maven/components/branches/maven-2.0.x/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java?rev=637648&r1=637647&r2=637648&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java
(original)
+++
maven/components/branches/maven-2.0.x/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java
Sun Mar 16 13:27:32 2008
@@ -130,7 +130,7 @@
bootstrapper.buildProject( new File( basedir ), true );
- Model mavenCoreModel = bootstrapper.getCachedModel( MAVEN_GROUPID,
"maven-core" );
+ Model mavenCoreModel = bootstrapper.getCachedModel( MAVEN_GROUPID,
"assembly" );
File installation = new File( basedir, "bootstrap/target/installation"
);
createInstallation( installation, mavenCoreModel );
Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=637648&r1=637647&r2=637648&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-core/pom.xml Sun Mar 16
13:27:32 2008
@@ -35,89 +35,6 @@
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
</pluginRepository>
</pluginRepositories>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <version>1.0-beta-2-SNAPSHOT</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <finalName>maven-${pom.version}-uber</finalName>
- <createDependencyReducedPom>
- false
- </createDependencyReducedPom>
- <keepDependenciesWithProvidedScope>
- true
- </keepDependenciesWithProvidedScope>
- <transformers>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"
/>
- </transformers>
- <artifactSet>
- <excludes>
- <exclude>
- org.codehaus.plexus:plexus-component-api
- </exclude>
- <exclude>classworlds:classworlds</exclude>
- <exclude>junit:junit</exclude>
- <exclude>jmock:jmock</exclude>
- <exclude>xml-apis:xml-apis</exclude>
- </excludes>
- </artifactSet>
- <relocations>
- <relocation>
- <pattern>org.jdom</pattern>
- </relocation>
- <relocation>
- <pattern>de.zeigermann.xml</pattern>
- </relocation>
- <relocation>
- <pattern>org.apache.webdav</pattern>
- </relocation>
- <relocation>
- <pattern>org.apache.commons.httpclient</pattern>
- </relocation>
- <relocation>
- <pattern>org.apache.commons.logging</pattern>
- </relocation>
- <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>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <descriptor>src/assemble/bin.xml</descriptor>
- <finalName>apache-maven-${version}</finalName>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
Modified: maven/components/branches/maven-2.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=637648&r1=637647&r2=637648&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/pom.xml Sun Mar 16 13:27:32 2008
@@ -220,6 +220,7 @@
<module>maven-script</module>
<module>maven-settings</module>
<module>maven-toolchain</module>
+ <module>assembly</module>
</modules>
<dependencies>
@@ -291,6 +292,17 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-toolchain</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-parameter-documenter</artifactId>
<version>${mavenVersion}</version>
</dependency>
@@ -353,7 +365,7 @@
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav</artifactId>
- <version>${wagonVersion}</version>
+ <version>1.0-beta-1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
