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

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven

This commit is contained in:
rfscholte 2013-03-01 16:16:04 +01:00
parent f6f4ef5e03 80e01fea5b
commit d659d21df1
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -8,6 +8,7 @@ bin/
*.ipr *.ipr
*.iml *.iml
.idea .idea
out/
.DS_Store .DS_Store
/bootstrap /bootstrap

2
maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
View File

@ -115,7 +115,7 @@ public void execute( Runnable command )
else else
{ {
executor = executor =
new ThreadPoolExecutor( 0, threads, 3, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), new ThreadPoolExecutor( threads, threads, 3, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(),
new DaemonThreadCreator() ); new DaemonThreadCreator() );
} }
} }

2
pom.xml
View File

@ -53,7 +53,7 @@
<wagonVersion>2.4</wagonVersion> <wagonVersion>2.4</wagonVersion>
<securityDispatcherVersion>1.3</securityDispatcherVersion> <securityDispatcherVersion>1.3</securityDispatcherVersion>
<cipherVersion>1.7</cipherVersion> <cipherVersion>1.7</cipherVersion>
<modelloVersion>1.6</modelloVersion> <modelloVersion>1.7</modelloVersion>
<jxpathVersion>1.3</jxpathVersion> <jxpathVersion>1.3</jxpathVersion>
<aetherVersion>1.13.1</aetherVersion> <aetherVersion>1.13.1</aetherVersion>
<slf4jVersion>1.7.2</slf4jVersion> <slf4jVersion>1.7.2</slf4jVersion>