Author: olamy
Date: Sat Sep 25 12:46:42 2010
New Revision: 1001205
URL: http://svn.apache.org/viewvc?rev=1001205&view=rev
Log:
[MASSEMBLY-499] Poor performance in DirectoryArchiver due to unnecessary native
calls
upgrade plexus-archiver version to 1.0.1-SNAPSHOT
to test the jvm chmod mode use -DuseJvmChmod=true
upgrade invoker-plugin to 1.5
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/settings.xml (with props)
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1001205&r1=1001204&r2=1001205&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Sat Sep 25 12:46:42 2010
@@ -93,7 +93,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>1.0-alpha-12</version>
+ <version>1.0.1-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -335,14 +335,16 @@ under the License.
</pluginRepositories>
<properties>
- <invokerPluginVersion>1.3</invokerPluginVersion>
+ <invokerPluginVersion>1.5</invokerPluginVersion>
<itParent>${java.io.tmpdir}/assembly-ITs/it-project-parent</itParent>
<itProjects>${java.io.tmpdir}/assembly-ITs/projects</itProjects>
<localRepositoryPath>${project.build.directory}/local-repository</localRepositoryPath>
<test.remote.repo.url>file://${project.build.testOutputDirectory}/remote-repository</test.remote.repo.url>
<it.pomIncludes>**/pom.xml</it.pomIncludes>
<it.streamLogs>false</it.streamLogs>
+ <it.debug>true</it.debug>
<testVersion>${project.version}</testVersion>
+ <useJvmChmod>false</useJvmChmod>
</properties>
<build>
@@ -371,10 +373,12 @@ under the License.
<configuration>
<localRepositoryPath>${localRepositoryPath}</localRepositoryPath>
<properties>
+ <useJvmChmod>${useJvmChmod}</useJvmChmod>
<testVersion>${testVersion}</testVersion>
<localRepositoryPath>${localRepositoryPath}</localRepositoryPath>
<invokerPluginVersion>${invokerPluginVersion}</invokerPluginVersion>
</properties>
+ <showVersion>true</showVersion>
</configuration>
<executions>
<execution>
@@ -407,8 +411,11 @@ under the License.
<projectsDirectory>src/it/projects</projectsDirectory>
<cloneProjectsTo>${itProjects}</cloneProjectsTo>
<testPropertiesFile>test.properties</testPropertiesFile>
- <debug>true</debug>
-
+ <testProperties>
+ <useJvmChmod>${useJvmChmod}</useJvmChmod>
+ </testProperties>
+ <debug>${it.debug}</debug>
+ <settingsFile>src/it/settings.xml</settingsFile>
<pomIncludes>
<pomInclude>${it.pomIncludes}</pomInclude>
</pomIncludes>
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/settings.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/settings.xml?rev=1001205&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/settings.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/settings.xml Sat Sep 25
12:46:42 2010
@@ -0,0 +1,75 @@
+<?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.
+-->
+
+<settings>
+ <profiles>
+ <profile>
+ <id>it-repo</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>local.central</id>
+ <url>@localRepositoryUrl@</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshot.codehaus</id>
+ <url>https://nexus.codehaus.org/content/groups/snapshots-group/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>apache.snapshot</id>
+
<url>https://repository.apache.org/content/groups/snapshots-group/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>local.central</id>
+ <url>@localRepositoryUrl@</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+</settings>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/settings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/settings.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
