maven-wagon git commit: [WAGON-473] Don't abuse IllegalArgumentException to intercept null input
Repository: maven-wagon
Updated Branches:
refs/heads/master 77f2cd3ee -> 30631655e
[WAGON-473] Don't abuse IllegalArgumentException to intercept null input
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/30631655
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/30631655
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/30631655
Branch: refs/heads/master
Commit: 30631655e8f6cdf121161b3ca09e3da0134a5198
Parents: 77f2cd3
Author: Michael Osipov
Authored: Tue Dec 20 13:44:39 2016 +0100
Committer: Michael Osipov
Committed: Tue Dec 20 13:44:39 2016 +0100
--
.../main/java/org/apache/maven/wagon/AbstractWagon.java | 2 +-
.../org/apache/maven/wagon/repository/Repository.java | 6 +++---
.../org/apache/maven/wagon/providers/ftp/FtpWagon.java| 4 ++--
.../wagon/providers/http/AbstractHttpClientWagon.java | 10 +-
4 files changed, 11 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/30631655/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java
--
diff --git
a/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java
b/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java
index 9497260..4cbf37d 100644
--- a/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java
+++ b/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java
@@ -178,7 +178,7 @@ public abstract class AbstractWagon
{
if ( repository == null )
{
-throw new IllegalStateException( "The repository specified cannot
be null." );
+throw new NullPointerException( "repository cannot be null" );
}
if ( permissionsOverride != null )
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/30631655/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java
--
diff --git
a/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java
b/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java
index b28dd1a..456115a 100644
---
a/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java
+++
b/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java
@@ -78,14 +78,14 @@ public class Repository
{
if ( id == null )
{
-throw new NullPointerException( "id can not be null for Repository
with url=" + url );
+throw new NullPointerException( "id cannot be null" );
}
setId( id );
if ( url == null )
{
-throw new NullPointerException( "url can not be null for
Repository with id=" + id );
+throw new NullPointerException( "url cannot be null" );
}
setUrl( url );
@@ -207,7 +207,7 @@ public class Repository
/**
* Checks whtther provided url contains IPv6 format in host portion
- *
+ *
* @return true if provide host part is of IPv6 format
*/
private boolean isIPv6Address()
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/30631655/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
--
diff --git
a/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
b/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
index 4fa0fd6..13c1f51 100644
---
a/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
+++
b/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
@@ -89,7 +89,7 @@ public class FtpWagon
if ( authInfo == null )
{
-throw new IllegalArgumentException( "Authentication Credentials
cannot be null for FTP protocol" );
+throw new NullPointerException("authenticationInfo cannot be
null");
}
if ( authInfo.getUserName() == null )
@@ -409,7 +409,7 @@ public class FtpWagon
}
/**
- *
+ *
*/
public class PrintCommandListener
implements ProtocolCommandListener
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/30631655/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
--
diff --git
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
b/wa
maven-wagon git commit: Fix Checkstyle errors
Repository: maven-wagon
Updated Branches:
refs/heads/master 30631655e -> bcdc16825
Fix Checkstyle errors
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/bcdc1682
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/bcdc1682
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/bcdc1682
Branch: refs/heads/master
Commit: bcdc1682529aecc7b7a17fefab82fdd1d47c1f46
Parents: 3063165
Author: Michael Osipov
Authored: Tue Dec 20 14:28:53 2016 +0100
Committer: Michael Osipov
Committed: Tue Dec 20 14:28:53 2016 +0100
--
.../main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java | 2 +-
.../apache/maven/wagon/providers/http/AbstractHttpClientWagon.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/bcdc1682/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
--
diff --git
a/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
b/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
index 13c1f51..c234e36 100644
---
a/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
+++
b/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
@@ -89,7 +89,7 @@ public class FtpWagon
if ( authInfo == null )
{
-throw new NullPointerException("authenticationInfo cannot be
null");
+throw new NullPointerException( "authenticationInfo cannot be
null" );
}
if ( authInfo.getUserName() == null )
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/bcdc1682/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
--
diff --git
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index 9eafb72..a03558a 100755
---
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -174,7 +174,7 @@ public abstract class AbstractHttpClientWagon
{
if ( outputStream == null )
{
-throw new NullPointerException("outputStream cannot be null");
+throw new NullPointerException( "outputStream cannot be null"
);
}
TransferEvent transferEvent =
new TransferEvent( wagon, resource,
TransferEvent.TRANSFER_PROGRESS, TransferEvent.REQUEST_PUT );
maven git commit: [MNG-6138] Remove obsolete message_*.properties form maven-core
Repository: maven
Updated Branches:
refs/heads/master bb8a797c5 -> b5b82988a
[MNG-6138] Remove obsolete message_*.properties form maven-core
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b5b82988
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b5b82988
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b5b82988
Branch: refs/heads/master
Commit: b5b82988a76d311e3ff94b29f2d05d2cb9062ffc
Parents: bb8a797
Author: Michael Osipov
Authored: Thu Dec 22 22:39:00 2016 +0100
Committer: Michael Osipov
Committed: Thu Dec 22 22:39:00 2016 +0100
--
.../apache/maven/messages/messages.properties | 34
.../maven/messages/messages_de.properties | 34
.../maven/messages/messages_el.properties | 33 ---
.../maven/messages/messages_en.properties | 23 -
.../maven/messages/messages_es.properties | 33 ---
.../maven/messages/messages_fr.properties | 33 ---
.../maven/messages/messages_ja.properties | 34
.../maven/messages/messages_ko.properties | 34
.../maven/messages/messages_nl.properties | 33 ---
.../maven/messages/messages_no.properties | 33 ---
.../maven/messages/messages_pl.properties | 33 ---
.../maven/messages/messages_zh_CN.properties| 34
12 files changed, 391 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/b5b82988/maven-core/src/main/resources/org/apache/maven/messages/messages.properties
--
diff --git
a/maven-core/src/main/resources/org/apache/maven/messages/messages.properties
b/maven-core/src/main/resources/org/apache/maven/messages/messages.properties
deleted file mode 100644
index d576d7a..000
---
a/maven-core/src/main/resources/org/apache/maven/messages/messages.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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 Verifier
-# --
-failed.download.warning=WARNING: Failed to download {0}.
-remote.repository.disabled.warning=The use of the remote repository has been
disabled.
-directory.nonexistant.warning=Directory {0} does not exist. Attempting to
create.
-not.directory.warning={0} is not a directory.
-not.writable.warning={0} is not writable.
-cannot.create.directory.warning=Unable to create directory {0}
-maven.repo.local.unset.warning=maven.repo.local is not set.
-single.unsatisfied.dependency.error=The build cannot continue because of the
following unsatisfied dependency:
-multiple.unsatisfied.dependency.error=The build cannot continue because of the
following unsatisfied dependencies:
-offline.snapshot.warning=You are working offline so the build will continue,
but {0} may be out of date!
-download.message=Attempting to download {0}.
-plugin.loading.error=The plugin {0} could not be loaded.
-empty.descriptor.error=The file {0} you specified has zero length.
-checksum.verification.error=The follow artifact is corrupt: {0}.
http://git-wip-us.apache.org/repos/asf/maven/blob/b5b82988/maven-core/src/main/resources/org/apache/maven/messages/messages_de.properties
--
diff --git
a/maven-core/src/main/resources/org/apache/maven/messages/messages_de.properties
b/maven-core/src/main/resources/org/apache/maven/messages/messages_de.properties
deleted file mode 100644
index d5c7dad..000
---
a/maven-core/src/main/resources/org/apache/maven/messages/messages_de.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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 owner
maven-surefire git commit: Fix typos in Javadocs
Repository: maven-surefire
Updated Branches:
refs/heads/master f841a16e4 -> 304f454ed
Fix typos in Javadocs
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/304f454e
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/304f454e
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/304f454e
Branch: refs/heads/master
Commit: 304f454ed20b492d8d7f739a268a09d8b3c81763
Parents: f841a16
Author: Michael Osipov
Authored: Thu Dec 22 23:02:27 2016 +0100
Committer: Michael Osipov
Committed: Thu Dec 22 23:02:27 2016 +0100
--
.../surefire/its/jiras/Surefire1028UnableToRunSingleIT.java | 4 ++--
.../maven/surefire/its/jiras/Surefire1185DoNotSpawnTestsIT.java | 2 +-
.../maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java | 2 +-
.../maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/304f454e/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java
index 74cb281..6e4d76c 100644
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java
@@ -28,13 +28,13 @@ import org.junit.Test;
*
* With Surefire 2.15
* {@code $ mvn test -Dtest=MyTest#testFoo}
- * Results :
+ * Results:
* Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
*
* With Surefire 2.16
* {@code $ mvn test -Dtest=MyTest#testFoo}
*
- * Results :
+ * Results:
* Tests run: 0, Failures: 0, Errors: 0, Skipped: 0
*
* @author mailto:tibordig...@apache.org";>Tibor Digana (tibor17)
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/304f454e/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1185DoNotSpawnTestsIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1185DoNotSpawnTestsIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1185DoNotSpawnTestsIT.java
index 16e27cf..74a4e46 100644
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1185DoNotSpawnTestsIT.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1185DoNotSpawnTestsIT.java
@@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.is;
* Running pkg.RunningTest
* Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec -
in pkg.RunningTest
*
- * Results :
+ * Results:
*
* Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
*/
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/304f454e/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java
--
diff --git
a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java
b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java
index cc87707..b883d09 100644
---
a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java
+++
b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java
@@ -32,7 +32,7 @@ import org.junit.runner.notification.Failure;
* T E S T S
* ---
*
- * Results :
+ * Results:
*
* Tests run: 0, Failures: 0, Errors: 0, Skipped: 0
*
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/304f454e/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java
--
diff --git
a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java
b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java
index f9d4fc4..08e1695 100644
---
a/surefire-providers/surefire-juni
maven-surefire git commit: [SUREFIRE-1315] Fix stylistic errors in DefaultReporterFactory
Repository: maven-surefire
Updated Branches:
refs/heads/master 304f454ed -> dcd3b64ac
[SUREFIRE-1315] Fix stylistic errors in DefaultReporterFactory
* Update labels for proper English style
* Use proper title case
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/dcd3b64a
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/dcd3b64a
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/dcd3b64a
Branch: refs/heads/master
Commit: dcd3b64acf129e630c6aaec9b2e1f48476855bad
Parents: 304f454
Author: Michael Osipov
Authored: Fri Dec 23 00:11:25 2016 +0100
Committer: Michael Osipov
Committed: Fri Dec 23 00:11:25 2016 +0100
--
.../plugin/surefire/report/DefaultReporterFactory.java| 6 +++---
.../surefire/report/DefaultReporterFactoryTest.java | 4 ++--
.../src/site/markdown/newerrorsummary.md | 4 ++--
.../maven/surefire/its/JUnit4RerunFailingTestsIT.java | 10 +-
.../jiras/Surefire1146RerunFailedAndParameterized.java| 2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dcd3b64a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
index 2332856..24f5b3b 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
@@ -421,9 +421,9 @@ public class DefaultReporterFactory
enum TestResultType
{
-error( "Tests in error: " ),
-failure( "Failed tests: " ),
-flake( "Flaked tests: " ),
+error( "Erroneous Tests: " ),
+failure( "Failed Tests: " ),
+flake("Flaky Tests: " ),
success( "Success: "),
skipped( "Skipped: "),
unknown( "Unknown: ");
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dcd3b64a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
--
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
index e51c993..98f97bd 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
+++
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
@@ -120,7 +120,7 @@ public class DefaultReporterFactoryTest
// Now test the result will be printed out correctly
factory.printTestFailures( flake );
String[] expectedFlakeOutput =
-{ "Flaked tests: ", TEST_FOUR, " Run 1: " + ASSERTION_FAIL, "
Run 2: PASS", "", TEST_ONE,
+{ "Flaky Tests: ", TEST_FOUR, " Run 1: " + ASSERTION_FAIL, " Run
2: PASS", "", TEST_ONE,
" Run 1: " + ERROR, " Run 2: " + ASSERTION_FAIL, " Run 3:
PASS", "", TEST_TWO, " Run 1: " + ERROR,
" Run 2: PASS", "" };
assertEquals( asList( expectedFlakeOutput ), reporter.getMessages() );
@@ -128,7 +128,7 @@ public class DefaultReporterFactoryTest
reporter.reset();
factory.printTestFailures( error );
String[] expectedFailureOutput =
-{ "Tests in error: ", TEST_THREE, " Run 1: " + ASSERTION_FAIL, "
Run 2: " + ERROR, " Run 3: " + ERROR, ""
+{ "Erroneous Tests: ", TEST_THREE, " Run 1: " + ASSERTION_FAIL, "
Run 2: " + ERROR, " Run 3: " + ERROR, ""
};
assertEquals( asList( expectedFailureOutput ), reporter.getMessages()
);
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dcd3b64a/maven-surefire-plugin/src/site/markdown/newerrorsummary.md
--
diff --git a/maven-surefire-plugin/src/site/markdown/newerrorsummary.md
b/maven-surefire-plugin/src/site/markdown/newerrorsummary.md
index 7467aa9..09537e3 100644
--- a/maven-surefire-plugin/src/site/markdown/newerrorsummary.md
+++ b/maven-surefire-plugin/src/site/markdown/newerrorsummary.md
@@ -26,11 +26,11 @@ report of the run or the files on disk.
### Example output:
-Failed tests:
+Failed Tests:
maven-wagon git commit: [WAGON-473] Don't abuse IllegalArgumentException to intercept null input
Repository: maven-wagon
Updated Branches:
refs/heads/master bcdc16825 -> 0e3c4f94d
[WAGON-473] Don't abuse IllegalArgumentException to intercept null input
Followup fix for test class.
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/0e3c4f94
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/0e3c4f94
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/0e3c4f94
Branch: refs/heads/master
Commit: 0e3c4f94de032b5ca0f60eee8cc2dc8eca825716
Parents: bcdc168
Author: Michael Osipov
Authored: Fri Dec 23 12:07:59 2016 +0100
Committer: Michael Osipov
Committed: Fri Dec 23 12:07:59 2016 +0100
--
.../src/test/java/org/apache/maven/wagon/AbstractWagonTest.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/0e3c4f94/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java
--
diff --git
a/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java
b/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java
index 05f3c5f..ac2e6f6 100644
---
a/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java
+++
b/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java
@@ -514,7 +514,7 @@ public class AbstractWagonTest
wagon.connect( null );
fail();
}
-catch ( IllegalStateException e )
+catch ( NullPointerException e )
{
assertTrue( true );
}
maven-wagon git commit: [WAGON-471] Clean up dependency mess (reported by dependency:analyze)
Repository: maven-wagon
Updated Branches:
refs/heads/master 4da2accfd -> b451e418e
[WAGON-471] Clean up dependency mess (reported by dependency:analyze)
Followup fix for SLF4J Simple in test scope for file, scm and
http-lightweight.
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/b451e418
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/b451e418
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/b451e418
Branch: refs/heads/master
Commit: b451e418ed5235f231f5288fd21054f450669aa9
Parents: 4da2acc
Author: Michael Osipov
Authored: Sun Dec 25 21:09:43 2016 +0100
Committer: Michael Osipov
Committed: Sun Dec 25 21:09:43 2016 +0100
--
wagon-providers/wagon-file/pom.xml | 4
wagon-providers/wagon-http-lightweight/pom.xml | 4
wagon-providers/wagon-scm/pom.xml | 4
3 files changed, 12 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/b451e418/wagon-providers/wagon-file/pom.xml
--
diff --git a/wagon-providers/wagon-file/pom.xml
b/wagon-providers/wagon-file/pom.xml
index 4e3cb52..a96af63 100644
--- a/wagon-providers/wagon-file/pom.xml
+++ b/wagon-providers/wagon-file/pom.xml
@@ -38,5 +38,9 @@ under the License.
org.codehaus.plexus
plexus-utils
+
+ org.slf4j
+ slf4j-simple
+
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/b451e418/wagon-providers/wagon-http-lightweight/pom.xml
--
diff --git a/wagon-providers/wagon-http-lightweight/pom.xml
b/wagon-providers/wagon-http-lightweight/pom.xml
index 9a0e8c8..f723004 100644
--- a/wagon-providers/wagon-http-lightweight/pom.xml
+++ b/wagon-providers/wagon-http-lightweight/pom.xml
@@ -64,5 +64,9 @@ under the License.
jetty
test
+
+ org.slf4j
+ slf4j-simple
+
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/b451e418/wagon-providers/wagon-scm/pom.xml
--
diff --git a/wagon-providers/wagon-scm/pom.xml
b/wagon-providers/wagon-scm/pom.xml
index 55c14e6..881040a 100644
--- a/wagon-providers/wagon-scm/pom.xml
+++ b/wagon-providers/wagon-scm/pom.xml
@@ -65,6 +65,10 @@ under the License.
${mavenScmVersion}
test
+
+ org.slf4j
+ slf4j-simple
+
[2/2] maven-wagon git commit: [WAGON-476] HTTP Provider follows redirects on PUT and may change request method
[WAGON-476] HTTP Provider follows redirects on PUT and may change request method
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/e707a269
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/e707a269
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/e707a269
Branch: refs/heads/jetty-8
Commit: e707a2691e74524a555ea7b7a2fa51d02f827635
Parents: 2e1c807
Author: Michael Osipov
Authored: Mon Dec 26 00:57:24 2016 +0100
Committer: Michael Osipov
Committed: Mon Dec 26 00:57:24 2016 +0100
--
.../maven/wagon/providers/http/AbstractHttpClientWagon.java | 5 +
1 file changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/e707a269/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
--
diff --git
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index a03558a..7773d97 100755
---
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -792,6 +792,11 @@ public abstract class AbstractHttpClientWagon
}
}
+if ( httpMethod instanceof HttpPut )
+{
+requestConfigBuilder.setRedirectsEnabled( false );
+}
+
localContext.setRequestConfig( requestConfigBuilder.build() );
if ( config != null && config.isUsePreemptive() )
[1/2] maven-wagon git commit: [WAGON-474] Upgrade and revise all tests for Jetty 8
Repository: maven-wagon Updated Branches: refs/heads/jetty-8 [created] e707a2691 [WAGON-474] Upgrade and revise all tests for Jetty 8 * Upgrade all test code to Jetty 8.1.22 and Servlet 3.0 * Unify variable names in redirect usecases to realServer and redirectServer * RedirectHandler: redirect code is passed but completely ignored because sendRedirect() always sends 302 * Chronologically sort checkHandlerResult() calls ** Set redirect code (See Other (303)) as requested ** Update checkHandlerResult() for requested status codes rather sent chosen by server (mismatched previously) * testPreemptiveAuthentication*(): properly check for OK for GET and CREATED for PUT instead of OK only for both * WebDavWagonTest: replace status code literal for HttpServletResponse.SC_* for better readability * testRedirect*(): add more checkHandlerResults Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/2e1c807e Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/2e1c807e Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/2e1c807e Branch: refs/heads/jetty-8 Commit: 2e1c807e5345a1999376771f8b378b8cd3328fee Parents: b451e41 Author: Michael Osipov Authored: Mon Dec 26 00:55:09 2016 +0100 Committer: Michael Osipov Committed: Mon Dec 26 00:55:09 2016 +0100 -- pom.xml | 14 +- wagon-provider-test/pom.xml | 8 +- .../maven/wagon/http/HttpWagonTestCase.java | 273 ++- wagon-providers/wagon-http-lightweight/pom.xml | 4 +- .../http/LightweightHttpsWagonTest.java | 6 +- wagon-providers/wagon-http/pom.xml | 8 +- .../http/HttpWagonHttpServerTestCase.java | 14 +- .../http/HttpWagonReasonPhraseTest.java | 2 +- .../providers/http/HttpWagonTimeoutTest.java| 2 +- .../http/HttpsWagonPreemptiveTest.java | 6 +- .../wagon/providers/http/HttpsWagonTest.java| 6 +- .../providers/http/HugeFileDownloadTest.java| 14 +- wagon-providers/wagon-ssh/pom.xml | 8 +- .../ssh/jsch/ScpWagonWithProxyTest.java | 16 +- wagon-providers/wagon-webdav-jackrabbit/pom.xml | 8 +- .../wagon/providers/webdav/WebDavWagonTest.java | 73 ++--- .../providers/webdav/WebDavsWagonTest.java | 6 +- wagon-tcks/wagon-tck-http/pom.xml | 12 +- .../wagon/tck/http/fixture/ServerFixture.java | 52 ++-- 19 files changed, 278 insertions(+), 254 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/2e1c807e/pom.xml -- diff --git a/pom.xml b/pom.xml index e127da4..a90a1ba 100644 --- a/pom.xml +++ b/pom.xml @@ -313,14 +313,14 @@ under the License. -org.mortbay.jetty -jetty -6.1.26 +org.eclipse.jetty.aggregate +jetty-all +8.1.22.v20160922 -org.mortbay.jetty -servlet-api -2.5-20081211 +javax.servlet +javax.servlet-api +3.0.1 @@ -565,5 +565,5 @@ under the License. - + http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/2e1c807e/wagon-provider-test/pom.xml -- diff --git a/wagon-provider-test/pom.xml b/wagon-provider-test/pom.xml index b19e7ac..9b0f4e5 100644 --- a/wagon-provider-test/pom.xml +++ b/wagon-provider-test/pom.xml @@ -51,12 +51,12 @@ under the License. compile - org.mortbay.jetty - jetty + org.eclipse.jetty.aggregate + jetty-all - org.mortbay.jetty - servlet-api + javax.servlet + javax.servlet-api org.slf4j http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/2e1c807e/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java -- diff --git a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java index dfc499e..cf479fd 100644 --- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java +++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java @@ -34,20 +34,21 @@ import org.apache.maven.wagon.resource.Resource; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.StringUtils; -import org.mortbay.jetty.Handler; -import org.mortbay.jetty.HttpConnection; -import org.mortbay.jetty.Request; -import org.mortbay.jetty.Response; -import org.mortbay.jetty.Server; -import or
[1/2] maven-wagon git commit: [WAGON-476] HTTP Provider follows redirects on PUT and may change request method [Forced Update!]
Repository: maven-wagon
Updated Branches:
refs/heads/jetty-8 e707a2691 -> e3e33b43f (forced update)
[WAGON-476] HTTP Provider follows redirects on PUT and may change request method
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/e3e33b43
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/e3e33b43
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/e3e33b43
Branch: refs/heads/jetty-8
Commit: e3e33b43fd53cc3e14ff5dc84f34bd9d93b14a74
Parents: a1d9acb
Author: Michael Osipov
Authored: Mon Dec 26 00:57:24 2016 +0100
Committer: Michael Osipov
Committed: Mon Dec 26 01:52:55 2016 +0100
--
.../maven/wagon/providers/http/AbstractHttpClientWagon.java | 5 +
1 file changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/e3e33b43/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
--
diff --git
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index a03558a..7773d97 100755
---
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -792,6 +792,11 @@ public abstract class AbstractHttpClientWagon
}
}
+if ( httpMethod instanceof HttpPut )
+{
+requestConfigBuilder.setRedirectsEnabled( false );
+}
+
localContext.setRequestConfig( requestConfigBuilder.build() );
if ( config != null && config.isUsePreemptive() )
[2/2] maven-wagon git commit: [WAGON-474] Upgrade and revise all tests for Jetty 8
[WAGON-474] Upgrade and revise all tests for Jetty 8 * Upgrade all test code to Jetty 8.1.22 and Servlet 3.0 * Unify variable names in redirect usecases to realServer and redirectServer * RedirectHandler: redirect code is passed but completely ignored because sendRedirect() always sends 302 * Chronologically sort checkHandlerResult() calls ** Set redirect code (See Other (303)) as requested ** Update checkHandlerResult() for requested status codes rather sent chosen by server (mismatched previously) * testPreemptiveAuthentication*(): properly check for OK for GET and CREATED for PUT instead of OK only for both * WebDavWagonTest: replace status code literal for HttpServletResponse.SC_* for better readability * testRedirect*(): add more checkHandlerResults Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/a1d9acbf Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/a1d9acbf Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/a1d9acbf Branch: refs/heads/jetty-8 Commit: a1d9acbf687e69b33ba472a888a04ba337b40b0a Parents: b451e41 Author: Michael Osipov Authored: Mon Dec 26 00:55:09 2016 +0100 Committer: Michael Osipov Committed: Mon Dec 26 01:52:55 2016 +0100 -- pom.xml | 14 +- wagon-provider-test/pom.xml | 8 +- .../maven/wagon/http/HttpWagonTestCase.java | 273 ++- wagon-providers/wagon-http-lightweight/pom.xml | 4 +- .../http/LightweightHttpsWagonTest.java | 6 +- wagon-providers/wagon-http/pom.xml | 8 +- .../http/HttpWagonHttpServerTestCase.java | 14 +- .../http/HttpWagonReasonPhraseTest.java | 2 +- .../providers/http/HttpWagonTimeoutTest.java| 2 +- .../http/HttpsWagonPreemptiveTest.java | 6 +- .../wagon/providers/http/HttpsWagonTest.java| 6 +- .../providers/http/HugeFileDownloadTest.java| 14 +- wagon-providers/wagon-ssh/pom.xml | 8 +- .../ssh/jsch/ScpWagonWithProxyTest.java | 16 +- wagon-providers/wagon-webdav-jackrabbit/pom.xml | 8 +- .../wagon/providers/webdav/WebDavWagonTest.java | 73 ++--- .../providers/webdav/WebDavsWagonTest.java | 6 +- wagon-tcks/wagon-tck-http/pom.xml | 12 +- .../wagon/tck/http/fixture/ServerFixture.java | 52 ++-- 19 files changed, 278 insertions(+), 254 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/a1d9acbf/pom.xml -- diff --git a/pom.xml b/pom.xml index e127da4..a90a1ba 100644 --- a/pom.xml +++ b/pom.xml @@ -313,14 +313,14 @@ under the License. -org.mortbay.jetty -jetty -6.1.26 +org.eclipse.jetty.aggregate +jetty-all +8.1.22.v20160922 -org.mortbay.jetty -servlet-api -2.5-20081211 +javax.servlet +javax.servlet-api +3.0.1 @@ -565,5 +565,5 @@ under the License. - + http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/a1d9acbf/wagon-provider-test/pom.xml -- diff --git a/wagon-provider-test/pom.xml b/wagon-provider-test/pom.xml index b19e7ac..9b0f4e5 100644 --- a/wagon-provider-test/pom.xml +++ b/wagon-provider-test/pom.xml @@ -51,12 +51,12 @@ under the License. compile - org.mortbay.jetty - jetty + org.eclipse.jetty.aggregate + jetty-all - org.mortbay.jetty - servlet-api + javax.servlet + javax.servlet-api org.slf4j http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/a1d9acbf/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java -- diff --git a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java index dfc499e..65a68af 100644 --- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java +++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java @@ -34,20 +34,21 @@ import org.apache.maven.wagon.resource.Resource; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.StringUtils; -import org.mortbay.jetty.Handler; -import org.mortbay.jetty.HttpConnection; -import org.mortbay.jetty.Request; -import org.mortbay.jetty.Response; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.handler.AbstractHandler; -import org.mortbay.jetty.handler.HandlerCol
maven-surefire git commit: [SUREFIRE-1315] Fix stylistic errors in DefaultReporterFactory
Repository: maven-surefire
Updated Branches:
refs/heads/master 303cc8acd -> bd75bac32
[SUREFIRE-1315] Fix stylistic errors in DefaultReporterFactory
Label refinements based on discussion on maven-dev.
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/bd75bac3
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/bd75bac3
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/bd75bac3
Branch: refs/heads/master
Commit: bd75bac320301db3fc4d8aec5b431f4d10171eb9
Parents: 303cc8a
Author: Michael Osipov
Authored: Mon Dec 26 17:51:23 2016 +0100
Committer: Michael Osipov
Committed: Mon Dec 26 17:59:56 2016 +0100
--
.../plugin/surefire/report/DefaultReporterFactory.java | 12 ++--
.../surefire/report/DefaultReporterFactoryTest.java | 4 ++--
.../src/site/markdown/newerrorsummary.md| 4 ++--
.../maven/surefire/its/JUnit4RerunFailingTestsIT.java | 10 +-
.../jiras/Surefire1146RerunFailedAndParameterized.java | 2 +-
5 files changed, 16 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bd75bac3/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
index 342e883..b4a6f30 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
@@ -427,12 +427,12 @@ public class DefaultReporterFactory
enum TestResultType
{
-error( "Erroneous Tests: " ),
-failure( "Failed Tests: " ),
-flake("Flaky Tests: " ),
-success( "Success: "),
-skipped( "Skipped: "),
-unknown( "Unknown: ");
+error( "Errors: " ),
+failure( "Failures: " ),
+flake( "Flakes: " ),
+success( "Success: " ),
+skipped( "Skipped: " ),
+unknown( "Unknown: " );
private final String logPrefix;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bd75bac3/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
--
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
index 98f97bd..fbe875d 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
+++
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
@@ -120,7 +120,7 @@ public class DefaultReporterFactoryTest
// Now test the result will be printed out correctly
factory.printTestFailures( flake );
String[] expectedFlakeOutput =
-{ "Flaky Tests: ", TEST_FOUR, " Run 1: " + ASSERTION_FAIL, " Run
2: PASS", "", TEST_ONE,
+{ "Flakes: ", TEST_FOUR, " Run 1: " + ASSERTION_FAIL, " Run 2:
PASS", "", TEST_ONE,
" Run 1: " + ERROR, " Run 2: " + ASSERTION_FAIL, " Run 3:
PASS", "", TEST_TWO, " Run 1: " + ERROR,
" Run 2: PASS", "" };
assertEquals( asList( expectedFlakeOutput ), reporter.getMessages() );
@@ -128,7 +128,7 @@ public class DefaultReporterFactoryTest
reporter.reset();
factory.printTestFailures( error );
String[] expectedFailureOutput =
-{ "Erroneous Tests: ", TEST_THREE, " Run 1: " + ASSERTION_FAIL, "
Run 2: " + ERROR, " Run 3: " + ERROR, ""
+{ "Errors: ", TEST_THREE, " Run 1: " + ASSERTION_FAIL, " Run 2:
" + ERROR, " Run 3: " + ERROR, ""
};
assertEquals( asList( expectedFailureOutput ), reporter.getMessages()
);
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bd75bac3/maven-surefire-plugin/src/site/markdown/newerrorsummary.md
--
diff --git a/maven-surefire-plugin/src/site/markdown/newerrorsummary.md
b/maven-surefire-plugin/src/site/markdown/newerrorsummary.md
index 09537e3..88cd7c3 100644
--- a/maven-surefire-plugin/src/site/markdown/newerrorsummary.md
+++ b/maven-surefire-plugin/src/site/markdown/newerrorsummary.md
@@ -26,11 +26,11 @@ re
[3/5] maven-wagon git commit: [WAGON-479] Preemptive auth with HTTP Provider may fail because BasicScheme is added as completed=true to the AuthCache
[WAGON-479] Preemptive auth with HTTP Provider may fail because BasicScheme is
added as completed=true to the AuthCache
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/2d9cf05e
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/2d9cf05e
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/2d9cf05e
Branch: refs/heads/jetty-8
Commit: 2d9cf05eecbe74a56e80886348d9a1ee95e15ece
Parents: 0d560b9
Author: Michael Osipov
Authored: Tue Dec 27 23:29:26 2016 +0100
Committer: Michael Osipov
Committed: Tue Dec 27 23:29:26 2016 +0100
--
.../providers/http/AbstractHttpClientWagon.java | 45 +---
1 file changed, 11 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/2d9cf05e/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
--
diff --git
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index 7773d97..d38506f 100755
---
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -25,10 +25,9 @@ import org.apache.http.HttpException;
import org.apache.http.HttpHost;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
-import org.apache.http.auth.AUTH;
import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.ChallengeState;
import org.apache.http.auth.Credentials;
-import org.apache.http.auth.MalformedChallengeException;
import org.apache.http.auth.NTCredentials;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.AuthCache;
@@ -460,9 +459,9 @@ public abstract class AbstractHttpClientWagon
creds = new UsernamePasswordCredentials(
proxyUsername, proxyPassword );
}
-int port = proxyInfo.getPort();
+int proxyPort = proxyInfo.getPort();
-AuthScope authScope = getProxyBasicAuthScope().getScope(
proxyHost, port );
+AuthScope authScope = getProxyBasicAuthScope().getScope(
proxyHost, proxyPort );
credentialsProvider.setCredentials( authScope, creds );
}
}
@@ -576,15 +575,7 @@ public abstract class AbstractHttpClientWagon
if ( credentialsProvider.getCredentials( targetScope ) != null )
{
BasicScheme targetAuth = new BasicScheme();
-try
-{
-targetAuth.processChallenge( new BasicHeader( AUTH.WWW_AUTH,
"BASIC preemptive" ) );
-authCache.put( targetHost, targetAuth );
-}
-catch ( MalformedChallengeException ignore )
-{
-// ignore
-}
+authCache.put( targetHost, targetAuth );
}
HttpPut putMethod = new HttpPut( url );
@@ -807,7 +798,6 @@ public abstract class AbstractHttpClientWagon
if ( credentialsProvider.getCredentials( targetScope ) != null )
{
BasicScheme targetAuth = new BasicScheme();
-targetAuth.processChallenge( new BasicHeader( AUTH.WWW_AUTH,
"BASIC preemptive" ) );
authCache.put( targetHost, targetAuth );
}
}
@@ -819,26 +809,13 @@ public abstract class AbstractHttpClientWagon
HttpHost proxyHost = new HttpHost( proxyInfo.getHost(),
proxyInfo.getPort() );
AuthScope proxyScope = getProxyBasicAuthScope().getScope(
proxyHost );
-String proxyUsername = proxyInfo.getUserName();
-String proxyPassword = proxyInfo.getPassword();
-String proxyNtlmHost = proxyInfo.getNtlmHost();
-String proxyNtlmDomain = proxyInfo.getNtlmDomain();
-
-if ( proxyUsername != null && proxyPassword != null )
+if ( credentialsProvider.getCredentials( proxyScope ) != null )
{
-Credentials creds;
-if ( proxyNtlmHost != null || proxyNtlmDomain != null )
-{
-creds = new NTCredentials( proxyUsername,
proxyPassword, proxyNtlmHost, proxyNtlmDomain );
-}
-else
-{
-creds = new UsernamePasswordCredentials(
proxyUsername, proxyPassword );
-}
-
-
[5/5] maven-wagon git commit: [WAGON-481] Sensitive (auth) information is not cleared when HttpClientWagon is disconnected
[WAGON-481] Sensitive (auth) information is not cleared when HttpClientWagon is
disconnected
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/faee1f35
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/faee1f35
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/faee1f35
Branch: refs/heads/jetty-8
Commit: faee1f3561fd1793e292a5ec0995ceaaeac06198
Parents: f9f582e
Author: Michael Osipov
Authored: Wed Dec 28 01:28:49 2016 +0100
Committer: Michael Osipov
Committed: Wed Dec 28 01:28:49 2016 +0100
--
.../wagon/providers/http/AbstractHttpClientWagon.java | 12
1 file changed, 12 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/faee1f35/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
--
diff --git
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index 9ef9544..c693cd0 100755
---
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -469,6 +469,18 @@ public abstract class AbstractHttpClientWagon
{
httpClientConnectionManager.closeIdleConnections( 0,
TimeUnit.MILLISECONDS );
}
+
+if ( authCache != null )
+{
+authCache.clear();
+authCache = null;
+}
+
+if ( credentialsProvider != null )
+{
+credentialsProvider.clear();
+credentialsProvider = null;
+}
}
public static void setPersistentPool( boolean persistentPool )
[2/5] maven-wagon git commit: [WAGON-476] HTTP Provider follows redirects on PUT and may change request method
[WAGON-476] HTTP Provider follows redirects on PUT and may change request method
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/0d560b9e
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/0d560b9e
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/0d560b9e
Branch: refs/heads/jetty-8
Commit: 0d560b9e4bd230b49daa948980a4284bb997a5ca
Parents: a66be46
Author: Michael Osipov
Authored: Mon Dec 26 00:57:24 2016 +0100
Committer: Michael Osipov
Committed: Tue Dec 27 23:07:49 2016 +0100
--
.../maven/wagon/providers/http/AbstractHttpClientWagon.java | 5 +
1 file changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/0d560b9e/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
--
diff --git
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index a03558a..7773d97 100755
---
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -792,6 +792,11 @@ public abstract class AbstractHttpClientWagon
}
}
+if ( httpMethod instanceof HttpPut )
+{
+requestConfigBuilder.setRedirectsEnabled( false );
+}
+
localContext.setRequestConfig( requestConfigBuilder.build() );
if ( config != null && config.isUsePreemptive() )
[4/5] maven-wagon git commit: [WAGON-480] Non-threadsafe HttpClientContext is shared between threaded use of HttpClientWagon
[WAGON-480] Non-threadsafe HttpClientContext is shared between threaded use of
HttpClientWagon
The HttpClientContext is created fresh with every execute(), guaranteeing
thread safety.
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/f9f582e8
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/f9f582e8
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/f9f582e8
Branch: refs/heads/jetty-8
Commit: f9f582e824970fd41d619c7cdbf52b787cbc4051
Parents: 2d9cf05
Author: Michael Osipov
Authored: Wed Dec 28 01:20:07 2016 +0100
Committer: Michael Osipov
Committed: Wed Dec 28 01:20:07 2016 +0100
--
.../maven/wagon/providers/http/AbstractHttpClientWagon.java | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f9f582e8/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
--
diff --git
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index d38506f..9ef9544 100755
---
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -383,8 +383,6 @@ public abstract class AbstractHttpClientWagon
private AuthCache authCache;
-private HttpClientContext localContext;
-
private Closeable closeable;
/**
@@ -414,11 +412,8 @@ public abstract class AbstractHttpClientWagon
{
repository.setUrl( getURL( repository ) );
-localContext = HttpClientContext.create();
credentialsProvider = new BasicCredentialsProvider();
authCache = new BasicAuthCache();
-localContext.setCredentialsProvider( credentialsProvider );
-localContext.setAuthCache( authCache );
if ( authenticationInfo != null )
{
@@ -788,6 +783,9 @@ public abstract class AbstractHttpClientWagon
requestConfigBuilder.setRedirectsEnabled( false );
}
+HttpClientContext localContext = HttpClientContext.create();
+localContext.setCredentialsProvider( credentialsProvider );
+localContext.setAuthCache( authCache );
localContext.setRequestConfig( requestConfigBuilder.build() );
if ( config != null && config.isUsePreemptive() )
[1/5] maven-wagon git commit: [WAGON-474] Upgrade and revise all tests for Jetty 8 [Forced Update!]
Repository: maven-wagon Updated Branches: refs/heads/jetty-8 e3e33b43f -> faee1f356 (forced update) [WAGON-474] Upgrade and revise all tests for Jetty 8 * Upgrade all test code to Jetty 8.1.22 and Servlet 3.0 * Unify variable names in redirect usecases to realServer and redirectServer * RedirectHandler: redirect code is passed but completely ignored because sendRedirect() always sends 302 * Chronologically sort checkHandlerResult() calls ** Set redirect code (See Other (303)) as requested ** Update checkHandlerResult() for requested status codes rather sent chosen by server (mismatched previously) * testPreemptiveAuthentication*(): properly check for OK for GET and CREATED for PUT instead of OK only for both * WebDavWagonTest: replace status code literal for HttpServletResponse.SC_* for better readability * testRedirect*(): add more checkHandlerResults * Fix concurrency issues/race conditions in testSecuredGet() and testSecuredGetToStream() where Jetty workers weren't finished yet, but assert() has already been started. Waiting for 2000 ms avoids this in a cheap manner. Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/a66be461 Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/a66be461 Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/a66be461 Branch: refs/heads/jetty-8 Commit: a66be4619ef588003ccb373fc103fc734eeb18d8 Parents: b451e41 Author: Michael Osipov Authored: Mon Dec 26 00:55:09 2016 +0100 Committer: Michael Osipov Committed: Tue Dec 27 23:07:48 2016 +0100 -- pom.xml | 14 +- wagon-provider-test/pom.xml | 8 +- .../maven/wagon/http/HttpWagonTestCase.java | 291 ++- wagon-providers/wagon-http-lightweight/pom.xml | 4 +- .../http/LightweightHttpsWagonTest.java | 6 +- wagon-providers/wagon-http/pom.xml | 8 +- .../http/HttpWagonHttpServerTestCase.java | 14 +- .../http/HttpWagonReasonPhraseTest.java | 2 +- .../providers/http/HttpWagonTimeoutTest.java| 2 +- .../http/HttpsWagonPreemptiveTest.java | 6 +- .../wagon/providers/http/HttpsWagonTest.java| 6 +- .../providers/http/HugeFileDownloadTest.java| 14 +- wagon-providers/wagon-ssh/pom.xml | 8 +- .../ssh/jsch/ScpWagonWithProxyTest.java | 16 +- wagon-providers/wagon-webdav-jackrabbit/pom.xml | 8 +- .../wagon/providers/webdav/WebDavWagonTest.java | 73 +++-- .../providers/webdav/WebDavsWagonTest.java | 6 +- wagon-tcks/wagon-tck-http/pom.xml | 12 +- .../wagon/tck/http/fixture/ServerFixture.java | 52 ++-- 19 files changed, 296 insertions(+), 254 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/a66be461/pom.xml -- diff --git a/pom.xml b/pom.xml index e127da4..a90a1ba 100644 --- a/pom.xml +++ b/pom.xml @@ -313,14 +313,14 @@ under the License. -org.mortbay.jetty -jetty -6.1.26 +org.eclipse.jetty.aggregate +jetty-all +8.1.22.v20160922 -org.mortbay.jetty -servlet-api -2.5-20081211 +javax.servlet +javax.servlet-api +3.0.1 @@ -565,5 +565,5 @@ under the License. - + http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/a66be461/wagon-provider-test/pom.xml -- diff --git a/wagon-provider-test/pom.xml b/wagon-provider-test/pom.xml index b19e7ac..9b0f4e5 100644 --- a/wagon-provider-test/pom.xml +++ b/wagon-provider-test/pom.xml @@ -51,12 +51,12 @@ under the License. compile - org.mortbay.jetty - jetty + org.eclipse.jetty.aggregate + jetty-all - org.mortbay.jetty - servlet-api + javax.servlet + javax.servlet-api org.slf4j http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/a66be461/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java -- diff --git a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java index dfc499e..172d5be 100644 --- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java +++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java @@ -34,20 +34,21 @@ import org.apache.maven.wagon.resource.Resource; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util
[4/5] maven-wagon git commit: [WAGON-480] Non-threadsafe HttpClientContext is shared between threaded use of HttpClientWagon
[WAGON-480] Non-threadsafe HttpClientContext is shared between threaded use of
HttpClientWagon
The HttpClientContext is created fresh with every execute(), guaranteeing
thread safety.
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/15689535
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/15689535
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/15689535
Branch: refs/heads/jetty-8
Commit: 15689535e03c223d4eb4cb32397a2ca3eee06ec6
Parents: 594132b
Author: Michael Osipov
Authored: Wed Dec 28 01:20:07 2016 +0100
Committer: Michael Osipov
Committed: Thu Dec 29 21:26:47 2016 +0100
--
.../maven/wagon/providers/http/AbstractHttpClientWagon.java | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/15689535/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
--
diff --git
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index d38506f..9ef9544 100755
---
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -383,8 +383,6 @@ public abstract class AbstractHttpClientWagon
private AuthCache authCache;
-private HttpClientContext localContext;
-
private Closeable closeable;
/**
@@ -414,11 +412,8 @@ public abstract class AbstractHttpClientWagon
{
repository.setUrl( getURL( repository ) );
-localContext = HttpClientContext.create();
credentialsProvider = new BasicCredentialsProvider();
authCache = new BasicAuthCache();
-localContext.setCredentialsProvider( credentialsProvider );
-localContext.setAuthCache( authCache );
if ( authenticationInfo != null )
{
@@ -788,6 +783,9 @@ public abstract class AbstractHttpClientWagon
requestConfigBuilder.setRedirectsEnabled( false );
}
+HttpClientContext localContext = HttpClientContext.create();
+localContext.setCredentialsProvider( credentialsProvider );
+localContext.setAuthCache( authCache );
localContext.setRequestConfig( requestConfigBuilder.build() );
if ( config != null && config.isUsePreemptive() )
[2/5] maven-wagon git commit: [WAGON-476] HTTP Provider follows redirects on PUT and may change request method
[WAGON-476] HTTP Provider follows redirects on PUT and may change request method
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/d83a4924
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/d83a4924
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/d83a4924
Branch: refs/heads/jetty-8
Commit: d83a4924f38af2b99f2928bc81c2cedcc0ff8863
Parents: d79e663
Author: Michael Osipov
Authored: Mon Dec 26 00:57:24 2016 +0100
Committer: Michael Osipov
Committed: Thu Dec 29 21:26:45 2016 +0100
--
.../maven/wagon/providers/http/AbstractHttpClientWagon.java | 5 +
1 file changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/d83a4924/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
--
diff --git
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index a03558a..7773d97 100755
---
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -792,6 +792,11 @@ public abstract class AbstractHttpClientWagon
}
}
+if ( httpMethod instanceof HttpPut )
+{
+requestConfigBuilder.setRedirectsEnabled( false );
+}
+
localContext.setRequestConfig( requestConfigBuilder.build() );
if ( config != null && config.isUsePreemptive() )
[3/5] maven-wagon git commit: [WAGON-479] Preemptive auth with HTTP Provider may fail because BasicScheme is added as completed=true to the AuthCache
[WAGON-479] Preemptive auth with HTTP Provider may fail because BasicScheme is
added as completed=true to the AuthCache
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/594132be
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/594132be
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/594132be
Branch: refs/heads/jetty-8
Commit: 594132bead0067e264d0592e4c8fc41197ca5881
Parents: d83a492
Author: Michael Osipov
Authored: Tue Dec 27 23:29:26 2016 +0100
Committer: Michael Osipov
Committed: Thu Dec 29 21:26:46 2016 +0100
--
.../providers/http/AbstractHttpClientWagon.java | 45 +---
1 file changed, 11 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/594132be/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
--
diff --git
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index 7773d97..d38506f 100755
---
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -25,10 +25,9 @@ import org.apache.http.HttpException;
import org.apache.http.HttpHost;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
-import org.apache.http.auth.AUTH;
import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.ChallengeState;
import org.apache.http.auth.Credentials;
-import org.apache.http.auth.MalformedChallengeException;
import org.apache.http.auth.NTCredentials;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.AuthCache;
@@ -460,9 +459,9 @@ public abstract class AbstractHttpClientWagon
creds = new UsernamePasswordCredentials(
proxyUsername, proxyPassword );
}
-int port = proxyInfo.getPort();
+int proxyPort = proxyInfo.getPort();
-AuthScope authScope = getProxyBasicAuthScope().getScope(
proxyHost, port );
+AuthScope authScope = getProxyBasicAuthScope().getScope(
proxyHost, proxyPort );
credentialsProvider.setCredentials( authScope, creds );
}
}
@@ -576,15 +575,7 @@ public abstract class AbstractHttpClientWagon
if ( credentialsProvider.getCredentials( targetScope ) != null )
{
BasicScheme targetAuth = new BasicScheme();
-try
-{
-targetAuth.processChallenge( new BasicHeader( AUTH.WWW_AUTH,
"BASIC preemptive" ) );
-authCache.put( targetHost, targetAuth );
-}
-catch ( MalformedChallengeException ignore )
-{
-// ignore
-}
+authCache.put( targetHost, targetAuth );
}
HttpPut putMethod = new HttpPut( url );
@@ -807,7 +798,6 @@ public abstract class AbstractHttpClientWagon
if ( credentialsProvider.getCredentials( targetScope ) != null )
{
BasicScheme targetAuth = new BasicScheme();
-targetAuth.processChallenge( new BasicHeader( AUTH.WWW_AUTH,
"BASIC preemptive" ) );
authCache.put( targetHost, targetAuth );
}
}
@@ -819,26 +809,13 @@ public abstract class AbstractHttpClientWagon
HttpHost proxyHost = new HttpHost( proxyInfo.getHost(),
proxyInfo.getPort() );
AuthScope proxyScope = getProxyBasicAuthScope().getScope(
proxyHost );
-String proxyUsername = proxyInfo.getUserName();
-String proxyPassword = proxyInfo.getPassword();
-String proxyNtlmHost = proxyInfo.getNtlmHost();
-String proxyNtlmDomain = proxyInfo.getNtlmDomain();
-
-if ( proxyUsername != null && proxyPassword != null )
+if ( credentialsProvider.getCredentials( proxyScope ) != null )
{
-Credentials creds;
-if ( proxyNtlmHost != null || proxyNtlmDomain != null )
-{
-creds = new NTCredentials( proxyUsername,
proxyPassword, proxyNtlmHost, proxyNtlmDomain );
-}
-else
-{
-creds = new UsernamePasswordCredentials(
proxyUsername, proxyPassword );
-}
-
-
[5/5] maven-wagon git commit: [WAGON-481] Sensitive (auth) information is not cleared when HttpClientWagon is disconnected
[WAGON-481] Sensitive (auth) information is not cleared when HttpClientWagon is
disconnected
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/307f8a6d
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/307f8a6d
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/307f8a6d
Branch: refs/heads/jetty-8
Commit: 307f8a6dbc73383b686f7c88d90c81e1d48211d6
Parents: 1568953
Author: Michael Osipov
Authored: Wed Dec 28 01:28:49 2016 +0100
Committer: Michael Osipov
Committed: Thu Dec 29 21:26:48 2016 +0100
--
.../wagon/providers/http/AbstractHttpClientWagon.java | 12
1 file changed, 12 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/307f8a6d/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
--
diff --git
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index 9ef9544..c693cd0 100755
---
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -469,6 +469,18 @@ public abstract class AbstractHttpClientWagon
{
httpClientConnectionManager.closeIdleConnections( 0,
TimeUnit.MILLISECONDS );
}
+
+if ( authCache != null )
+{
+authCache.clear();
+authCache = null;
+}
+
+if ( credentialsProvider != null )
+{
+credentialsProvider.clear();
+credentialsProvider = null;
+}
}
public static void setPersistentPool( boolean persistentPool )
[1/5] maven-wagon git commit: [WAGON-474] Upgrade and revise all tests for Jetty 8 [Forced Update!]
Repository: maven-wagon Updated Branches: refs/heads/jetty-8 faee1f356 -> 307f8a6db (forced update) [WAGON-474] Upgrade and revise all tests for Jetty 8 * Upgrade all test code to Jetty 8.1.22 and Servlet 3.0 * Unify variable names in redirect usecases to realServer and redirectServer * RedirectHandler: redirect code is passed but completely ignored because sendRedirect() always sends 302 * Chronologically sort checkHandlerResult() calls ** Set redirect code (See Other (303)) as requested ** Update checkHandlerResult() for requested status codes rather sent chosen by server (mismatched previously) * testPreemptiveAuthentication*(): properly check for OK for GET and CREATED for PUT instead of OK only for both * WebDavWagonTest: replace status code literal for HttpServletResponse.SC_* for better readability * testRedirect*(): add more checkHandlerResults * Fix concurrency issues/race conditions in testSecuredGet() and testSecuredGetToStream() where Jetty workers weren't finished yet, but assert() has already been started. Waiting for 2000 ms avoids this in a cheap manner. * Fix potential memory leaks from open sockets and Wagons Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/d79e6639 Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/d79e6639 Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/d79e6639 Branch: refs/heads/jetty-8 Commit: d79e66393ff9032a0ba463523ce10f929f2231d7 Parents: b451e41 Author: Michael Osipov Authored: Mon Dec 26 00:55:09 2016 +0100 Committer: Michael Osipov Committed: Thu Dec 29 21:26:44 2016 +0100 -- pom.xml | 14 +- wagon-provider-test/pom.xml | 8 +- .../maven/wagon/http/HttpWagonTestCase.java | 299 +++ .../wagon/providers/file/FileWagonTest.java | 13 +- wagon-providers/wagon-http-lightweight/pom.xml | 4 +- .../http/LightweightHttpsWagonTest.java | 6 +- wagon-providers/wagon-http/pom.xml | 8 +- .../http/AbstractHttpClientWagonTest.java | 2 + .../http/HttpWagonHttpServerTestCase.java | 14 +- .../http/HttpWagonReasonPhraseTest.java | 2 +- .../providers/http/HttpWagonTimeoutTest.java| 4 +- .../http/HttpsWagonPreemptiveTest.java | 6 +- .../wagon/providers/http/HttpsWagonTest.java| 6 +- .../providers/http/HugeFileDownloadTest.java| 20 +- wagon-providers/wagon-ssh/pom.xml | 8 +- .../ssh/jsch/ScpWagonWithProxyTest.java | 23 +- wagon-providers/wagon-webdav-jackrabbit/pom.xml | 8 +- .../wagon/providers/webdav/WebDavWagonTest.java | 73 +++-- .../providers/webdav/WebDavsWagonTest.java | 6 +- wagon-tcks/wagon-tck-http/pom.xml | 12 +- .../wagon/tck/http/fixture/ServerFixture.java | 52 ++-- 21 files changed, 319 insertions(+), 269 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/d79e6639/pom.xml -- diff --git a/pom.xml b/pom.xml index e127da4..a90a1ba 100644 --- a/pom.xml +++ b/pom.xml @@ -313,14 +313,14 @@ under the License. -org.mortbay.jetty -jetty -6.1.26 +org.eclipse.jetty.aggregate +jetty-all +8.1.22.v20160922 -org.mortbay.jetty -servlet-api -2.5-20081211 +javax.servlet +javax.servlet-api +3.0.1 @@ -565,5 +565,5 @@ under the License. - + http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/d79e6639/wagon-provider-test/pom.xml -- diff --git a/wagon-provider-test/pom.xml b/wagon-provider-test/pom.xml index b19e7ac..9b0f4e5 100644 --- a/wagon-provider-test/pom.xml +++ b/wagon-provider-test/pom.xml @@ -51,12 +51,12 @@ under the License. compile - org.mortbay.jetty - jetty + org.eclipse.jetty.aggregate + jetty-all - org.mortbay.jetty - servlet-api + javax.servlet + javax.servlet-api org.slf4j http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/d79e6639/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java -- diff --git a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java index dfc499e..c19eaa3 100644 --- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java +++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/
maven-wagon git commit: Intermedite commit; will disappear soon
Repository: maven-wagon
Updated Branches:
refs/heads/jetty-8 307f8a6db -> df0af51bc
Intermedite commit; will disappear soon
* Use fsutil on Windows to create a 4 GiB file very fast
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/df0af51b
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/df0af51b
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/df0af51b
Branch: refs/heads/jetty-8
Commit: df0af51bca96570e3cff1f1a84746329b146cf36
Parents: 307f8a6
Author: Michael Osipov
Authored: Fri Dec 30 22:03:55 2016 +0100
Committer: Michael Osipov
Committed: Fri Dec 30 22:03:55 2016 +0100
--
.../providers/http/HugeFileDownloadTest.java| 20 +++-
1 file changed, 15 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/df0af51b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
--
diff --git
a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
index f460e0b..fba63c4 100644
---
a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
+++
b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
@@ -24,6 +24,7 @@ import org.apache.maven.wagon.Wagon;
import org.apache.maven.wagon.observers.Debug;
import org.apache.maven.wagon.repository.Repository;
import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.util.Os;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.DefaultServlet;
import org.eclipse.jetty.servlet.ServletContextHandler;
@@ -168,11 +169,20 @@ public class HugeFileDownloadTest
private void makeHugeFile( File hugeFile )
throws Exception
{
-RandomAccessFile ra = new RandomAccessFile( hugeFile.getPath(), "rw" );
-ra.setLength( HUGE_FILE_SIZE + 1 );
-ra.seek( HUGE_FILE_SIZE );
-ra.write( 1 );
-ra.close();
+if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
+{
+Process p = new ProcessBuilder( "fsutil", "file", "createnew",
hugeFile.getAbsolutePath(),
+String.valueOf( HUGE_FILE_SIZE )
).start();
+p.waitFor();
+}
+else
+{
+RandomAccessFile ra = new RandomAccessFile( hugeFile.getPath(),
"rw" );
+ra.setLength( HUGE_FILE_SIZE + 1L );
+ra.seek( HUGE_FILE_SIZE );
+ra.write( 1 );
+ra.close();
+}
}
}
[2/5] maven-wagon git commit: [WAGON-476] HTTP Provider follows redirects on PUT and may change request method
[WAGON-476] HTTP Provider follows redirects on PUT and may change request method
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/0ea39498
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/0ea39498
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/0ea39498
Branch: refs/heads/jetty-8
Commit: 0ea39498e762371c5c419e7b8adbe14afbaf3519
Parents: 15becb3
Author: Michael Osipov
Authored: Mon Dec 26 00:57:24 2016 +0100
Committer: Michael Osipov
Committed: Tue Jan 3 21:35:03 2017 +0100
--
.../maven/wagon/providers/http/AbstractHttpClientWagon.java | 5 +
1 file changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/0ea39498/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
--
diff --git
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index a03558a..7773d97 100755
---
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -792,6 +792,11 @@ public abstract class AbstractHttpClientWagon
}
}
+if ( httpMethod instanceof HttpPut )
+{
+requestConfigBuilder.setRedirectsEnabled( false );
+}
+
localContext.setRequestConfig( requestConfigBuilder.build() );
if ( config != null && config.isUsePreemptive() )
[3/5] maven-wagon git commit: [WAGON-479] Preemptive auth with HTTP Provider may fail because BasicScheme is added as completed=true to the AuthCache
[WAGON-479] Preemptive auth with HTTP Provider may fail because BasicScheme is
added as completed=true to the AuthCache
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/bb77d508
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/bb77d508
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/bb77d508
Branch: refs/heads/jetty-8
Commit: bb77d50855498613874fea3d54317c75b745298c
Parents: 0ea3949
Author: Michael Osipov
Authored: Tue Dec 27 23:29:26 2016 +0100
Committer: Michael Osipov
Committed: Tue Jan 3 21:35:04 2017 +0100
--
.../providers/http/AbstractHttpClientWagon.java | 45 +---
1 file changed, 11 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/bb77d508/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
--
diff --git
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index 7773d97..d38506f 100755
---
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -25,10 +25,9 @@ import org.apache.http.HttpException;
import org.apache.http.HttpHost;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
-import org.apache.http.auth.AUTH;
import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.ChallengeState;
import org.apache.http.auth.Credentials;
-import org.apache.http.auth.MalformedChallengeException;
import org.apache.http.auth.NTCredentials;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.AuthCache;
@@ -460,9 +459,9 @@ public abstract class AbstractHttpClientWagon
creds = new UsernamePasswordCredentials(
proxyUsername, proxyPassword );
}
-int port = proxyInfo.getPort();
+int proxyPort = proxyInfo.getPort();
-AuthScope authScope = getProxyBasicAuthScope().getScope(
proxyHost, port );
+AuthScope authScope = getProxyBasicAuthScope().getScope(
proxyHost, proxyPort );
credentialsProvider.setCredentials( authScope, creds );
}
}
@@ -576,15 +575,7 @@ public abstract class AbstractHttpClientWagon
if ( credentialsProvider.getCredentials( targetScope ) != null )
{
BasicScheme targetAuth = new BasicScheme();
-try
-{
-targetAuth.processChallenge( new BasicHeader( AUTH.WWW_AUTH,
"BASIC preemptive" ) );
-authCache.put( targetHost, targetAuth );
-}
-catch ( MalformedChallengeException ignore )
-{
-// ignore
-}
+authCache.put( targetHost, targetAuth );
}
HttpPut putMethod = new HttpPut( url );
@@ -807,7 +798,6 @@ public abstract class AbstractHttpClientWagon
if ( credentialsProvider.getCredentials( targetScope ) != null )
{
BasicScheme targetAuth = new BasicScheme();
-targetAuth.processChallenge( new BasicHeader( AUTH.WWW_AUTH,
"BASIC preemptive" ) );
authCache.put( targetHost, targetAuth );
}
}
@@ -819,26 +809,13 @@ public abstract class AbstractHttpClientWagon
HttpHost proxyHost = new HttpHost( proxyInfo.getHost(),
proxyInfo.getPort() );
AuthScope proxyScope = getProxyBasicAuthScope().getScope(
proxyHost );
-String proxyUsername = proxyInfo.getUserName();
-String proxyPassword = proxyInfo.getPassword();
-String proxyNtlmHost = proxyInfo.getNtlmHost();
-String proxyNtlmDomain = proxyInfo.getNtlmDomain();
-
-if ( proxyUsername != null && proxyPassword != null )
+if ( credentialsProvider.getCredentials( proxyScope ) != null )
{
-Credentials creds;
-if ( proxyNtlmHost != null || proxyNtlmDomain != null )
-{
-creds = new NTCredentials( proxyUsername,
proxyPassword, proxyNtlmHost, proxyNtlmDomain );
-}
-else
-{
-creds = new UsernamePasswordCredentials(
proxyUsername, proxyPassword );
-}
-
-
[5/5] maven-wagon git commit: [WAGON-481] Sensitive (auth) information is not cleared when HttpClientWagon is disconnected
[WAGON-481] Sensitive (auth) information is not cleared when HttpClientWagon is
disconnected
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/424a3ef2
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/424a3ef2
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/424a3ef2
Branch: refs/heads/jetty-8
Commit: 424a3ef2c16fb78ab0cd6daadb516a5d9b233bba
Parents: 512bf76
Author: Michael Osipov
Authored: Wed Dec 28 01:28:49 2016 +0100
Committer: Michael Osipov
Committed: Tue Jan 3 21:35:05 2017 +0100
--
.../wagon/providers/http/AbstractHttpClientWagon.java | 12
1 file changed, 12 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/424a3ef2/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
--
diff --git
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index 9ef9544..c693cd0 100755
---
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -469,6 +469,18 @@ public abstract class AbstractHttpClientWagon
{
httpClientConnectionManager.closeIdleConnections( 0,
TimeUnit.MILLISECONDS );
}
+
+if ( authCache != null )
+{
+authCache.clear();
+authCache = null;
+}
+
+if ( credentialsProvider != null )
+{
+credentialsProvider.clear();
+credentialsProvider = null;
+}
}
public static void setPersistentPool( boolean persistentPool )
[4/5] maven-wagon git commit: [WAGON-480] Non-threadsafe HttpClientContext is shared between threaded use of HttpClientWagon
[WAGON-480] Non-threadsafe HttpClientContext is shared between threaded use of
HttpClientWagon
The HttpClientContext is created fresh with every execute(), guaranteeing
thread safety.
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/512bf76b
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/512bf76b
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/512bf76b
Branch: refs/heads/jetty-8
Commit: 512bf76b5c0d99c28431b2fedc401bc0919569f2
Parents: bb77d50
Author: Michael Osipov
Authored: Wed Dec 28 01:20:07 2016 +0100
Committer: Michael Osipov
Committed: Tue Jan 3 21:35:04 2017 +0100
--
.../maven/wagon/providers/http/AbstractHttpClientWagon.java | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/512bf76b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
--
diff --git
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index d38506f..9ef9544 100755
---
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -383,8 +383,6 @@ public abstract class AbstractHttpClientWagon
private AuthCache authCache;
-private HttpClientContext localContext;
-
private Closeable closeable;
/**
@@ -414,11 +412,8 @@ public abstract class AbstractHttpClientWagon
{
repository.setUrl( getURL( repository ) );
-localContext = HttpClientContext.create();
credentialsProvider = new BasicCredentialsProvider();
authCache = new BasicAuthCache();
-localContext.setCredentialsProvider( credentialsProvider );
-localContext.setAuthCache( authCache );
if ( authenticationInfo != null )
{
@@ -788,6 +783,9 @@ public abstract class AbstractHttpClientWagon
requestConfigBuilder.setRedirectsEnabled( false );
}
+HttpClientContext localContext = HttpClientContext.create();
+localContext.setCredentialsProvider( credentialsProvider );
+localContext.setAuthCache( authCache );
localContext.setRequestConfig( requestConfigBuilder.build() );
if ( config != null && config.isUsePreemptive() )
[1/5] maven-wagon git commit: [WAGON-474] Upgrade and revise all tests for Jetty 8 [Forced Update!]
Repository: maven-wagon
Updated Branches:
refs/heads/jetty-8 05d04b298 -> 424a3ef2c (forced update)
[WAGON-474] Upgrade and revise all tests for Jetty 8
* Upgrade all test code to Jetty 8.1.22 and Servlet 3.0
* Unify variable names in redirect usecases to realServer and
redirectServer
* RedirectHandler: redirect code is passed but completely ignored because
sendRedirect() always sends 302
* Chronologically sort checkHandlerResult() calls
** Set redirect code (See Other (303)) as requested
** Update checkHandlerResult() for requested status codes rather sent
chosen by server (mismatched previously)
* testPreemptiveAuthentication*(): properly check for OK for GET and
CREATED for PUT instead of OK only for both
* WebDavWagonTest: replace status code literal for
HttpServletResponse.SC_* for better readability
* testRedirect*(): add more checkHandlerResults
* Fix concurrency issues/race conditions in testSecuredGet() and
testSecuredGetToStream() where Jetty workers weren't finished yet,
but assert() has already been started. Waiting for 2000 ms avoids
this in a cheap manner.
* Fix potential memory leaks from open sockets and Wagons
* HugeFileDownloadTest improvements:
** Add log lines before/after the creation of the test file (4 GiB) and
download, to measure how much time this actually takes
** Use IOUtil#copy and hand-copy file with content length to avoid too
large buffers from Jetty's IO class
* Increase Surefire forked VM timeout to 800 s to avoid timeouts of
HugeFileDownloadTest on Windows
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/15becb33
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/15becb33
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/15becb33
Branch: refs/heads/jetty-8
Commit: 15becb331c8650051b7cf3b710ba5758031f773f
Parents: b451e41
Author: Michael Osipov
Authored: Mon Dec 26 00:55:09 2016 +0100
Committer: Michael Osipov
Committed: Tue Jan 3 21:34:18 2017 +0100
--
pom.xml | 16 +-
wagon-provider-test/pom.xml | 8 +-
.../maven/wagon/http/HttpWagonTestCase.java | 299 +++
.../wagon/providers/file/FileWagonTest.java | 13 +-
wagon-providers/wagon-http-lightweight/pom.xml | 4 +-
.../http/LightweightHttpsWagonTest.java | 6 +-
wagon-providers/wagon-http/pom.xml | 10 +-
.../http/AbstractHttpClientWagonTest.java | 2 +
.../http/HttpWagonHttpServerTestCase.java | 14 +-
.../http/HttpWagonReasonPhraseTest.java | 2 +-
.../providers/http/HttpWagonTimeoutTest.java| 4 +-
.../http/HttpsWagonPreemptiveTest.java | 6 +-
.../wagon/providers/http/HttpsWagonTest.java| 6 +-
.../providers/http/HugeFileDownloadTest.java| 58 ++--
wagon-providers/wagon-ssh/pom.xml | 8 +-
.../ssh/jsch/ScpWagonWithProxyTest.java | 23 +-
wagon-providers/wagon-webdav-jackrabbit/pom.xml | 8 +-
.../wagon/providers/webdav/WebDavWagonTest.java | 73 +++--
.../providers/webdav/WebDavsWagonTest.java | 6 +-
wagon-tcks/wagon-tck-http/pom.xml | 12 +-
.../wagon/tck/http/fixture/ServerFixture.java | 52 ++--
21 files changed, 348 insertions(+), 282 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/15becb33/pom.xml
--
diff --git a/pom.xml b/pom.xml
index e127da4..74718be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -313,14 +313,14 @@ under the License.
-org.mortbay.jetty
-jetty
-6.1.26
+org.eclipse.jetty.aggregate
+jetty-all
+8.1.22.v20160922
-org.mortbay.jetty
-servlet-api
-2.5-20081211
+javax.servlet
+javax.servlet-api
+3.0.1
@@ -332,7 +332,7 @@ under the License.
org.apache.maven.plugins
maven-surefire-plugin
-400
+800
${project.build.directory}
@@ -565,5 +565,5 @@ under the License.
-
+
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/15becb33/wagon-provider-test/pom.xml
--
diff --git a/wagon-provider-test/pom.xml b/wagon-provider-test/pom.xml
index b19e7ac..9b0f4e5 100644
--- a/wagon-provider-test/pom.xml
+++ b/wagon-provider-test/pom.xml
@@ -51,12 +51,12 @@ under the License.
compile
- org.mortbay.jetty
- jetty
+ org.eclipse.jetty.aggregate
+ jetty-all
- org.mortbay.jetty
- servlet-api
+ javax.servlet
+ javax.servlet-api
or
[5/5] maven-wagon git commit: [WAGON-476] HTTP Provider follows redirects on PUT and may change request method
[WAGON-476] HTTP Provider follows redirects on PUT and may change request method
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/6cc8d907
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/6cc8d907
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/6cc8d907
Branch: refs/heads/master
Commit: 6cc8d907f40b82a0500d700bcd0ea8075736a6bc
Parents: 5ba0cf3
Author: Michael Osipov
Authored: Mon Dec 26 00:57:24 2016 +0100
Committer: Michael Osipov
Committed: Tue Jan 3 22:12:24 2017 +0100
--
.../maven/wagon/providers/http/AbstractHttpClientWagon.java | 5 +
1 file changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/6cc8d907/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
--
diff --git
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index a03558a..7773d97 100755
---
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -792,6 +792,11 @@ public abstract class AbstractHttpClientWagon
}
}
+if ( httpMethod instanceof HttpPut )
+{
+requestConfigBuilder.setRedirectsEnabled( false );
+}
+
localContext.setRequestConfig( requestConfigBuilder.build() );
if ( config != null && config.isUsePreemptive() )
[4/5] maven-wagon git commit: [WAGON-480] Non-threadsafe HttpClientContext is shared between threaded use of HttpClientWagon
[WAGON-480] Non-threadsafe HttpClientContext is shared between threaded use of
HttpClientWagon
The HttpClientContext is created fresh with every execute(), guaranteeing
thread safety.
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/1a005f1c
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/1a005f1c
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/1a005f1c
Branch: refs/heads/master
Commit: 1a005f1c3fe7492c10b06567738453118f1c15b6
Parents: 4074598
Author: Michael Osipov
Authored: Wed Dec 28 01:20:07 2016 +0100
Committer: Michael Osipov
Committed: Tue Jan 3 22:12:24 2017 +0100
--
.../maven/wagon/providers/http/AbstractHttpClientWagon.java | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/1a005f1c/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
--
diff --git
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index d38506f..9ef9544 100755
---
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -383,8 +383,6 @@ public abstract class AbstractHttpClientWagon
private AuthCache authCache;
-private HttpClientContext localContext;
-
private Closeable closeable;
/**
@@ -414,11 +412,8 @@ public abstract class AbstractHttpClientWagon
{
repository.setUrl( getURL( repository ) );
-localContext = HttpClientContext.create();
credentialsProvider = new BasicCredentialsProvider();
authCache = new BasicAuthCache();
-localContext.setCredentialsProvider( credentialsProvider );
-localContext.setAuthCache( authCache );
if ( authenticationInfo != null )
{
@@ -788,6 +783,9 @@ public abstract class AbstractHttpClientWagon
requestConfigBuilder.setRedirectsEnabled( false );
}
+HttpClientContext localContext = HttpClientContext.create();
+localContext.setCredentialsProvider( credentialsProvider );
+localContext.setAuthCache( authCache );
localContext.setRequestConfig( requestConfigBuilder.build() );
if ( config != null && config.isUsePreemptive() )
[1/5] maven-wagon git commit: [WAGON-481] Sensitive (auth) information is not cleared when HttpClientWagon is disconnected
Repository: maven-wagon
Updated Branches:
refs/heads/master 1b318bb7b -> 7fd0dca33
[WAGON-481] Sensitive (auth) information is not cleared when HttpClientWagon is
disconnected
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/7fd0dca3
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/7fd0dca3
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/7fd0dca3
Branch: refs/heads/master
Commit: 7fd0dca33656e5f961e9234258db9e3a2cec0d9f
Parents: 1a005f1
Author: Michael Osipov
Authored: Wed Dec 28 01:28:49 2016 +0100
Committer: Michael Osipov
Committed: Tue Jan 3 22:12:24 2017 +0100
--
.../wagon/providers/http/AbstractHttpClientWagon.java | 12
1 file changed, 12 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/7fd0dca3/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
--
diff --git
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index 9ef9544..c693cd0 100755
---
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -469,6 +469,18 @@ public abstract class AbstractHttpClientWagon
{
httpClientConnectionManager.closeIdleConnections( 0,
TimeUnit.MILLISECONDS );
}
+
+if ( authCache != null )
+{
+authCache.clear();
+authCache = null;
+}
+
+if ( credentialsProvider != null )
+{
+credentialsProvider.clear();
+credentialsProvider = null;
+}
}
public static void setPersistentPool( boolean persistentPool )
[3/5] maven-wagon git commit: [WAGON-474] Upgrade and revise all tests for Jetty 8
[WAGON-474] Upgrade and revise all tests for Jetty 8
* Upgrade all test code to Jetty 8.1.22 and Servlet 3.0
* Unify variable names in redirect usecases to realServer and
redirectServer
* RedirectHandler: redirect code is passed but completely ignored because
sendRedirect() always sends 302
* Chronologically sort checkHandlerResult() calls
** Set redirect code (See Other (303)) as requested
** Update checkHandlerResult() for requested status codes rather sent
chosen by server (mismatched previously)
* testPreemptiveAuthentication*(): properly check for OK for GET and
CREATED for PUT instead of OK only for both
* WebDavWagonTest: replace status code literal for
HttpServletResponse.SC_* for better readability
* testRedirect*(): add more checkHandlerResults
* Fix concurrency issues/race conditions in testSecuredGet() and
testSecuredGetToStream() where Jetty workers weren't finished yet,
but assert() has already been started. Waiting for 2000 ms avoids
this in a cheap manner.
* Fix potential memory leaks from open sockets and Wagons
* HugeFileDownloadTest improvements:
** Add log lines before/after the creation of the test file (4 GiB) and
download, to measure how much time this actually takes
** Use IOUtil#copy and hand-copy file with content length to avoid too
large buffers from Jetty's IO class
* Increase Surefire forked VM timeout to 800 s to avoid timeouts of
HugeFileDownloadTest on Windows
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/5ba0cf33
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/5ba0cf33
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/5ba0cf33
Branch: refs/heads/master
Commit: 5ba0cf33a6f9024c6dbbb3e3e24c978245fa082c
Parents: 1b318bb
Author: Michael Osipov
Authored: Mon Dec 26 00:55:09 2016 +0100
Committer: Michael Osipov
Committed: Tue Jan 3 22:12:24 2017 +0100
--
pom.xml | 16 +-
wagon-provider-test/pom.xml | 8 +-
.../maven/wagon/http/HttpWagonTestCase.java | 299 +++
.../wagon/providers/file/FileWagonTest.java | 13 +-
wagon-providers/wagon-http-lightweight/pom.xml | 4 +-
.../http/LightweightHttpsWagonTest.java | 6 +-
wagon-providers/wagon-http/pom.xml | 10 +-
.../http/AbstractHttpClientWagonTest.java | 2 +
.../http/HttpWagonHttpServerTestCase.java | 14 +-
.../http/HttpWagonReasonPhraseTest.java | 2 +-
.../providers/http/HttpWagonTimeoutTest.java| 4 +-
.../http/HttpsWagonPreemptiveTest.java | 6 +-
.../wagon/providers/http/HttpsWagonTest.java| 6 +-
.../providers/http/HugeFileDownloadTest.java| 58 ++--
wagon-providers/wagon-ssh/pom.xml | 8 +-
.../ssh/jsch/ScpWagonWithProxyTest.java | 23 +-
wagon-providers/wagon-webdav-jackrabbit/pom.xml | 8 +-
.../wagon/providers/webdav/WebDavWagonTest.java | 73 +++--
.../providers/webdav/WebDavsWagonTest.java | 6 +-
wagon-tcks/wagon-tck-http/pom.xml | 12 +-
.../wagon/tck/http/fixture/ServerFixture.java | 52 ++--
21 files changed, 348 insertions(+), 282 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5ba0cf33/pom.xml
--
diff --git a/pom.xml b/pom.xml
index cbdbc86..5805800 100644
--- a/pom.xml
+++ b/pom.xml
@@ -312,14 +312,14 @@ under the License.
-org.mortbay.jetty
-jetty
-6.1.26
+org.eclipse.jetty.aggregate
+jetty-all
+8.1.22.v20160922
-org.mortbay.jetty
-servlet-api
-2.5-20081211
+javax.servlet
+javax.servlet-api
+3.0.1
@@ -331,7 +331,7 @@ under the License.
org.apache.maven.plugins
maven-surefire-plugin
-400
+800
${project.build.directory}
@@ -564,5 +564,5 @@ under the License.
-
+
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5ba0cf33/wagon-provider-test/pom.xml
--
diff --git a/wagon-provider-test/pom.xml b/wagon-provider-test/pom.xml
index b19e7ac..9b0f4e5 100644
--- a/wagon-provider-test/pom.xml
+++ b/wagon-provider-test/pom.xml
@@ -51,12 +51,12 @@ under the License.
compile
- org.mortbay.jetty
- jetty
+ org.eclipse.jetty.aggregate
+ jetty-all
- org.mortbay.jetty
- servlet-api
+ javax.servlet
+ javax.servlet-api
org.slf4j
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5ba0cf33/wagon-provider-test/src/main/ja
[2/5] maven-wagon git commit: [WAGON-479] Preemptive auth with HTTP Provider may fail because BasicScheme is added as completed=true to the AuthCache
[WAGON-479] Preemptive auth with HTTP Provider may fail because BasicScheme is
added as completed=true to the AuthCache
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/40745987
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/40745987
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/40745987
Branch: refs/heads/master
Commit: 4074598777fad44a3c34c71c5842b71a03e1da3f
Parents: 6cc8d90
Author: Michael Osipov
Authored: Tue Dec 27 23:29:26 2016 +0100
Committer: Michael Osipov
Committed: Tue Jan 3 22:12:24 2017 +0100
--
.../providers/http/AbstractHttpClientWagon.java | 45 +---
1 file changed, 11 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/40745987/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
--
diff --git
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index 7773d97..d38506f 100755
---
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -25,10 +25,9 @@ import org.apache.http.HttpException;
import org.apache.http.HttpHost;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
-import org.apache.http.auth.AUTH;
import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.ChallengeState;
import org.apache.http.auth.Credentials;
-import org.apache.http.auth.MalformedChallengeException;
import org.apache.http.auth.NTCredentials;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.AuthCache;
@@ -460,9 +459,9 @@ public abstract class AbstractHttpClientWagon
creds = new UsernamePasswordCredentials(
proxyUsername, proxyPassword );
}
-int port = proxyInfo.getPort();
+int proxyPort = proxyInfo.getPort();
-AuthScope authScope = getProxyBasicAuthScope().getScope(
proxyHost, port );
+AuthScope authScope = getProxyBasicAuthScope().getScope(
proxyHost, proxyPort );
credentialsProvider.setCredentials( authScope, creds );
}
}
@@ -576,15 +575,7 @@ public abstract class AbstractHttpClientWagon
if ( credentialsProvider.getCredentials( targetScope ) != null )
{
BasicScheme targetAuth = new BasicScheme();
-try
-{
-targetAuth.processChallenge( new BasicHeader( AUTH.WWW_AUTH,
"BASIC preemptive" ) );
-authCache.put( targetHost, targetAuth );
-}
-catch ( MalformedChallengeException ignore )
-{
-// ignore
-}
+authCache.put( targetHost, targetAuth );
}
HttpPut putMethod = new HttpPut( url );
@@ -807,7 +798,6 @@ public abstract class AbstractHttpClientWagon
if ( credentialsProvider.getCredentials( targetScope ) != null )
{
BasicScheme targetAuth = new BasicScheme();
-targetAuth.processChallenge( new BasicHeader( AUTH.WWW_AUTH,
"BASIC preemptive" ) );
authCache.put( targetHost, targetAuth );
}
}
@@ -819,26 +809,13 @@ public abstract class AbstractHttpClientWagon
HttpHost proxyHost = new HttpHost( proxyInfo.getHost(),
proxyInfo.getPort() );
AuthScope proxyScope = getProxyBasicAuthScope().getScope(
proxyHost );
-String proxyUsername = proxyInfo.getUserName();
-String proxyPassword = proxyInfo.getPassword();
-String proxyNtlmHost = proxyInfo.getNtlmHost();
-String proxyNtlmDomain = proxyInfo.getNtlmDomain();
-
-if ( proxyUsername != null && proxyPassword != null )
+if ( credentialsProvider.getCredentials( proxyScope ) != null )
{
-Credentials creds;
-if ( proxyNtlmHost != null || proxyNtlmDomain != null )
-{
-creds = new NTCredentials( proxyUsername,
proxyPassword, proxyNtlmHost, proxyNtlmDomain );
-}
-else
-{
-creds = new UsernamePasswordCredentials(
proxyUsername, proxyPassword );
-}
-
-
[1/2] maven-wagon git commit: [WAGON-475] TransferEvent GET used instead of PUT and vice versa
Repository: maven-wagon
Updated Branches:
refs/heads/master cd519b09c -> 7a0db3b22
[WAGON-475] TransferEvent GET used instead of PUT and vice versa
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/e89c03a1
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/e89c03a1
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/e89c03a1
Branch: refs/heads/master
Commit: e89c03a15d3fb0450abbd85fed45872f64686fc1
Parents: cd519b0
Author: Michael Osipov
Authored: Wed Jan 4 21:21:43 2017 +0100
Committer: Michael Osipov
Committed: Wed Jan 4 21:21:43 2017 +0100
--
.../maven/wagon/providers/http/AbstractHttpClientWagon.java | 4 ++--
.../java/org/apache/maven/wagon/providers/scm/ScmWagon.java | 8
.../wagon/providers/webdav/AbstractHttpClientWagon.java | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/e89c03a1/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
--
diff --git
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index c693cd0..405f55e 100755
---
a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++
b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -565,11 +565,11 @@ public abstract class AbstractHttpClientWagon
}
catch ( HttpException he )
{
-fireTransferError( resource, he, TransferEvent.REQUEST_GET );
+fireTransferError( resource, he, TransferEvent.REQUEST_PUT );
}
catch ( IOException e )
{
-fireTransferError( resource, e, TransferEvent.REQUEST_GET );
+fireTransferError( resource, e, TransferEvent.REQUEST_PUT );
}
// preemptive for put
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/e89c03a1/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
--
diff --git
a/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
b/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
index edbb061..8fbbdef 100644
---
a/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
+++
b/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
@@ -409,13 +409,13 @@ public class ScmWagon
}
catch ( ScmException e )
{
-fireTransferError( target, e, TransferEvent.REQUEST_GET );
+fireTransferError( target, e, TransferEvent.REQUEST_PUT );
throw new TransferFailedException( "Error interacting with SCM: "
+ e.getMessage(), e );
}
catch ( IOException e )
{
-fireTransferError( target, e, TransferEvent.REQUEST_GET );
+fireTransferError( target, e, TransferEvent.REQUEST_PUT );
throw new TransferFailedException( "Error interacting with SCM: "
+ e.getMessage(), e );
}
@@ -465,7 +465,7 @@ public class ScmWagon
}
catch ( ScmException e )
{
-fireTransferError( resource, e, TransferEvent.REQUEST_PUT );
+fireTransferError( resource, e, TransferEvent.REQUEST_GET );
throw new TransferFailedException( "Error listing repository: " +
e.getMessage(), e );
}
@@ -493,7 +493,7 @@ public class ScmWagon
}
catch ( ScmException e )
{
-fireTransferError( resource, e, TransferEvent.REQUEST_PUT );
+fireTransferError( resource, e, TransferEvent.REQUEST_GET );
throw new TransferFailedException( "Error checking out: " +
e.getMessage(), e );
}
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/e89c03a1/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/AbstractHttpClientWagon.java
--
diff --git
a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/AbstractHttpClientWagon.java
b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/AbstractHttpClientWagon.java
index 3d20c61..ffd9cd8 100644
---
a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wag
[2/2] maven-wagon git commit: [WAGON-483] Upgrade SLF4J to 1.7.22
[WAGON-483] Upgrade SLF4J to 1.7.22 Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/7a0db3b2 Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/7a0db3b2 Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/7a0db3b2 Branch: refs/heads/master Commit: 7a0db3b2207bd58d3f28219048d6722d241ed5ec Parents: e89c03a Author: Michael Osipov Authored: Wed Jan 4 21:31:29 2017 +0100 Committer: Michael Osipov Committed: Wed Jan 4 21:31:29 2017 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/7a0db3b2/pom.xml -- diff --git a/pom.xml b/pom.xml index ff724d4..aeeba36 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ under the License. true -1.7.19 +1.7.22 wagon-archives/wagon-LATEST
maven-wagon git commit: [WAGON-484] Update WebDAV Provider naming
Repository: maven-wagon
Updated Branches:
refs/heads/master 7a0db3b22 -> 01b5631f2
[WAGON-484] Update WebDAV Provider naming
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/01b5631f
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/01b5631f
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/01b5631f
Branch: refs/heads/master
Commit: 01b5631f2712d4a983c2f43f7a0b0d3df784501a
Parents: 7a0db3b
Author: Michael Osipov
Authored: Thu Jan 5 18:18:12 2017 +0100
Committer: Michael Osipov
Committed: Thu Jan 5 18:18:12 2017 +0100
--
pom.xml | 2 +-
wagon-providers/wagon-webdav-jackrabbit/pom.xml | 4 ++--
.../org/apache/maven/wagon/providers/webdav/WebDavWagon.java | 8
.../src/main/resources/META-INF/plexus/default-bindings.xml | 6 +++---
wagon-providers/wagon-webdav-jackrabbit/src/site/site.xml| 2 +-
.../apache/maven/wagon/providers/webdav/WebDavWagonTest.java | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/01b5631f/pom.xml
--
diff --git a/pom.xml b/pom.xml
index aeeba36..006fbe9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -495,7 +495,7 @@ under the License.
org.apache.maven.wagon.providers.ssh*
- Webdav Provider
+ WebDAV Provider
org.apache.maven.wagon.providers.webdav*:org.apache.jackrabbit.webdav*
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/01b5631f/wagon-providers/wagon-webdav-jackrabbit/pom.xml
--
diff --git a/wagon-providers/wagon-webdav-jackrabbit/pom.xml
b/wagon-providers/wagon-webdav-jackrabbit/pom.xml
index 5535715..686c7fe 100644
--- a/wagon-providers/wagon-webdav-jackrabbit/pom.xml
+++ b/wagon-providers/wagon-webdav-jackrabbit/pom.xml
@@ -28,9 +28,9 @@ under the License.
wagon-webdav-jackrabbit
- Apache Maven Wagon :: Providers :: WebDav Provider
+ Apache Maven Wagon :: Providers :: WebDAV Provider
-Wagon provider that gets and puts artifacts through webdav protocol
+Wagon provider that gets and puts artifacts through WebDAV protocol
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/01b5631f/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
--
diff --git
a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
index 4cf8bda..4d715c2 100644
---
a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
+++
b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
@@ -49,7 +49,7 @@ import java.util.List;
/**
* WebDavWagon
*
- * Allows using a webdav remote repository for downloads and deployments
+ * Allows using a WebDAV remote repository for downloads and deployments
*
* @author mailto:hisi...@exist.com";>Henry Isidro
* @author mailto:joak...@apache.org";>Joakim Erdfelt
@@ -69,7 +69,7 @@ public class WebDavWagon
/**
* Defines the protocol mapping to use.
*
- * First string is the user definition way to define a webdav url,
+ * First string is the user definition way to define a WebDAV url,
* the second string is the internal representation of that url.
*
* NOTE: The order of the mapping becomes the search order.
@@ -163,7 +163,7 @@ public class WebDavWagon
}
/**
- * Copy a directory from local system to remote webdav server
+ * Copy a directory from local system to remote WebDAV server
*
* @param sourceDirectory the local directory
* @param destinationDirectory the remote destination
@@ -255,7 +255,7 @@ public class WebDavWagon
{
if ( i == 0 )
{
-// by design jackrabbit webdav sticks parent
directory as the first entry
+// by design jackrabbit WebDAV sticks parent
directory as the first entry
// so we need to ignore this entry
//
http://www.nabble.com/Extra-entry-in-get-file-list-with-jackrabbit-webdav-td21262786.html
//
http://www.webdav.or
svn commit: r1777538 - /maven/site/trunk/content/apt/pom.apt
Author: michaelo
Date: Fri Jan 6 08:37:46 2017
New Revision: 1777538
URL: http://svn.apache.org/viewvc?rev=1777538&view=rev
Log:
[MNGSITE-297] Typo in properties example
Modified:
maven/site/trunk/content/apt/pom.apt
Modified: maven/site/trunk/content/apt/pom.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/pom.apt?rev=1777538&r1=1777537&r2=1777538&view=diff
==
--- maven/site/trunk/content/apt/pom.apt (original)
+++ maven/site/trunk/content/apt/pom.apt Fri Jan 6 08:37:46 2017
@@ -663,7 +663,7 @@ mvn install:install-file -Dfile=non-mave
available as POM properties, such as <<<$\{java.home\}>>>.
[[5]] <<>>: Set within a <<<\>>> element in the POM. The
value of
- <<<\\value\\>>> may be used
as <<<$\{someVar\}>>>.
+ <<<\\value\\>>> may be used
as <<<$\{someVar\}>>>.
[]
svn commit: r1777714 - /maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
Author: michaelo Date: Fri Jan 6 20:47:35 2017 New Revision: 114 URL: http://svn.apache.org/viewvc?rev=114&view=rev Log: [MPIR-353] Upgrade parent to version 30 Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=114&r1=113&r2=114&view=diff == --- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Fri Jan 6 20:47:35 2017 @@ -25,7 +25,7 @@ under the License. maven-plugins org.apache.maven.plugins -28 +30 ../../pom/maven/maven-plugins/pom.xml
svn commit: r1777715 - /maven/plugins/trunk/maven-project-info-reports-plugin/src/site/site.xml
Author: michaelo Date: Fri Jan 6 20:59:06 2017 New Revision: 115 URL: http://svn.apache.org/viewvc?rev=115&view=rev Log: [MPIR-353] Upgrade parent to version 30 Clean up site.xml for elements already contained in updated parent site.xml Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/site/site.xml Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/site/site.xml?rev=115&r1=114&r2=115&view=diff == --- maven/plugins/trunk/maven-project-info-reports-plugin/src/site/site.xml (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/site/site.xml Fri Jan 6 20:59:06 2017 @@ -19,33 +19,8 @@ specific language governing permissions under the License. --> -http://maven.apache.org/DECORATION/1.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd";> - - -http://maven.apache.org/images/apache-maven-project.png -http://www.apache.org/ - - - -http://maven.apache.org/images/maven-logo-black-on-white.png -http://maven.apache.org/ - - -org.apache.maven.skins -maven-fluido-skin -1.4 - - - - - true - - - - - - - +http://maven.apache.org/DECORATION/1.7.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd";>
svn commit: r1777716 - /maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
Author: michaelo Date: Fri Jan 6 21:05:39 2017 New Revision: 116 URL: http://svn.apache.org/viewvc?rev=116&view=rev Log: [MPIR-354] Upgrade Maven Site Plugin to version 3.5.1 for ITs Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=116&r1=115&r2=116&view=diff == --- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Fri Jan 6 21:05:39 2017 @@ -117,7 +117,7 @@ under the License. 2.2.1 2.7 1.9.2 -3.4 +3.5.1
svn commit: r1777717 - /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java
Author: michaelo
Date: Fri Jan 6 21:09:39 2017
New Revision: 117
URL: http://svn.apache.org/viewvc?rev=117&view=rev
Log:
[MPIR-352] Use protocol-agnostic URL for Gravatar
Submitted-by: Eric Barboni
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java?rev=117&r1=116&r2=117&view=diff
==
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java
Fri Jan 6 21:09:39 2017
@@ -139,6 +139,8 @@ public class TeamReport
private final boolean showAvatarImages;
+private final String protocol;
+
ProjectTeamRenderer( Sink sink, Model model, I18N i18n, Locale locale,
Log log, boolean showAvatarImages )
{
super( sink, i18n, locale );
@@ -146,6 +148,16 @@ public class TeamReport
this.model = model;
this.log = log;
this.showAvatarImages = showAvatarImages;
+
+// prepare protocol for gravatar
+if ( model.getUrl() != null && model.getUrl().startsWith(
"https://"; ) )
+{
+this.protocol = "https";
+}
+else
+{
+this.protocol = "http";
+}
}
@Override
@@ -336,7 +348,7 @@ public class TeamReport
private String getSpacerGravatarUrl()
{
-return
"http://www.gravatar.com/avatar/?d=blank&f=y&";
+ AVATAR_SIZE;
+return protocol +
"://www.gravatar.com/avatar/?d=blank&f=y&" +
AVATAR_SIZE;
}
private String getGravatarUrl( String email )
@@ -359,7 +371,7 @@ public class TeamReport
{
sb.append( Integer.toString( ( aByteData &
lowerEightBitsOnly ) + 0x100, 16 ).substring( 1 ) );
}
-return "http://www.gravatar.com/avatar/"; + sb.toString() +
"?d=mm&" + AVATAR_SIZE;
+return protocol + "://www.gravatar.com/avatar/" +
sb.toString() + "?d=mm&" + AVATAR_SIZE;
}
catch ( NoSuchAlgorithmException e )
{
svn commit: r1777720 - /maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
Author: michaelo Date: Fri Jan 6 21:49:09 2017 New Revision: 120 URL: http://svn.apache.org/viewvc?rev=120&view=rev Log: [MPIR-355] Upgrade dependencies which are code- and testsafe Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=120&r1=119&r2=120&view=diff == --- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Fri Jan 6 21:49:09 2017 @@ -115,8 +115,8 @@ under the License. 1.6 1.6 2.2.1 -2.7 -1.9.2 +2.10 +1.9.5 3.5.1 @@ -129,7 +129,7 @@ under the License. org.apache.maven.reporting maven-reporting-impl - 2.3 + 2.4 @@ -377,7 +377,7 @@ under the License. org.mortbay.jetty jetty - 6.1.25 + 6.1.26 test @@ -385,7 +385,7 @@ under the License. commons-validator commons-validator - 1.4.0 + 1.5.1 commons-lang
svn commit: r1777730 - /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
Author: michaelo
Date: Fri Jan 6 23:06:05 2017
New Revision: 130
URL: http://svn.apache.org/viewvc?rev=130&view=rev
Log:
[MPIR-356] Deprecate non-used methods in ProjectInfoReportUtils
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java?rev=130&r1=129&r2=130&view=diff
==
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
Fri Jan 6 23:06:05 2017
@@ -394,6 +394,7 @@ public class ProjectInfoReportUtils
* @param str The string to be checked.
* @return true if is number false otherwise.
*/
+@Deprecated
public static boolean isNumber( String str )
{
if ( str.startsWith( "+" ) )
@@ -408,6 +409,7 @@ public class ProjectInfoReportUtils
* @param defaultValue The default value.
* @return Converted string.
*/
+@Deprecated
public static float toFloat( String str, float defaultValue )
{
if ( str.startsWith( "+" ) )
svn commit: r1777733 - /maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
Author: michaelo
Date: Fri Jan 6 23:34:20 2017
New Revision: 133
URL: http://svn.apache.org/viewvc?rev=133&view=rev
Log:
[MSHARED-488] Make input source file encoding default to platform encoding
Modified:
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
Modified:
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java?rev=133&r1=132&r2=133&view=diff
==
---
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
(original)
+++
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
Fri Jan 6 23:34:20 2017
@@ -32,6 +32,7 @@ import org.apache.maven.plugin.MojoExecu
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.utils.WriterFactory;
import org.apache.maven.shared.utils.io.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
@@ -48,7 +49,7 @@ import java.util.Map;
* The basis for a Maven report which can be generated both as part of a site
generation or
* as a direct standalone goal invocation.
* Both invocations are delegated to abstract executeReport( Locale
) from:
- *
+ *
* Mojo's execute() method, see maven-plugin-api
* MavenMultiPageReport's generate( Sink, SinkFactory, Locale
), see maven-reporting-api
*
@@ -56,7 +57,7 @@ import java.util.Map;
* @author Emmanuel Venisse
* @version $Id$
* @since 2.0
- * @see #execute() Mojo.execute(), from maven-plugin-api
+ * @see #execute() Mojo.execute(), from maven-plugin-api
* @see #generate(Sink, SinkFactory, Locale)
MavenMultiPageReport.generate( Sink, SinkFactory, Locale ),
* from maven-reporting-api
* @see #executeReport(Locale) abstract executeReport( Locale )
@@ -306,7 +307,7 @@ public abstract class AbstractMavenRepor
*/
protected String getInputEncoding()
{
-return ( inputEncoding == null ) ? ReaderFactory.ISO_8859_1 :
inputEncoding;
+return ( inputEncoding == null ) ? ReaderFactory.FILE_ENCODING :
inputEncoding;
}
/**
@@ -316,7 +317,7 @@ public abstract class AbstractMavenRepor
*/
protected String getOutputEncoding()
{
-return ( outputEncoding == null ) ? ReaderFactory.UTF_8 :
outputEncoding;
+return ( outputEncoding == null ) ? WriterFactory.UTF_8 :
outputEncoding;
}
/**
svn commit: r1777735 - /maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
Author: michaelo
Date: Fri Jan 6 23:53:35 2017
New Revision: 135
URL: http://svn.apache.org/viewvc?rev=135&view=rev
Log:
Improve some parameter naming
Modified:
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
Modified:
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java?rev=135&r1=134&r2=135&view=diff
==
---
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
(original)
+++
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
Fri Jan 6 23:53:35 2017
@@ -200,44 +200,44 @@ public abstract class AbstractMavenRepor
/**
* Generate a report.
*
- * @param aSink the sink to use for the generation.
- * @param aLocale the wanted locale to generate the report, could be null.
+ * @param sink the sink to use for the generation.
+ * @param locale the wanted locale to generate the report, could be null.
* @throws MavenReportException if any
* @deprecated use {@link #generate(Sink, SinkFactory, Locale)} instead.
*/
-public void generate( org.codehaus.doxia.sink.Sink aSink, Locale aLocale )
+public void generate( org.codehaus.doxia.sink.Sink sink, Locale locale )
throws MavenReportException
{
-generate( aSink, null, aLocale );
+generate( sink, null, locale );
}
/**
* Generate a report.
*
- * @param aSink
- * @param aLocale
+ * @param sink
+ * @param locale
* @throws MavenReportException
* @see
org.apache.maven.reporting.MavenReport#generate(org.apache.maven.doxia.sink.Sink,
java.util.Locale)
* @deprecated use {@link #generate(Sink, SinkFactory, Locale)} instead.
*/
-public void generate( Sink aSink, Locale aLocale )
+public void generate( Sink sink, Locale locale )
throws MavenReportException
{
-generate( aSink, null, aLocale );
+generate( sink, null, locale );
}
/**
* This method is called when the report generation is invoked by
maven-site-plugin.
*
- * @param aSink
- * @param aSinkFactory
- * @param aLocale
+ * @param sink
+ * @param sinkFactory
+ * @param locale
* @throws MavenReportException
*/
-public void generate( Sink aSink, SinkFactory aSinkFactory, Locale aLocale
)
+public void generate( Sink sink, SinkFactory sinkFactory, Locale locale )
throws MavenReportException
{
-if ( aSink == null )
+if ( sink == null )
{
throw new MavenReportException( "You must specify a sink." );
}
@@ -249,11 +249,11 @@ public abstract class AbstractMavenRepor
return;
}
-this.sink = aSink;
+this.sink = sink;
-this.sinkFactory = aSinkFactory;
+this.sinkFactory = sinkFactory;
-executeReport( aLocale );
+executeReport( locale );
closeReport();
}
svn commit: r1777736 - /maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
Author: michaelo
Date: Fri Jan 6 23:54:39 2017
New Revision: 136
URL: http://svn.apache.org/viewvc?rev=136&view=rev
Log:
Drop some exception
The API does not clearly describe wether this can be null or not. Even if, a
NPE would be appropriate. At at the end, an null value will fail with an NPE.
Modified:
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
Modified:
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java?rev=136&r1=135&r2=136&view=diff
==
---
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
(original)
+++
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
Fri Jan 6 23:54:39 2017
@@ -237,11 +237,6 @@ public abstract class AbstractMavenRepor
public void generate( Sink sink, SinkFactory sinkFactory, Locale locale )
throws MavenReportException
{
-if ( sink == null )
-{
-throw new MavenReportException( "You must specify a sink." );
-}
-
if ( !canGenerateReport() )
{
getLog().info( "This report cannot be generated as part of the
current build. "
svn commit: r1777737 - /maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
Author: michaelo
Date: Sat Jan 7 00:01:41 2017
New Revision: 137
URL: http://svn.apache.org/viewvc?rev=137&view=rev
Log:
Fix incorrect Javadoc
#tableHeader(String...) claims to support link patterns which it doesn't.
Modified:
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
Modified:
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java?rev=137&r1=136&r2=137&view=diff
==
---
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
(original)
+++
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
Sat Jan 7 00:01:41 2017
@@ -341,7 +341,6 @@ public abstract class AbstractMavenRepor
/**
* Convenience method to wrap a table header row start in the current sink.
- * The texts in the content could be link patterned texts
defined by {text, url}
*
* @param content an array of text to put in the cells in this row header,
could be null.
* @see #tableHeaderCell(String)
svn commit: r1777770 - /maven/shared/trunk/maven-reporting-impl/pom.xml
Author: michaelo Date: Sat Jan 7 12:08:18 2017 New Revision: 170 URL: http://svn.apache.org/viewvc?rev=170&view=rev Log: [MSHARED-606] Upgrade to Commons Validator 1.5.1 Modified: maven/shared/trunk/maven-reporting-impl/pom.xml Modified: maven/shared/trunk/maven-reporting-impl/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/pom.xml?rev=170&r1=169&r2=170&view=diff == --- maven/shared/trunk/maven-reporting-impl/pom.xml (original) +++ maven/shared/trunk/maven-reporting-impl/pom.xml Sat Jan 7 12:08:18 2017 @@ -124,7 +124,7 @@ commons-validator commons-validator - 1.4.1 + 1.5.1 @@ -192,7 +192,7 @@ - + jigsaw
svn commit: r1777776 - in /maven/shared/trunk/maven-reporting-impl/src: main/java/org/apache/maven/reporting/UrlValidationUtil.java test/java/org/apache/maven/reporting/UrlValidationUtilTest.java
Author: michaelo
Date: Sat Jan 7 12:55:17 2017
New Revision: 176
URL: http://svn.apache.org/viewvc?rev=176&view=rev
Log:
[MSHARED-607] Simplify UrlValidationUtil to modern rules
* Remove custom patterns and use default (builtin) ones
* Adapt tests where .local is not valid anymore by retaining the test idea
itself
Modified:
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/UrlValidationUtil.java
maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/UrlValidationUtilTest.java
Modified:
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/UrlValidationUtil.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/UrlValidationUtil.java?rev=176&r1=175&r2=176&view=diff
==
---
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/UrlValidationUtil.java
(original)
+++
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/UrlValidationUtil.java
Sat Jan 7 12:55:17 2017
@@ -19,32 +19,19 @@ package org.apache.maven.reporting;
* under the License.
*/
-import org.apache.commons.validator.routines.RegexValidator;
import org.apache.commons.validator.routines.UrlValidator;
/**
* Static utility class intended to help {@link AbstractMavenReportRenderer}
in validating URLs. Validation uses two
* UrlValidator instances. The first validates public URLs, the second
validates local URLs. At least one validator has
* to accept the given URL. A URL is called local if it uses an unqualified
hostname (such as "localhost" or
- * "workstation-12") or qualified domain names within the special use top
level domain ".local".
+ * "workstation-12") or fully-qualified domain names.
*
* @author mailto:jan.schul...@gmail.com";>Jan Schultze
*/
final class UrlValidationUtil
{
-private static final String LETTERS_DIGITS = "[a-zA-Z0-9]";
-
-private static final String LETTERS_DIGITS_HYPHEN = "[a-zA-Z0-9\\-]";
-
-private static final String LABEL = LETTERS_DIGITS + "(" +
LETTERS_DIGITS_HYPHEN + "{0,61}" + LETTERS_DIGITS + ")?";
-
-private static final String OPTIONAL_PORT =
"(:(([1-5]\\d{1,4})|([1-9]\\d{1,3})))?";
-
-private static final String AUTHORITY_REGEX = LABEL + "(\\." + LABEL +
")*\\.local\\.?" + OPTIONAL_PORT;
-
-private static final String[] SCHEMES = { "http", "https" };
-
private UrlValidationUtil()
{
throw new RuntimeException( "Instantiation of " +
UrlValidationUtil.class.getName() + " is not allowed." );
@@ -63,7 +50,7 @@ final class UrlValidationUtil
private static UrlValidator configurePublicUrlValidator()
{
-return new UrlValidator( SCHEMES );
+return UrlValidator.getInstance();
}
private static boolean isValidLocalUrl( final String url )
@@ -74,14 +61,7 @@ final class UrlValidationUtil
private static UrlValidator configureLocalUrlValidator()
{
-RegexValidator authorityValidator = configureLocalAuthorityValidator();
-return new UrlValidator( SCHEMES, authorityValidator,
UrlValidator.ALLOW_LOCAL_URLS );
-}
-
-/* package-private for testing purposes */
-static RegexValidator configureLocalAuthorityValidator()
-{
-return new RegexValidator( AUTHORITY_REGEX, false );
+return new UrlValidator( UrlValidator.ALLOW_LOCAL_URLS );
}
}
Modified:
maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/UrlValidationUtilTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/UrlValidationUtilTest.java?rev=176&r1=175&r2=176&view=diff
==
---
maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/UrlValidationUtilTest.java
(original)
+++
maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/UrlValidationUtilTest.java
Sat Jan 7 12:55:17 2017
@@ -21,7 +21,7 @@ package org.apache.maven.reporting;
import junit.framework.TestCase;
-import org.apache.commons.validator.routines.RegexValidator;
+import org.apache.commons.validator.routines.UrlValidator;
public class UrlValidationUtilTest
extends TestCase
@@ -29,7 +29,7 @@ public class UrlValidationUtilTest
public void testUrlWithPortIsAccepted()
{
-testUrlIsAccepted( "http://host.organization.local:8080/something"; );
+testUrlIsAccepted( "http://host.organization.com:8080/something
svn commit: r1777777 - /maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/UrlValidationUtilTest.java
Author: michaelo
Date: Sat Jan 7 12:56:03 2017
New Revision: 177
URL: http://svn.apache.org/viewvc?rev=177&view=rev
Log:
Accidentially committed unwanted main()
Modified:
maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/UrlValidationUtilTest.java
Modified:
maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/UrlValidationUtilTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/UrlValidationUtilTest.java?rev=177&r1=176&r2=177&view=diff
==
---
maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/UrlValidationUtilTest.java
(original)
+++
maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/UrlValidationUtilTest.java
Sat Jan 7 12:56:03 2017
@@ -21,8 +21,6 @@ package org.apache.maven.reporting;
import junit.framework.TestCase;
-import org.apache.commons.validator.routines.UrlValidator;
-
public class UrlValidationUtilTest
extends TestCase
{
@@ -207,9 +205,4 @@ public class UrlValidationUtilTest
assertFalse( isValidAuthority( input ) );
}
-public static void main(String[] args) {
- UrlValidator validator = UrlValidator.getInstance();
-
System.out.println(validator.isValid("http://host.organization.com:10";));
- }
-
}
svn commit: r1777786 - /maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
Author: michaelo
Date: Sat Jan 7 13:32:54 2017
New Revision: 186
URL: http://svn.apache.org/viewvc?rev=186&view=rev
Log:
Avoid locale-sensitive toLowerCase()
Modified:
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
Modified:
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java?rev=186&r1=185&r2=186&view=diff
==
---
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
(original)
+++
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
Sat Jan 7 13:32:54 2017
@@ -30,6 +30,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Properties;
@@ -623,7 +624,7 @@ public abstract class AbstractMavenRepor
{
return "mailto:"; + href;
}
-else if ( href.toLowerCase().startsWith( "mailto:"; ) )
+else if ( href.toLowerCase( Locale.ROOT ).startsWith( "mailto:"; ) )
{
return href;
}
svn commit: r1777793 - /maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
Author: michaelo
Date: Sat Jan 7 14:18:26 2017
New Revision: 193
URL: http://svn.apache.org/viewvc?rev=193&view=rev
Log:
[MSHARED-608] Remove index.html-adding block in
AbstractMavenReportRenderer#getValidHref()
Modified:
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
Modified:
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java?rev=193&r1=192&r2=193&view=diff
==
---
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
(original)
+++
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
Sat Jan 7 14:18:26 2017
@@ -632,35 +632,17 @@ public abstract class AbstractMavenRepor
{
return href;
}
-else
+else if ( href.startsWith( "./" ) )
{
-String hrefTmp;
-if ( !href.endsWith( "/" ) )
+if ( href.length() > 2 )
{
-hrefTmp = href + "/index.html";
-}
-else
-{
-hrefTmp = href + "index.html";
-}
-
-if ( UrlValidationUtil.isValidUrl( hrefTmp ) )
-{
-return href;
+return href.substring( 2, href.length() );
}
-if ( href.startsWith( "./" ) )
-{
-if ( href.length() > 2 )
-{
-return href.substring( 2, href.length() );
-}
-
-return ".";
-}
-
-return null;
+return ".";
}
+
+return null;
}
/**
svn commit: r1777798 - in /maven/shared/trunk/maven-reporting-impl/src: main/java/org/apache/maven/reporting/UrlValidationUtil.java test/java/org/apache/maven/reporting/UrlValidationUtilTest.java
Author: michaelo
Date: Sat Jan 7 14:33:45 2017
New Revision: 198
URL: http://svn.apache.org/viewvc?rev=198&view=rev
Log:
Revert "[MSHARED-607] Simplify UrlValidationUtil to modern rules"
Modified:
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/UrlValidationUtil.java
maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/UrlValidationUtilTest.java
Modified:
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/UrlValidationUtil.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/UrlValidationUtil.java?rev=198&r1=197&r2=198&view=diff
==
---
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/UrlValidationUtil.java
(original)
+++
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/UrlValidationUtil.java
Sat Jan 7 14:33:45 2017
@@ -19,19 +19,32 @@ package org.apache.maven.reporting;
* under the License.
*/
+import org.apache.commons.validator.routines.RegexValidator;
import org.apache.commons.validator.routines.UrlValidator;
/**
* Static utility class intended to help {@link AbstractMavenReportRenderer}
in validating URLs. Validation uses two
* UrlValidator instances. The first validates public URLs, the second
validates local URLs. At least one validator has
* to accept the given URL. A URL is called local if it uses an unqualified
hostname (such as "localhost" or
- * "workstation-12") or fully-qualified domain names.
+ * "workstation-12") or qualified domain names within the special use top
level domain ".local".
*
* @author mailto:jan.schul...@gmail.com";>Jan Schultze
*/
final class UrlValidationUtil
{
+private static final String LETTERS_DIGITS = "[a-zA-Z0-9]";
+
+private static final String LETTERS_DIGITS_HYPHEN = "[a-zA-Z0-9\\-]";
+
+private static final String LABEL = LETTERS_DIGITS + "(" +
LETTERS_DIGITS_HYPHEN + "{0,61}" + LETTERS_DIGITS + ")?";
+
+private static final String OPTIONAL_PORT =
"(:(([1-5]\\d{1,4})|([1-9]\\d{1,3})))?";
+
+private static final String AUTHORITY_REGEX = LABEL + "(\\." + LABEL +
")*\\.local\\.?" + OPTIONAL_PORT;
+
+private static final String[] SCHEMES = { "http", "https" };
+
private UrlValidationUtil()
{
throw new RuntimeException( "Instantiation of " +
UrlValidationUtil.class.getName() + " is not allowed." );
@@ -50,7 +63,7 @@ final class UrlValidationUtil
private static UrlValidator configurePublicUrlValidator()
{
-return UrlValidator.getInstance();
+return new UrlValidator( SCHEMES );
}
private static boolean isValidLocalUrl( final String url )
@@ -61,7 +74,14 @@ final class UrlValidationUtil
private static UrlValidator configureLocalUrlValidator()
{
-return new UrlValidator( UrlValidator.ALLOW_LOCAL_URLS );
+RegexValidator authorityValidator = configureLocalAuthorityValidator();
+return new UrlValidator( SCHEMES, authorityValidator,
UrlValidator.ALLOW_LOCAL_URLS );
+}
+
+/* package-private for testing purposes */
+static RegexValidator configureLocalAuthorityValidator()
+{
+return new RegexValidator( AUTHORITY_REGEX, false );
}
}
Modified:
maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/UrlValidationUtilTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/UrlValidationUtilTest.java?rev=198&r1=197&r2=198&view=diff
==
---
maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/UrlValidationUtilTest.java
(original)
+++
maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/UrlValidationUtilTest.java
Sat Jan 7 14:33:45 2017
@@ -21,13 +21,15 @@ package org.apache.maven.reporting;
import junit.framework.TestCase;
+import org.apache.commons.validator.routines.RegexValidator;
+
public class UrlValidationUtilTest
extends TestCase
{
public void testUrlWithPortIsAccepted()
{
-testUrlIsAccepted( "http://host.organization.com:8080/something"; );
+testUrlIsAccepted( "http://host.organization.local:8080/something"; );
}
public void testUrlWithLocalhostIsAccepted()
@@ -80,114 +82,111 @@ public class UrlValidationUtilTest
assertFalse( UrlValidationUtil.isValidUrl( string ) );
}
-public void testAuthorityHostDotCompanyDotLocalIsRejected
svn commit: r1777810 - /maven/doxia/doxia/trunk/src/site/site.xml
Author: michaelo Date: Sat Jan 7 15:41:45 2017 New Revision: 1777810 URL: http://svn.apache.org/viewvc?rev=1777810&view=rev Log: [DOXIA-547] Upgrade to Maven Parent 30 Update site.xml as well due to changes in Maven Site Plugin and Doxia Site Renderer Modified: maven/doxia/doxia/trunk/src/site/site.xml Modified: maven/doxia/doxia/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/src/site/site.xml?rev=1777810&r1=1777809&r2=1777810&view=diff == --- maven/doxia/doxia/trunk/src/site/site.xml (original) +++ maven/doxia/doxia/trunk/src/site/site.xml Sat Jan 7 15:41:45 2017 @@ -31,14 +31,6 @@ - - https://www.google-analytics.com/urchin.js"</a>; type="text/javascript"> - - -_uacct = "UA-140879-1"; -urchinTracker(); - - http://maven.apache.org/doxia/index.html"/>
svn commit: r1777812 - /maven/doxia/doxia/trunk/pom.xml
Author: michaelo Date: Sat Jan 7 15:47:23 2017 New Revision: 1777812 URL: http://svn.apache.org/viewvc?rev=1777812&view=rev Log: [DOXIA-548] Upgrade Plexus Utils to 3.0.24 Modified: maven/doxia/doxia/trunk/pom.xml Modified: maven/doxia/doxia/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/pom.xml?rev=1777812&r1=1777811&r2=1777812&view=diff == --- maven/doxia/doxia/trunk/pom.xml (original) +++ maven/doxia/doxia/trunk/pom.xml Sat Jan 7 15:47:23 2017 @@ -184,7 +184,7 @@ under the License. org.codehaus.plexus plexus-utils -3.0.22 +3.0.24 @@ -248,9 +248,9 @@ under the License. src/test/site/**/*.confluence src/test/resources/**/*.twiki src/test/resources/**/*.md - + - +
svn commit: r1777819 - in /maven/doxia/doxia/trunk/doxia-core/src: main/java/org/apache/maven/doxia/util/DoxiaUtils.java test/java/org/apache/maven/doxia/util/DoxiaUtilsTest.java
Author: michaelo
Date: Sat Jan 7 16:04:33 2017
New Revision: 1777819
URL: http://svn.apache.org/viewvc?rev=1777819&view=rev
Log:
[DOXIA-546] DoxiaUtils#encodeId() produces invalid id
Simply use a dot instead of percent sign
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/DoxiaUtilsTest.java
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java?rev=1777819&r1=1777818&r2=1777819&view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
Sat Jan 7 16:04:33 2017
@@ -259,16 +259,8 @@ public class DoxiaUtils
for ( int j = 0; j < bytes.length; ++j )
{
-String hex = byteToHex( bytes[j] );
-
-buffer.append( '%' );
-
-if ( hex.length() == 1 )
-{
-buffer.append( '0' );
-}
-
-buffer.append( hex );
+buffer.append( '.' );
+buffer.append( String.format( "%02X", bytes[j] ) );
}
}
}
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/DoxiaUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/DoxiaUtilsTest.java?rev=1777819&r1=1777818&r2=1777819&view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/DoxiaUtilsTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/DoxiaUtilsTest.java
Sat Jan 7 16:04:33 2017
@@ -159,10 +159,10 @@ public class DoxiaUtilsTest
assertEquals( DoxiaUtils.encodeId( "a b-c123 " ), "a_b-c123" );
assertEquals( DoxiaUtils.encodeId( " anchor" ), "anchor" );
assertEquals( DoxiaUtils.encodeId( "myAnchor" ), "myAnchor" );
-assertEquals( DoxiaUtils.encodeId( "my&Anchor" ), "my%26Anchor" );
-assertEquals( DoxiaUtils.encodeId( "H\u00E5kon" ), "H%c3%a5kon" );
+assertEquals( DoxiaUtils.encodeId( "my&Anchor" ), "my.26Anchor" );
+assertEquals( DoxiaUtils.encodeId( "H\u00E5kon" ), "H.C3.A5kon" );
assertEquals( DoxiaUtils.encodeId( "H\u00E5kon", true ), "Hkon" );
-assertEquals( DoxiaUtils.encodeId( "Theu\u00DFl" ), "Theu%c3%9fl" );
+assertEquals( DoxiaUtils.encodeId( "Theu\u00DFl" ), "Theu.C3.9Fl" );
assertEquals( DoxiaUtils.encodeId( "Theu\u00DFl", true ), "Theul" );
}
@@ -188,6 +188,8 @@ public class DoxiaUtilsTest
assertTrue( DoxiaUtils.isValidId( "a." ) );
assertTrue( DoxiaUtils.isValidId( "index.html" ) );
assertFalse( DoxiaUtils.isValidId( "Theu\u00DFl" ) );
+assertTrue( DoxiaUtils.isValidId( "Theu.C3.9Fl" ) );
+assertFalse( DoxiaUtils.isValidId( "Theu%C3%9Fl" ) );
}
/**
svn commit: r1777821 - in /maven/doxia/doxia/trunk/doxia-core/src: main/java/org/apache/maven/doxia/util/DoxiaUtils.java main/java/org/apache/maven/doxia/util/HtmlTools.java test/java/org/apache/maven
Author: michaelo
Date: Sat Jan 7 16:13:14 2017
New Revision: 1777821
URL: http://svn.apache.org/viewvc?rev=1777821&view=rev
Log:
[DOXIA-549] Deprecate and replace DoxiaUtils#byteToHex() with String#format()
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java?rev=1777821&r1=1777820&r2=1777821&view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
Sat Jan 7 16:13:14 2017
@@ -275,7 +275,9 @@ public class DoxiaUtils
* @return the result of Integer.toHexString( b & 0xFF ).
*
* @since 1.1.1
+ * @deprecated Use {@code String.format( "%02X", bytes[j] )}
*/
+@Deprecated
public static String byteToHex( final byte b )
{
return Integer.toHexString( b & MINUS_ONE );
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java?rev=1777821&r1=1777820&r2=1777821&view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
Sat Jan 7 16:13:14 2017
@@ -366,14 +366,8 @@ public class HtmlTools
for ( int j = 0; j < bytes.length; ++j )
{
-String hex = DoxiaUtils.byteToHex( bytes[j] );
-
encoded.append( '%' );
-if ( hex.length() == 1 )
-{
-encoded.append( '0' );
-}
-encoded.append( hex );
+encoded.append( String.format( "%02X", bytes[j] )
);
}
}
}
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java?rev=1777821&r1=1777820&r2=1777821&view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java
Sat Jan 7 16:13:14 2017
@@ -124,7 +124,7 @@ public class HtmlToolsTest
"http://www.example.com/?This%20is%20a%20simple%20&%20short%20test."; );
String url = "\uD808\uDF45";
-assertEquals( HtmlTools.encodeURL( url ), URLEncoder.encode( url,
"UTF-8" ).toLowerCase( Locale.ENGLISH ) );
+assertEquals( HtmlTools.encodeURL( url ), URLEncoder.encode( url,
"UTF-8" ) );
}
/**
svn commit: r1777822 - /maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java
Author: michaelo Date: Sat Jan 7 16:14:49 2017 New Revision: 1777822 URL: http://svn.apache.org/viewvc?rev=1777822&view=rev Log: Remove unused import Modified: maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java Modified: maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java?rev=1777822&r1=1777821&r2=1777822&view=diff == --- maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java (original) +++ maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java Sat Jan 7 16:14:49 2017 @@ -20,7 +20,6 @@ package org.apache.maven.doxia.util; */ import java.net.URLEncoder; -import java.util.Locale; import org.codehaus.plexus.PlexusTestCase;
svn commit: r1777823 - in /maven/doxia/doxia/trunk/doxia-core/src: main/java/org/apache/maven/doxia/util/HtmlTools.java test/java/org/apache/maven/doxia/util/HtmlToolsTest.java
Author: michaelo
Date: Sat Jan 7 16:20:33 2017
New Revision: 1777823
URL: http://svn.apache.org/viewvc?rev=1777823&view=rev
Log:
[DOXIA-550] Change behavior of HtmlTools#encodeId()
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java?rev=1777823&r1=1777822&r2=1777823&view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
Sat Jan 7 16:20:33 2017
@@ -381,7 +381,7 @@ public class HtmlTools
*
*
* Note: this method is identical to
- * {@link DoxiaUtils#encodeId(String,boolean) DoxiaUtils.encodeId( id,
true)},
+ * {@link DoxiaUtils#encodeId(String,boolean) DoxiaUtils.encodeId( id,
false )},
* the rules to encode an id are laid out there.
*
*
@@ -391,7 +391,7 @@ public class HtmlTools
*/
public static String encodeId( String id )
{
-return DoxiaUtils.encodeId( id, true );
+return DoxiaUtils.encodeId( id, false );
}
/**
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java?rev=1777823&r1=1777822&r2=1777823&view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java
Sat Jan 7 16:20:33 2017
@@ -102,8 +102,8 @@ public class HtmlToolsTest
assertEquals( HtmlTools.encodeId( "a b-c123 " ), "a_b-c123" );
assertEquals( HtmlTools.encodeId( " anchor" ), "anchor" );
assertEquals( HtmlTools.encodeId( "myAnchor" ), "myAnchor" );
-assertEquals( HtmlTools.encodeId( "H\u00E5kon" ), "Hkon" );
-assertEquals( HtmlTools.encodeId( "Theu\u00DFl" ), "Theul" );
+assertEquals( HtmlTools.encodeId( "H\u00E5kon" ), "H.C3.A5kon" );
+assertEquals( HtmlTools.encodeId( "Theu\u00DFl" ), "Theu.C3.9Fl" );
}
/**
svn commit: r1777911 - /maven/site/trunk/content/resources/xsd/core-extensions-1.0.0.xsd
Author: michaelo Date: Sun Jan 8 20:32:56 2017 New Revision: 1777911 URL: http://svn.apache.org/viewvc?rev=1777911&view=rev Log: [MNGSITE-298] core-extensions-1.0.0.xsd cannot be found at documented URL Added: maven/site/trunk/content/resources/xsd/core-extensions-1.0.0.xsd Added: maven/site/trunk/content/resources/xsd/core-extensions-1.0.0.xsd URL: http://svn.apache.org/viewvc/maven/site/trunk/content/resources/xsd/core-extensions-1.0.0.xsd?rev=1777911&view=auto == --- maven/site/trunk/content/resources/xsd/core-extensions-1.0.0.xsd (added) +++ maven/site/trunk/content/resources/xsd/core-extensions-1.0.0.xsd Sun Jan 8 20:32:56 2017 @@ -0,0 +1,53 @@ + + + + + +http://www.w3.org/2001/XMLSchema"; elementFormDefault="qualified" xmlns="http://maven.apache.org/EXTENSIONS/1.0.0"; targetNamespace="http://maven.apache.org/EXTENSIONS/1.0.0";> + + + 1.0.0+ + Extensions to load. + + + + + 1.0.0+ + Extensions to load. + + + + + 1.0.0+ + A set of build extensions to use from this project. + + + + + + + 1.0.0+ + Describes a build extension to utilise. + + + + + 1.0.0+ + The group ID of the extension's artifact. + + + + + 1.0.0+ + The artifact ID of the extension. + + + + + 1.0.0+ + The version of the extension. + + + + + \ No newline at end of file
maven-wagon git commit: [WAGON-485] ScpWagon parses file size to int causing overflow for large files
Repository: maven-wagon Updated Branches: refs/heads/master 01b5631f2 -> 3512a321e [WAGON-485] ScpWagon parses file size to int causing overflow for large files This closes #32 Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/3512a321 Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/3512a321 Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/3512a321 Branch: refs/heads/master Commit: 3512a321ef678209167fa978d5aafe2fdf6bfff7 Parents: 01b5631 Author: silvioj Authored: Mon Jan 9 10:32:03 2017 -0200 Committer: Michael Osipov Committed: Mon Jan 9 22:35:09 2017 +0100 -- .../java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/3512a321/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java -- diff --git a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java index be69880..7f96c77 100644 --- a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java +++ b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java @@ -297,7 +297,7 @@ public class ScpWagon throw new IOException( "Invalid transfer header: " + line ); } -int filesize = Integer.valueOf( line.substring( 5, index ) ).intValue(); +long filesize = Long.parseLong( line.substring( 5, index ) ); fireTransferDebug( "Remote file size: " + filesize ); resource.setContentLength( filesize );
svn commit: r1778110 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/maven-base.css
Author: michaelo
Date: Tue Jan 10 11:22:08 2017
New Revision: 1778110
URL: http://svn.apache.org/viewvc?rev=1778110&view=rev
Log:
[DOXIASITETOOLS-173] Default skin CSS maven-base.css sets border:none on all
images with tag img
Submitted-by: Michael Benz
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/maven-base.css
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/maven-base.css
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/maven-base.css?rev=1778110&r1=1778109&r2=1778110&view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/maven-base.css
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/maven-base.css
Tue Jan 10 11:22:08 2017
@@ -21,9 +21,6 @@ body {
margin: 0px;
padding: 0px;
}
-img {
- border:none;
-}
table {
padding:0px;
width: 100%;
@@ -61,9 +58,6 @@ div.clear hr{
#banner {
padding: 0px;
}
-#banner img {
- border: none;
-}
#breadcrumbs {
padding: 3px 10px 3px 10px;
}
svn commit: r1778133 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm
Author: michaelo Date: Tue Jan 10 14:23:16 2017 New Revision: 1778133 URL: http://svn.apache.org/viewvc?rev=1778133&view=rev Log: [DOXIASITETOOLS-172] Width, height and border values not used for banner display Submitted-by: Michael Benz Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm?rev=1778133&r1=1778132&r2=1778133&view=diff == --- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm (original) +++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm Tue Jan 10 14:23:16 2017 @@ -91,18 +91,40 @@ #end ## -#if( $banner.src ) -#set ( $src = $banner.src ) -#if ( !$decoration.isLink( $src ) ) -#set ( $src = $PathTool.calculateLink( $src, $relativePath ) ) -#set ( $src = $src.replaceAll( '\\', '/' ) ) -#end -#if ( $banner.alt ) -#set ( $alt = $banner.alt ) -#else -#set ( $alt = $banner.name ) -#end - + #if( $banner.src ) +#set ( $src = $banner.src ) + #if ( !$decoration.isLink( $src ) ) +#set ( $src = $PathTool.calculateLink( $src, $relativePath ) ) +#set ( $src = $src.replaceAll( '\\', '/' ) ) + #end + #if ( $banner.alt ) +#set ( $alt = ' alt="' + $banner.alt + '"' ) + #elseif ( $banner.name ) +#set ( $alt = ' alt="' + $banner.name + '"' ) + #else +#set ( $alt = ' alt=""' ) + #end + #if( $banner.border ) +#set ( $imgBorder = ' border="' + $banner.border + '"' ) + #else +#set ( $imgBorder = "" ) + #end + #if( $banner.width ) +#set ( $imgWidth = ' width="' + $banner.width + '"' ) + #else +#set ( $imgWidth = "" ) + #end + #if( $banner.height ) +#set ( $imgHeight = ' height="' + $banner.height + '"' ) + #else +#set ( $imgHeight = "" ) + #end + #if( $banner.title ) +#set ( $bannerTitle=' title="' + $banner.title + '"' ) + #else +#set ( $bannerTitle="" ) + #end + #else $banner.name #end
svn commit: r1778134 - /maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site-macros.vm
Author: michaelo Date: Tue Jan 10 14:24:33 2017 New Revision: 1778134 URL: http://svn.apache.org/viewvc?rev=1778134&view=rev Log: Set empty img alt if not text is available Modified: maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site-macros.vm Modified: maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site-macros.vm URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site-macros.vm?rev=1778134&r1=1778133&r2=1778134&view=diff == --- maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site-macros.vm (original) +++ maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site-macros.vm Tue Jan 10 14:24:33 2017 @@ -165,7 +165,7 @@ #**##elseif ( $banner.name ) #* *##set ( $alt = ' alt="' + $banner.name + '"' ) #**##else -#* *##set ( $alt = "" ) +#* *##set ( $alt = ' alt=""' ) #**##end #**##if( $banner.border ) #* *##set ( $imgBorder = ' border="' + $banner.border + '"' )
svn commit: r1778135 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm
Author: michaelo Date: Tue Jan 10 14:30:49 2017 New Revision: 1778135 URL: http://svn.apache.org/viewvc?rev=1778135&view=rev Log: Trim trailing whitespace Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm?rev=1778135&r1=1778134&r2=1778135&view=diff == --- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm (original) +++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm Tue Jan 10 14:30:49 2017 @@ -119,8 +119,8 @@ #else #set ( $imgHeight = "" ) #end - #if( $banner.title ) -#set ( $bannerTitle=' title="' + $banner.title + '"' ) + #if( $banner.title ) +#set ( $bannerTitle=' title="' + $banner.title + '"' ) #else #set ( $bannerTitle="" ) #end
svn commit: r1778136 - /maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site-macros.vm
Author: michaelo Date: Tue Jan 10 14:37:19 2017 New Revision: 1778136 URL: http://svn.apache.org/viewvc?rev=1778136&view=rev Log: [MSKINS-134] Banner macro does not set image title from decoration model Modified: maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site-macros.vm Modified: maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site-macros.vm URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site-macros.vm?rev=1778136&r1=1778135&r2=1778136&view=diff == --- maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site-macros.vm (original) +++ maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site-macros.vm Tue Jan 10 14:37:19 2017 @@ -182,7 +182,12 @@ #**##else #* *##set ( $imgHeight = "" ) #**##end -#**### +#**##if( $banner.title ) +#* *##set ( $bannerTitle=' title="' + $banner.title + '"' ) +#**##else +#* *##set ( $bannerTitle="" ) +#**##end +#**### #* *##else #**#$banner.name #* *##end
svn commit: r1779225 - in /maven/plugins/trunk/maven-javadoc-plugin/src: it/MJAVADOC-194/module1/ it/MJAVADOC-194/module2/ main/resources/ site/fml/
Author: michaelo Date: Tue Jan 17 17:58:13 2017 New Revision: 1779225 URL: http://svn.apache.org/viewvc?rev=1779225&view=rev Log: [MJAVADOC-477] Use Javadoc instead of JavaDoc in the reporting output Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-194/module1/pom.xml maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-194/module2/pom.xml maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/javadoc-report.properties maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/javadoc-report_de.properties maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/javadoc-report_fr.properties maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/javadoc-report_nl.properties maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/javadoc-report_sv.properties maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/test-javadoc-report.properties maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/test-javadoc-report_de.properties maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/test-javadoc-report_fr.properties maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/test-javadoc-report_nl.properties maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/test-javadoc-report_sv.properties maven/plugins/trunk/maven-javadoc-plugin/src/site/fml/faq.fml Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-194/module1/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-194/module1/pom.xml?rev=1779225&r1=1779224&r2=1779225&view=diff == --- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-194/module1/pom.xml (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-194/module1/pom.xml Tue Jan 17 17:58:13 2017 @@ -29,7 +29,7 @@ module1 1.0.0.0-SNAPSHOT - Module 1 of the JavaDoc Test Project + Module 1 of the Javadoc Test Project jar Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-194/module2/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-194/module2/pom.xml?rev=1779225&r1=1779224&r2=1779225&view=diff == --- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-194/module2/pom.xml (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-194/module2/pom.xml Tue Jan 17 17:58:13 2017 @@ -29,7 +29,7 @@ module2 1.0.0.0-SNAPSHOT - Module 2 of the JavaDoc Test Project + Module 2 of the Javadoc Test Project jar Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/javadoc-report.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/javadoc-report.properties?rev=1779225&r1=1779224&r2=1779225&view=diff == --- maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/javadoc-report.properties (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/javadoc-report.properties Tue Jan 17 17:58:13 2017 @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. -report.javadoc.name=JavaDocs -report.javadoc.description=JavaDoc API documentation. +report.javadoc.name=Javadoc +report.javadoc.description=Javadoc API documentation. Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/javadoc-report_de.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/javadoc-report_de.properties?rev=1779225&r1=1779224&r2=1779225&view=diff == --- maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/javadoc-report_de.properties (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/javadoc-report_de.properties Tue Jan 17 17:58:13 2017 @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. -report.javadoc.name=JavaDocs -report.javadoc.description=JavaDoc API Dokumentation. +report.javadoc.name=Javadoc +report.javadoc.description=Javadoc API Dokumentation. Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/javadoc-report_fr.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/javadoc-report_fr.properties?rev=1779225&r1=1779224&r2=1779225&view=diff == --- maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/javadoc-report_fr.properties (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/main/resources
maven git commit: [MNG-6106] Remove maven.home setter from m2.conf
Repository: maven
Updated Branches:
refs/heads/MNG-6106 [created] f8068ddd5
[MNG-6106] Remove maven.home setter from m2.conf
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f8068ddd
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f8068ddd
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f8068ddd
Branch: refs/heads/MNG-6106
Commit: f8068ddd509a0152b5c443319c1ccfacc9210060
Parents: d413296
Author: Michael Osipov
Authored: Sun Jan 22 12:33:50 2017 +0100
Committer: Michael Osipov
Committed: Sun Jan 22 12:33:50 2017 +0100
--
apache-maven/src/bin/m2.conf | 2 --
1 file changed, 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/f8068ddd/apache-maven/src/bin/m2.conf
--
diff --git a/apache-maven/src/bin/m2.conf b/apache-maven/src/bin/m2.conf
index 2991e0b..b4f1207 100644
--- a/apache-maven/src/bin/m2.conf
+++ b/apache-maven/src/bin/m2.conf
@@ -1,7 +1,5 @@
main is org.apache.maven.cli.MavenCli from plexus.core
-set maven.home default ${user.home}/m2
-
[plexus.core]
optionally ${maven.home}/lib/ext/*.jar
load ${maven.home}/lib/*.jar
maven git commit: [MNG-6138] Remove obsolete message_*.properties form maven-core
Repository: maven
Updated Branches:
refs/heads/MNG-6138 [created] eb43b3aa8
[MNG-6138] Remove obsolete message_*.properties form maven-core
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/eb43b3aa
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/eb43b3aa
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/eb43b3aa
Branch: refs/heads/MNG-6138
Commit: eb43b3aa82152be381bb838cc0aa9a40ff74a2cd
Parents: d413296
Author: Michael Osipov
Authored: Thu Dec 22 22:39:00 2016 +0100
Committer: Michael Osipov
Committed: Sun Jan 22 12:35:06 2017 +0100
--
.../apache/maven/messages/messages.properties | 34
.../maven/messages/messages_de.properties | 34
.../maven/messages/messages_el.properties | 33 ---
.../maven/messages/messages_en.properties | 23 -
.../maven/messages/messages_es.properties | 33 ---
.../maven/messages/messages_fr.properties | 33 ---
.../maven/messages/messages_ja.properties | 34
.../maven/messages/messages_ko.properties | 34
.../maven/messages/messages_nl.properties | 33 ---
.../maven/messages/messages_no.properties | 33 ---
.../maven/messages/messages_pl.properties | 33 ---
.../maven/messages/messages_zh_CN.properties| 34
12 files changed, 391 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/eb43b3aa/maven-core/src/main/resources/org/apache/maven/messages/messages.properties
--
diff --git
a/maven-core/src/main/resources/org/apache/maven/messages/messages.properties
b/maven-core/src/main/resources/org/apache/maven/messages/messages.properties
deleted file mode 100644
index d576d7a..000
---
a/maven-core/src/main/resources/org/apache/maven/messages/messages.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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 Verifier
-# --
-failed.download.warning=WARNING: Failed to download {0}.
-remote.repository.disabled.warning=The use of the remote repository has been
disabled.
-directory.nonexistant.warning=Directory {0} does not exist. Attempting to
create.
-not.directory.warning={0} is not a directory.
-not.writable.warning={0} is not writable.
-cannot.create.directory.warning=Unable to create directory {0}
-maven.repo.local.unset.warning=maven.repo.local is not set.
-single.unsatisfied.dependency.error=The build cannot continue because of the
following unsatisfied dependency:
-multiple.unsatisfied.dependency.error=The build cannot continue because of the
following unsatisfied dependencies:
-offline.snapshot.warning=You are working offline so the build will continue,
but {0} may be out of date!
-download.message=Attempting to download {0}.
-plugin.loading.error=The plugin {0} could not be loaded.
-empty.descriptor.error=The file {0} you specified has zero length.
-checksum.verification.error=The follow artifact is corrupt: {0}.
http://git-wip-us.apache.org/repos/asf/maven/blob/eb43b3aa/maven-core/src/main/resources/org/apache/maven/messages/messages_de.properties
--
diff --git
a/maven-core/src/main/resources/org/apache/maven/messages/messages_de.properties
b/maven-core/src/main/resources/org/apache/maven/messages/messages_de.properties
deleted file mode 100644
index d5c7dad..000
---
a/maven-core/src/main/resources/org/apache/maven/messages/messages_de.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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 owne
maven git commit: [MNG-6081] Log refactoring - Method Invocation Replaced By Variable
Repository: maven
Updated Branches:
refs/heads/MNG-6081 [created] 2559f8ac2
[MNG-6081] Log refactoring - Method Invocation Replaced By Variable
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/2559f8ac
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/2559f8ac
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/2559f8ac
Branch: refs/heads/MNG-6081
Commit: 2559f8ac261d57fb20ec21c076794ce1a6a892ce
Parents: d413296
Author: Nemo Chen
Authored: Fri Oct 21 22:36:41 2016 +0200
Committer: Michael Osipov
Committed: Sun Jan 22 12:36:51 2017 +0100
--
.../apache/maven/artifact/resolver/DebugResolutionListener.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/2559f8ac/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
--
diff --git
a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
index 43806b1..bd1ed9a 100644
---
a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
+++
b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
@@ -71,7 +71,7 @@ public class DebugResolutionListener
if ( omittedVersion != null ? !omittedVersion.equals( keptVersion ) :
keptVersion != null )
{
-logger.debug( indent + omitted + " (removed - nearer found: " +
kept.getVersion() + ")" );
+logger.debug( indent + omitted + " (removed - nearer found: " +
keptVersion + ")" );
}
}
@@ -164,4 +164,4 @@ public class DebugResolutionListener
}
}
-}
\ No newline at end of file
+}
maven git commit: [MNG-5975] Use Java 7's SimpleDateFormat in CLIReportingUtils#formatTimestamp
Repository: maven
Updated Branches:
refs/heads/MNG-5975 [created] 3883ac32a
[MNG-5975] Use Java 7's SimpleDateFormat in CLIReportingUtils#formatTimestamp
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3883ac32
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3883ac32
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3883ac32
Branch: refs/heads/MNG-5975
Commit: 3883ac32ab68b0afa25cae28f2b7541a4fa9ca64
Parents: d413296
Author: Michael Osipov
Authored: Fri Feb 12 23:30:47 2016 +0100
Committer: Michael Osipov
Committed: Sun Jan 22 12:38:41 2017 +0100
--
.../org/apache/maven/cli/CLIReportingUtils.java | 28 +---
1 file changed, 6 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/3883ac32/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
--
diff --git
a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
index 2397d5d..5f23b13 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
@@ -19,15 +19,15 @@ package org.apache.maven.cli;
* under the License.
*/
-import org.codehaus.plexus.util.Os;
-import org.slf4j.Logger;
-
import java.io.IOException;
import java.io.InputStream;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.Properties;
-import java.util.TimeZone;
+
+import org.codehaus.plexus.util.Os;
+import org.slf4j.Logger;
/**
* Utility class used to report errors, statistics, application version info,
etc.
@@ -152,24 +152,8 @@ public final class CLIReportingUtils
public static String formatTimestamp( long timestamp )
{
-// Manual construction of the tz offset because only Java 7 is aware
of ISO 8601 time zones
-TimeZone tz = TimeZone.getDefault();
-int offset = tz.getRawOffset();
-
-// Raw offset ignores DST, so check if we are in DST now and add the
offset
-if ( tz.inDaylightTime( new Date( timestamp ) ) )
-{
-offset += tz.getDSTSavings();
-}
-
-// CHECKSTYLE_OFF: MagicNumber
-long m = Math.abs( ( offset / ONE_MINUTE ) % 60 );
-long h = Math.abs( ( offset / ONE_HOUR ) % 24 );
-// CHECKSTYLE_ON: MagicNumber
-
-int offsetDir = (int) Math.signum( (float) offset );
-char offsetSign = offsetDir >= 0 ? '+' : '-';
-return String.format( "%tFT%
maven git commit: [MNG-5954] Remove outdated maven-embedder/src/main/resources/META-INF/MANIFEST.MF
Repository: maven
Updated Branches:
refs/heads/MNG-5954 [created] 4941e6280
[MNG-5954] Remove outdated
maven-embedder/src/main/resources/META-INF/MANIFEST.MF
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4941e628
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4941e628
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4941e628
Branch: refs/heads/MNG-5954
Commit: 4941e6280ecab7c72f33c3e822b5168bd8fa08a4
Parents: d413296
Author: Michael Osipov
Authored: Tue Dec 29 00:11:29 2015 +0100
Committer: Michael Osipov
Committed: Sun Jan 22 12:39:53 2017 +0100
--
maven-embedder/src/main/resources/META-INF/MANIFEST.MF | 7 ---
1 file changed, 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/4941e628/maven-embedder/src/main/resources/META-INF/MANIFEST.MF
--
diff --git a/maven-embedder/src/main/resources/META-INF/MANIFEST.MF
b/maven-embedder/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 57576ed..000
--- a/maven-embedder/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Maven 2.x Embedder Plug-in
-Bundle-Vendor: maven.org
-Bundle-SymbolicName: org.maven.ide.embedder
-Bundle-Version: ${bundleVersion}
-Bundle-ClassPath: .
maven git commit: [MNG-5975] Use Java 7's SimpleDateFormat in CLIReportingUtils#formatTimestamp [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-5975 3883ac32a -> aab516944 (forced update)
[MNG-5975] Use Java 7's SimpleDateFormat in CLIReportingUtils#formatTimestamp
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/aab51694
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/aab51694
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/aab51694
Branch: refs/heads/MNG-5975
Commit: aab5169448d1fb9624394a34555e27291a5407d4
Parents: d413296
Author: Michael Osipov
Authored: Fri Feb 12 23:30:47 2016 +0100
Committer: Michael Osipov
Committed: Sun Jan 22 13:25:13 2017 +0100
--
.../org/apache/maven/cli/CLIReportingUtils.java | 32 ++--
1 file changed, 10 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/aab51694/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
--
diff --git
a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
index 2397d5d..214704b 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
@@ -19,15 +19,15 @@ package org.apache.maven.cli;
* under the License.
*/
-import org.codehaus.plexus.util.Os;
-import org.slf4j.Logger;
-
import java.io.IOException;
import java.io.InputStream;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.Properties;
-import java.util.TimeZone;
+
+import org.codehaus.plexus.util.Os;
+import org.slf4j.Logger;
/**
* Utility class used to report errors, statistics, application version info,
etc.
@@ -152,24 +152,8 @@ public final class CLIReportingUtils
public static String formatTimestamp( long timestamp )
{
-// Manual construction of the tz offset because only Java 7 is aware
of ISO 8601 time zones
-TimeZone tz = TimeZone.getDefault();
-int offset = tz.getRawOffset();
-
-// Raw offset ignores DST, so check if we are in DST now and add the
offset
-if ( tz.inDaylightTime( new Date( timestamp ) ) )
-{
-offset += tz.getDSTSavings();
-}
-
-// CHECKSTYLE_OFF: MagicNumber
-long m = Math.abs( ( offset / ONE_MINUTE ) % 60 );
-long h = Math.abs( ( offset / ONE_HOUR ) % 24 );
-// CHECKSTYLE_ON: MagicNumber
-
-int offsetDir = (int) Math.signum( (float) offset );
-char offsetSign = offsetDir >= 0 ? '+' : '-';
-return String.format( "%tFT% 0 )
{
+// Length 11+ chars
format = "%d d %02d:%02d h";
}
else if ( h > 0 )
{
+// Length 7 chars
format = "%2$02d:%3$02d h";
}
else if ( m > 0 )
{
+// Length 9 chars
format = "%3$02d:%4$02d min";
}
else
{
+// Length 7-8 chars
format = "%4$d.%5$03d s";
}
[2/5] maven git commit: [MNG-6081] Log refactoring - Method Invocation Replaced By Variable
[MNG-6081] Log refactoring - Method Invocation Replaced By Variable
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a2358ba7
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a2358ba7
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a2358ba7
Branch: refs/heads/master
Commit: a2358ba7bb9b5b8ccb4ca2b6ea66b637b88d6c09
Parents: 5053a62
Author: Nemo Chen
Authored: Fri Oct 21 22:36:41 2016 +0200
Committer: Michael Osipov
Committed: Sun Jan 22 21:37:57 2017 +0100
--
.../apache/maven/artifact/resolver/DebugResolutionListener.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/a2358ba7/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
--
diff --git
a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
index 43806b1..bd1ed9a 100644
---
a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
+++
b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
@@ -71,7 +71,7 @@ public class DebugResolutionListener
if ( omittedVersion != null ? !omittedVersion.equals( keptVersion ) :
keptVersion != null )
{
-logger.debug( indent + omitted + " (removed - nearer found: " +
kept.getVersion() + ")" );
+logger.debug( indent + omitted + " (removed - nearer found: " +
keptVersion + ")" );
}
}
@@ -164,4 +164,4 @@ public class DebugResolutionListener
}
}
-}
\ No newline at end of file
+}
[5/5] maven git commit: [MNG-6106] Remove maven.home setter from m2.conf
[MNG-6106] Remove maven.home setter from m2.conf
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5053a628
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5053a628
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5053a628
Branch: refs/heads/master
Commit: 5053a628c0a4eb069ab5512ad7491494207cb996
Parents: 8373c79
Author: Michael Osipov
Authored: Sun Jan 22 12:33:50 2017 +0100
Committer: Michael Osipov
Committed: Sun Jan 22 21:37:57 2017 +0100
--
apache-maven/src/bin/m2.conf | 2 --
1 file changed, 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/5053a628/apache-maven/src/bin/m2.conf
--
diff --git a/apache-maven/src/bin/m2.conf b/apache-maven/src/bin/m2.conf
index 213dc55..346554c 100644
--- a/apache-maven/src/bin/m2.conf
+++ b/apache-maven/src/bin/m2.conf
@@ -1,7 +1,5 @@
main is org.apache.maven.cli.MavenCli from plexus.core
-set maven.home default ${user.home}/m2
-
[plexus.core]
load ${maven.home}/conf/logging
optionally ${maven.home}/lib/ext/*.jar
[1/5] maven git commit: [MNG-5954] Remove outdated maven-embedder/src/main/resources/META-INF/MANIFEST.MF
Repository: maven
Updated Branches:
refs/heads/master c516ef79a -> deefd9342
[MNG-5954] Remove outdated
maven-embedder/src/main/resources/META-INF/MANIFEST.MF
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/deefd934
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/deefd934
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/deefd934
Branch: refs/heads/master
Commit: deefd9342b13f1fec786ddb00ff3b39299e6e11a
Parents: 355f4df
Author: Michael Osipov
Authored: Tue Dec 29 00:11:29 2015 +0100
Committer: Michael Osipov
Committed: Sun Jan 22 21:37:57 2017 +0100
--
maven-embedder/src/main/resources/META-INF/MANIFEST.MF | 7 ---
1 file changed, 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/deefd934/maven-embedder/src/main/resources/META-INF/MANIFEST.MF
--
diff --git a/maven-embedder/src/main/resources/META-INF/MANIFEST.MF
b/maven-embedder/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 57576ed..000
--- a/maven-embedder/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Maven 2.x Embedder Plug-in
-Bundle-Vendor: maven.org
-Bundle-SymbolicName: org.maven.ide.embedder
-Bundle-Version: ${bundleVersion}
-Bundle-ClassPath: .
[4/5] maven git commit: [MNG-5975] Use Java 7's SimpleDateFormat in CLIReportingUtils#formatTimestamp
[MNG-5975] Use Java 7's SimpleDateFormat in CLIReportingUtils#formatTimestamp
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/355f4dff
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/355f4dff
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/355f4dff
Branch: refs/heads/master
Commit: 355f4dff03cea8cab0d7bdcb00fffa4e43b2c10b
Parents: a2358ba
Author: Michael Osipov
Authored: Fri Feb 12 23:30:47 2016 +0100
Committer: Michael Osipov
Committed: Sun Jan 22 21:37:57 2017 +0100
--
.../org/apache/maven/cli/CLIReportingUtils.java | 32 ++--
1 file changed, 10 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/355f4dff/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
--
diff --git
a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
index 2397d5d..214704b 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
@@ -19,15 +19,15 @@ package org.apache.maven.cli;
* under the License.
*/
-import org.codehaus.plexus.util.Os;
-import org.slf4j.Logger;
-
import java.io.IOException;
import java.io.InputStream;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.Properties;
-import java.util.TimeZone;
+
+import org.codehaus.plexus.util.Os;
+import org.slf4j.Logger;
/**
* Utility class used to report errors, statistics, application version info,
etc.
@@ -152,24 +152,8 @@ public final class CLIReportingUtils
public static String formatTimestamp( long timestamp )
{
-// Manual construction of the tz offset because only Java 7 is aware
of ISO 8601 time zones
-TimeZone tz = TimeZone.getDefault();
-int offset = tz.getRawOffset();
-
-// Raw offset ignores DST, so check if we are in DST now and add the
offset
-if ( tz.inDaylightTime( new Date( timestamp ) ) )
-{
-offset += tz.getDSTSavings();
-}
-
-// CHECKSTYLE_OFF: MagicNumber
-long m = Math.abs( ( offset / ONE_MINUTE ) % 60 );
-long h = Math.abs( ( offset / ONE_HOUR ) % 24 );
-// CHECKSTYLE_ON: MagicNumber
-
-int offsetDir = (int) Math.signum( (float) offset );
-char offsetSign = offsetDir >= 0 ? '+' : '-';
-return String.format( "%tFT% 0 )
{
+// Length 11+ chars
format = "%d d %02d:%02d h";
}
else if ( h > 0 )
{
+// Length 7 chars
format = "%2$02d:%3$02d h";
}
else if ( m > 0 )
{
+// Length 9 chars
format = "%3$02d:%4$02d min";
}
else
{
+// Length 7-8 chars
format = "%4$d.%5$03d s";
}
[3/5] maven git commit: [MNG-6138] Remove obsolete message_*.properties form maven-core
[MNG-6138] Remove obsolete message_*.properties form maven-core
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8373c79a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8373c79a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8373c79a
Branch: refs/heads/master
Commit: 8373c79a47ce4f12e549ae817a9c5f9eae950fb8
Parents: c516ef7
Author: Michael Osipov
Authored: Thu Dec 22 22:39:00 2016 +0100
Committer: Michael Osipov
Committed: Sun Jan 22 21:37:57 2017 +0100
--
.../apache/maven/messages/messages.properties | 34
.../maven/messages/messages_de.properties | 34
.../maven/messages/messages_el.properties | 33 ---
.../maven/messages/messages_en.properties | 23 -
.../maven/messages/messages_es.properties | 33 ---
.../maven/messages/messages_fr.properties | 33 ---
.../maven/messages/messages_ja.properties | 34
.../maven/messages/messages_ko.properties | 34
.../maven/messages/messages_nl.properties | 33 ---
.../maven/messages/messages_no.properties | 33 ---
.../maven/messages/messages_pl.properties | 33 ---
.../maven/messages/messages_zh_CN.properties| 34
12 files changed, 391 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/8373c79a/maven-core/src/main/resources/org/apache/maven/messages/messages.properties
--
diff --git
a/maven-core/src/main/resources/org/apache/maven/messages/messages.properties
b/maven-core/src/main/resources/org/apache/maven/messages/messages.properties
deleted file mode 100644
index d576d7a..000
---
a/maven-core/src/main/resources/org/apache/maven/messages/messages.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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 Verifier
-# --
-failed.download.warning=WARNING: Failed to download {0}.
-remote.repository.disabled.warning=The use of the remote repository has been
disabled.
-directory.nonexistant.warning=Directory {0} does not exist. Attempting to
create.
-not.directory.warning={0} is not a directory.
-not.writable.warning={0} is not writable.
-cannot.create.directory.warning=Unable to create directory {0}
-maven.repo.local.unset.warning=maven.repo.local is not set.
-single.unsatisfied.dependency.error=The build cannot continue because of the
following unsatisfied dependency:
-multiple.unsatisfied.dependency.error=The build cannot continue because of the
following unsatisfied dependencies:
-offline.snapshot.warning=You are working offline so the build will continue,
but {0} may be out of date!
-download.message=Attempting to download {0}.
-plugin.loading.error=The plugin {0} could not be loaded.
-empty.descriptor.error=The file {0} you specified has zero length.
-checksum.verification.error=The follow artifact is corrupt: {0}.
http://git-wip-us.apache.org/repos/asf/maven/blob/8373c79a/maven-core/src/main/resources/org/apache/maven/messages/messages_de.properties
--
diff --git
a/maven-core/src/main/resources/org/apache/maven/messages/messages_de.properties
b/maven-core/src/main/resources/org/apache/maven/messages/messages_de.properties
deleted file mode 100644
index d5c7dad..000
---
a/maven-core/src/main/resources/org/apache/maven/messages/messages_de.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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
maven git commit: [MNG-5977] Improve output readability of our MavenTransferListener implementations
Repository: maven
Updated Branches:
refs/heads/MNG-5977 [created] 16bd87310
[MNG-5977] Improve output readability of our MavenTransferListener
implementations
* Applied a general decimal formatter which automatically scales file size
between 1 and 1000 along with proper size and time units
* The progress meter in the shell will now properly tell that a progress is
going on and visually seperate parallel downloads with " | "
* Optimized and reduced padding to the cases where it actually is necessary
* Padding has to applied to very event which can succeed a progress update
* Synchronize all calls to console to avoid race conditions where output is
terminated by a carriage return only. If no sync is done, SLF4J or
INIT/SUCCEEDED update can interleave and overwrite the progress while being
shorter as the progress itself.
* Reworked the file size formatter which now compacts the progress with
the unit symbol, plus it scales to one decimal place only if the size is
below 10.
* Replaced the concurrent hash map with a synchronized linked hash map
to retain order of the progress meter. It will behave now like a queue.
Race conditions cannot be avoided if -T is employed since one does not have
access to the output stream of a SLF4J backend to synchronize on.
Add the amount of currently in download/upload progressing items to the
Progress label.
When running in debug mode, Maven displays the filename currently in
progress.
Work around a rounding bug existed upto Java 7
See http://stackoverflow.com/q/22797964/696632 and Oracle's bugfix
announcement:
http://www.oracle.com/technetwork/java/javase/8-compatibility-guide-2156366.html
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/16bd8731
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/16bd8731
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/16bd8731
Branch: refs/heads/MNG-5977
Commit: 16bd87310398e14f13b8ca0b3f71ee5cf0901b52
Parents: deefd93
Author: Michael Osipov
Authored: Thu Feb 18 00:28:50 2016 +0100
Committer: Michael Osipov
Committed: Sun Jan 22 22:06:48 2017 +0100
--
.../java/org/apache/maven/cli/MavenCli.java | 10 +-
.../transfer/AbstractMavenTransferListener.java | 208 ++--
.../transfer/ConsoleMavenTransferListener.java | 110 ---
.../transfer/Slf4jMavenTransferListener.java| 38 +--
.../maven/cli/transfer/FileSizeFormatTest.java | 313 +++
5 files changed, 593 insertions(+), 86 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/16bd8731/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
--
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 176ce4d..2b9f099 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -1005,13 +1005,13 @@ public class MavenCli
// present supplied by the user. The rule is that we only allow the
execution of one ConfigurationProcessor.
// If there is more than one then we execute the one supplied by the
user, otherwise we execute the
// the default SettingsXmlConfigurationProcessor.
-//
+//
int userSuppliedConfigurationProcessorCount =
configurationProcessors.size() - 1;
if ( userSuppliedConfigurationProcessorCount == 0 )
{
//
-// Our settings.xml source is historically how we have configured
Maven from the CLI so we are going to
+// Our settings.xml source is historically how we have configured
Maven from the CLI so we are going to
// have to honour its existence forever. So let's run it.
//
configurationProcessors.get(
SettingsXmlConfigurationProcessor.HINT ).process( cliRequest );
@@ -1288,7 +1288,7 @@ public class MavenCli
// If we're logging to a file then we don't want the console
transfer listener as it will spew
// download progress all over the place
//
-transferListener = getConsoleTransferListener();
+transferListener = getConsoleTransferListener(
cliRequest.commandLine.hasOption( CLIManager.DEBUG ) );
}
else
{
@@ -1588,9 +1588,9 @@ public class MavenCli
// Customizations available via the CLI
//
-protected TransferListener getConsoleTransferListener()
+protected TransferListener getConsoleTransferListener( boolean
printResourceNames )
{
-return new ConsoleMavenTransferListener( System.out );
+return new ConsoleMavenTransferListener( System.out,
printResourceNames );
maven git commit: [MNG-5977] Improve output readability of our MavenTransferListener implementations [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-5977 16bd87310 -> 5e553e653 (forced update)
[MNG-5977] Improve output readability of our MavenTransferListener
implementations
* Applied a general decimal formatter which automatically scales file size
between 1 and 1000 along with proper size and time units
* The progress meter in the shell will now properly tell that a progress is
going on and visually seperate parallel downloads with " | "
* Optimized and reduced padding to the cases where it actually is necessary
* Padding has to applied to very event which can succeed a progress update
* Synchronize all calls to console to avoid race conditions where output is
terminated by a carriage return only. If no sync is done, SLF4J or
INIT/SUCCEEDED update can interleave and overwrite the progress while being
shorter as the progress itself.
* Reworked the file size formatter which now compacts the progress with
the unit symbol, plus it scales to one decimal place only if the size is
below 10.
* Replaced the concurrent hash map with a synchronized linked hash map
to retain order of the progress meter. It will behave now like a queue.
Race conditions cannot be avoided if -T is employed since one does not have
access to the output stream of a SLF4J backend to synchronize on.
Add the amount of currently in download/upload progressing items to the
Progress label.
When running in debug mode, Maven displays the filename currently in
progress.
Work around a rounding bug existed upto Java 7
See http://stackoverflow.com/q/22797964/696632 and Oracle's bugfix
announcement:
http://www.oracle.com/technetwork/java/javase/8-compatibility-guide-2156366.html
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5e553e65
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5e553e65
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5e553e65
Branch: refs/heads/MNG-5977
Commit: 5e553e6530b4d3233722afc2511241ee896026b2
Parents: deefd93
Author: Michael Osipov
Authored: Thu Feb 18 00:28:50 2016 +0100
Committer: Michael Osipov
Committed: Sun Jan 22 22:18:14 2017 +0100
--
.../java/org/apache/maven/cli/MavenCli.java | 10 +-
.../transfer/AbstractMavenTransferListener.java | 208 ++--
.../transfer/ConsoleMavenTransferListener.java | 110 ---
.../transfer/Slf4jMavenTransferListener.java| 38 +--
.../maven/cli/transfer/FileSizeFormatTest.java | 313 +++
5 files changed, 593 insertions(+), 86 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/5e553e65/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
--
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 176ce4d..2b9f099 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -1005,13 +1005,13 @@ public class MavenCli
// present supplied by the user. The rule is that we only allow the
execution of one ConfigurationProcessor.
// If there is more than one then we execute the one supplied by the
user, otherwise we execute the
// the default SettingsXmlConfigurationProcessor.
-//
+//
int userSuppliedConfigurationProcessorCount =
configurationProcessors.size() - 1;
if ( userSuppliedConfigurationProcessorCount == 0 )
{
//
-// Our settings.xml source is historically how we have configured
Maven from the CLI so we are going to
+// Our settings.xml source is historically how we have configured
Maven from the CLI so we are going to
// have to honour its existence forever. So let's run it.
//
configurationProcessors.get(
SettingsXmlConfigurationProcessor.HINT ).process( cliRequest );
@@ -1288,7 +1288,7 @@ public class MavenCli
// If we're logging to a file then we don't want the console
transfer listener as it will spew
// download progress all over the place
//
-transferListener = getConsoleTransferListener();
+transferListener = getConsoleTransferListener(
cliRequest.commandLine.hasOption( CLIManager.DEBUG ) );
}
else
{
@@ -1588,9 +1588,9 @@ public class MavenCli
// Customizations available via the CLI
//
-protected TransferListener getConsoleTransferListener()
+protected TransferListener getConsoleTransferListener( boolean
printResourceNames )
{
-return new ConsoleMavenTransferListener( System.out );
+return new ConsoleMavenTransferListener( System.out,
print
maven git commit: [MNG-5977] Improve output readability of our MavenTransferListener implementations [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-5977 5e553e653 -> 9c72005cc (forced update)
[MNG-5977] Improve output readability of our MavenTransferListener
implementations
* Applied a general decimal formatter which automatically scales file size
between 1 and 1000 along with proper size and time units
* The progress meter in the shell will now properly tell that a progress is
going on and visually seperate parallel downloads with " | "
* Optimized and reduced padding to the cases where it actually is necessary
* Padding has to applied to very event which can succeed a progress update
* Synchronize all calls to console to avoid race conditions where output is
terminated by a carriage return only. If no sync is done, SLF4J or
INIT/SUCCEEDED update can interleave and overwrite the progress while being
shorter as the progress itself.
* Reworked the file size formatter which now compacts the progress with
the unit symbol, plus it scales to one decimal place only if the size is
below 10.
* Replaced the concurrent hash map with a synchronized linked hash map
to retain order of the progress meter. It will behave now like a queue.
Race conditions cannot be avoided if -T is employed since one does not have
access to the output stream of a SLF4J backend to synchronize on.
Add the amount of currently in download/upload progressing items to the
Progress label.
When running in debug mode, Maven displays the filename currently in
progress.
Work around a rounding bug existed upto Java 7
See http://stackoverflow.com/q/22797964/696632 and Oracle's bugfix
announcement:
http://www.oracle.com/technetwork/java/javase/8-compatibility-guide-2156366.html
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/9c72005c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/9c72005c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/9c72005c
Branch: refs/heads/MNG-5977
Commit: 9c72005ccd490a183152a65cffa1ecebfc4e7acd
Parents: deefd93
Author: Michael Osipov
Authored: Thu Feb 18 00:28:50 2016 +0100
Committer: Michael Osipov
Committed: Sun Jan 22 22:23:43 2017 +0100
--
.../java/org/apache/maven/cli/MavenCli.java | 10 +-
.../transfer/AbstractMavenTransferListener.java | 209 +++--
.../transfer/ConsoleMavenTransferListener.java | 110 ---
.../transfer/Slf4jMavenTransferListener.java| 38 +--
.../maven/cli/transfer/FileSizeFormatTest.java | 313 +++
5 files changed, 594 insertions(+), 86 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/9c72005c/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
--
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 176ce4d..2b9f099 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -1005,13 +1005,13 @@ public class MavenCli
// present supplied by the user. The rule is that we only allow the
execution of one ConfigurationProcessor.
// If there is more than one then we execute the one supplied by the
user, otherwise we execute the
// the default SettingsXmlConfigurationProcessor.
-//
+//
int userSuppliedConfigurationProcessorCount =
configurationProcessors.size() - 1;
if ( userSuppliedConfigurationProcessorCount == 0 )
{
//
-// Our settings.xml source is historically how we have configured
Maven from the CLI so we are going to
+// Our settings.xml source is historically how we have configured
Maven from the CLI so we are going to
// have to honour its existence forever. So let's run it.
//
configurationProcessors.get(
SettingsXmlConfigurationProcessor.HINT ).process( cliRequest );
@@ -1288,7 +1288,7 @@ public class MavenCli
// If we're logging to a file then we don't want the console
transfer listener as it will spew
// download progress all over the place
//
-transferListener = getConsoleTransferListener();
+transferListener = getConsoleTransferListener(
cliRequest.commandLine.hasOption( CLIManager.DEBUG ) );
}
else
{
@@ -1588,9 +1588,9 @@ public class MavenCli
// Customizations available via the CLI
//
-protected TransferListener getConsoleTransferListener()
+protected TransferListener getConsoleTransferListener( boolean
printResourceNames )
{
-return new ConsoleMavenTransferListener( System.out );
+return new ConsoleMavenTransferListener( System.out,
prin
maven git commit: [MNG-5977] Improve output readability of our MavenTransferListener implementations [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-5977 9c72005cc -> 7eec0ef74 (forced update)
[MNG-5977] Improve output readability of our MavenTransferListener
implementations
* Applied a general decimal formatter which automatically scales file sizes
between [0,10) (one decimal digit) and [10,1000) (whole numbers) along with
proper size and time units
* The progress meter will now properly
** tell the amount of transfers along with file names (in debug mode) and
absolute progress by size
** visually seperate parallel transfers with " | "
* Optimized and reduced padding to the cases where it actually is necessary
* Padding has to be applied to every event which can succeed with progress
update
* Synchronize all calls to console to avoid race conditions where output is
terminated by a carriage return only. If no sync is done, SLF4J or
INIT/SUCCEEDED update can interleave and overwrite the progress while being
shorter as the progress itself.
* Replaced the concurrent hash map with a synchronized linked hash map to
retain order of the progress meter. It will behave now like a queue.
* Work around a rounding bug existed upto Java 7
See http://stackoverflow.com/q/22797964/696632 and Oracle's bugfix
Announcement:
http://www.oracle.com/technetwork/java/javase/8-compatibility-guide-2156366.html
Race conditions cannot be avoided if -T is employed since one does not have
access to the output stream of a SLF4J backend to synchronize on.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7eec0ef7
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7eec0ef7
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7eec0ef7
Branch: refs/heads/MNG-5977
Commit: 7eec0ef745e9a9af5c95f5864964902bb190505f
Parents: deefd93
Author: Michael Osipov
Authored: Thu Feb 18 00:28:50 2016 +0100
Committer: Michael Osipov
Committed: Sun Jan 22 22:25:12 2017 +0100
--
.../java/org/apache/maven/cli/MavenCli.java | 10 +-
.../transfer/AbstractMavenTransferListener.java | 209 +++--
.../transfer/ConsoleMavenTransferListener.java | 110 ---
.../transfer/Slf4jMavenTransferListener.java| 38 +--
.../maven/cli/transfer/FileSizeFormatTest.java | 313 +++
5 files changed, 594 insertions(+), 86 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/7eec0ef7/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
--
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 176ce4d..2b9f099 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -1005,13 +1005,13 @@ public class MavenCli
// present supplied by the user. The rule is that we only allow the
execution of one ConfigurationProcessor.
// If there is more than one then we execute the one supplied by the
user, otherwise we execute the
// the default SettingsXmlConfigurationProcessor.
-//
+//
int userSuppliedConfigurationProcessorCount =
configurationProcessors.size() - 1;
if ( userSuppliedConfigurationProcessorCount == 0 )
{
//
-// Our settings.xml source is historically how we have configured
Maven from the CLI so we are going to
+// Our settings.xml source is historically how we have configured
Maven from the CLI so we are going to
// have to honour its existence forever. So let's run it.
//
configurationProcessors.get(
SettingsXmlConfigurationProcessor.HINT ).process( cliRequest );
@@ -1288,7 +1288,7 @@ public class MavenCli
// If we're logging to a file then we don't want the console
transfer listener as it will spew
// download progress all over the place
//
-transferListener = getConsoleTransferListener();
+transferListener = getConsoleTransferListener(
cliRequest.commandLine.hasOption( CLIManager.DEBUG ) );
}
else
{
@@ -1588,9 +1588,9 @@ public class MavenCli
// Customizations available via the CLI
//
-protected TransferListener getConsoleTransferListener()
+protected TransferListener getConsoleTransferListener( boolean
printResourceNames )
{
-return new ConsoleMavenTransferListener( System.out );
+return new ConsoleMavenTransferListener( System.out,
printResourceNames );
}
protected TransferListener getBatchTransferListener()
http://git-wip-us.apache.org/repos/asf/maven/blob/7eec0ef7/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Abstr
maven git commit: [MNG-5977] Improve output readability of our MavenTransferListener implementations [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-5977 7eec0ef74 -> 5c01616b2 (forced update)
[MNG-5977] Improve output readability of our MavenTransferListener
implementations
* Applied a general decimal formatter which automatically scales file sizes
between [0,10) (one decimal digit) and [10,1000) (whole numbers) along with
proper size and time units
* The progress meter will now properly
** tell the amount of transfers along with file names (in debug mode) and
absolute progress by size
** visually seperate parallel transfers with " | "
* Optimized and reduced padding to the cases where it actually is necessary
* Padding has to be applied to every event which can succeed with progress
update
* Synchronize all calls to console to avoid race conditions where output is
terminated by a carriage return only. If no sync is done, SLF4J or
INIT/SUCCEEDED update can interleave and overwrite the progress while being
shorter as the progress itself.
* Replaced the concurrent hash map with a synchronized linked hash map to
retain order of the progress meter. It will behave now like a queue.
* Work around a rounding bug existed upto Java 7
See http://stackoverflow.com/q/22797964/696632 and Oracle's bugfix
Announcement:
http://www.oracle.com/technetwork/java/javase/8-compatibility-guide-2156366.html
Race conditions cannot be avoided if -T is employed since one does not have
access to the output stream of a SLF4J backend to synchronize on.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5c01616b
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5c01616b
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5c01616b
Branch: refs/heads/MNG-5977
Commit: 5c01616b21f52ed4d5737ca1dff1a8f141a49721
Parents: deefd93
Author: Michael Osipov
Authored: Thu Feb 18 00:28:50 2016 +0100
Committer: Michael Osipov
Committed: Sun Jan 22 22:48:34 2017 +0100
--
.../java/org/apache/maven/cli/MavenCli.java | 10 +-
.../transfer/AbstractMavenTransferListener.java | 209 +++--
.../transfer/ConsoleMavenTransferListener.java | 110 ---
.../transfer/Slf4jMavenTransferListener.java| 38 +--
.../maven/cli/transfer/FileSizeFormatTest.java | 313 +++
5 files changed, 594 insertions(+), 86 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/5c01616b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
--
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 176ce4d..2b9f099 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -1005,13 +1005,13 @@ public class MavenCli
// present supplied by the user. The rule is that we only allow the
execution of one ConfigurationProcessor.
// If there is more than one then we execute the one supplied by the
user, otherwise we execute the
// the default SettingsXmlConfigurationProcessor.
-//
+//
int userSuppliedConfigurationProcessorCount =
configurationProcessors.size() - 1;
if ( userSuppliedConfigurationProcessorCount == 0 )
{
//
-// Our settings.xml source is historically how we have configured
Maven from the CLI so we are going to
+// Our settings.xml source is historically how we have configured
Maven from the CLI so we are going to
// have to honour its existence forever. So let's run it.
//
configurationProcessors.get(
SettingsXmlConfigurationProcessor.HINT ).process( cliRequest );
@@ -1288,7 +1288,7 @@ public class MavenCli
// If we're logging to a file then we don't want the console
transfer listener as it will spew
// download progress all over the place
//
-transferListener = getConsoleTransferListener();
+transferListener = getConsoleTransferListener(
cliRequest.commandLine.hasOption( CLIManager.DEBUG ) );
}
else
{
@@ -1588,9 +1588,9 @@ public class MavenCli
// Customizations available via the CLI
//
-protected TransferListener getConsoleTransferListener()
+protected TransferListener getConsoleTransferListener( boolean
printResourceNames )
{
-return new ConsoleMavenTransferListener( System.out );
+return new ConsoleMavenTransferListener( System.out,
printResourceNames );
}
protected TransferListener getBatchTransferListener()
http://git-wip-us.apache.org/repos/asf/maven/blob/5c01616b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Abstr
maven git commit: [MNG-5977] Improve output readability of our MavenTransferListener implementations [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-5977 5c01616b2 -> 149cce7a8 (forced update)
[MNG-5977] Improve output readability of our MavenTransferListener
implementations
* Applied a general decimal formatter which automatically scales file sizes
between [0,10) (one decimal digit) and [10,1000) (whole numbers) along with
proper size and time units
* The progress meter will now properly
** tell the amount of transfers along with file names (in debug mode) and
absolute progress by size
** visually seperate parallel transfers with " | "
* Optimized and reduced padding to the cases where it actually is necessary
* Padding has to be applied to every event which can succeed with progress
update
* Synchronize all calls to console to avoid race conditions where output is
terminated by a carriage return only. If no sync is done, SLF4J or
INIT/SUCCEEDED update can interleave and overwrite the progress while being
shorter as the progress itself.
* Replaced the concurrent hash map with a synchronized linked hash map to
retain order of the progress meter. It will behave now like a queue.
* Work around a rounding bug existed upto Java 7
See http://stackoverflow.com/q/22797964/696632 and Oracle's bugfix
Announcement:
http://www.oracle.com/technetwork/java/javase/8-compatibility-guide-2156366.html
Race conditions cannot be avoided if -T is employed since one does not have
access to the output stream of a SLF4J backend to synchronize on.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/149cce7a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/149cce7a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/149cce7a
Branch: refs/heads/MNG-5977
Commit: 149cce7a867956efeaf72d527f61297bf2471b1e
Parents: deefd93
Author: Michael Osipov
Authored: Thu Feb 18 00:28:50 2016 +0100
Committer: Michael Osipov <1983-01...@gmx.net>
Committed: Mon Jan 23 11:18:15 2017 +0100
--
.../java/org/apache/maven/cli/MavenCli.java | 10 +-
.../transfer/AbstractMavenTransferListener.java | 209 +++--
.../transfer/ConsoleMavenTransferListener.java | 112 ---
.../transfer/Slf4jMavenTransferListener.java| 38 +--
.../maven/cli/transfer/FileSizeFormatTest.java | 313 +++
5 files changed, 595 insertions(+), 87 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/149cce7a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
--
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 176ce4d..2b9f099 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -1005,13 +1005,13 @@ public class MavenCli
// present supplied by the user. The rule is that we only allow the
execution of one ConfigurationProcessor.
// If there is more than one then we execute the one supplied by the
user, otherwise we execute the
// the default SettingsXmlConfigurationProcessor.
-//
+//
int userSuppliedConfigurationProcessorCount =
configurationProcessors.size() - 1;
if ( userSuppliedConfigurationProcessorCount == 0 )
{
//
-// Our settings.xml source is historically how we have configured
Maven from the CLI so we are going to
+// Our settings.xml source is historically how we have configured
Maven from the CLI so we are going to
// have to honour its existence forever. So let's run it.
//
configurationProcessors.get(
SettingsXmlConfigurationProcessor.HINT ).process( cliRequest );
@@ -1288,7 +1288,7 @@ public class MavenCli
// If we're logging to a file then we don't want the console
transfer listener as it will spew
// download progress all over the place
//
-transferListener = getConsoleTransferListener();
+transferListener = getConsoleTransferListener(
cliRequest.commandLine.hasOption( CLIManager.DEBUG ) );
}
else
{
@@ -1588,9 +1588,9 @@ public class MavenCli
// Customizations available via the CLI
//
-protected TransferListener getConsoleTransferListener()
+protected TransferListener getConsoleTransferListener( boolean
printResourceNames )
{
-return new ConsoleMavenTransferListener( System.out );
+return new ConsoleMavenTransferListener( System.out,
printResourceNames );
}
protected TransferListener getBatchTransferListener()
http://git-wip-us.apache.org/repos/asf/maven/blob/149cce7a/maven-embedder/src/main/java/org/apache/mave
maven git commit: [MNG-5977] Improve output readability of our MavenTransferListener implementations
Repository: maven
Updated Branches:
refs/heads/master deefd9342 -> 149cce7a8
[MNG-5977] Improve output readability of our MavenTransferListener
implementations
* Applied a general decimal formatter which automatically scales file sizes
between [0,10) (one decimal digit) and [10,1000) (whole numbers) along with
proper size and time units
* The progress meter will now properly
** tell the amount of transfers along with file names (in debug mode) and
absolute progress by size
** visually seperate parallel transfers with " | "
* Optimized and reduced padding to the cases where it actually is necessary
* Padding has to be applied to every event which can succeed with progress
update
* Synchronize all calls to console to avoid race conditions where output is
terminated by a carriage return only. If no sync is done, SLF4J or
INIT/SUCCEEDED update can interleave and overwrite the progress while being
shorter as the progress itself.
* Replaced the concurrent hash map with a synchronized linked hash map to
retain order of the progress meter. It will behave now like a queue.
* Work around a rounding bug existed upto Java 7
See http://stackoverflow.com/q/22797964/696632 and Oracle's bugfix
Announcement:
http://www.oracle.com/technetwork/java/javase/8-compatibility-guide-2156366.html
Race conditions cannot be avoided if -T is employed since one does not have
access to the output stream of a SLF4J backend to synchronize on.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/149cce7a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/149cce7a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/149cce7a
Branch: refs/heads/master
Commit: 149cce7a867956efeaf72d527f61297bf2471b1e
Parents: deefd93
Author: Michael Osipov
Authored: Thu Feb 18 00:28:50 2016 +0100
Committer: Michael Osipov <1983-01...@gmx.net>
Committed: Mon Jan 23 11:18:15 2017 +0100
--
.../java/org/apache/maven/cli/MavenCli.java | 10 +-
.../transfer/AbstractMavenTransferListener.java | 209 +++--
.../transfer/ConsoleMavenTransferListener.java | 112 ---
.../transfer/Slf4jMavenTransferListener.java| 38 +--
.../maven/cli/transfer/FileSizeFormatTest.java | 313 +++
5 files changed, 595 insertions(+), 87 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/149cce7a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
--
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 176ce4d..2b9f099 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -1005,13 +1005,13 @@ public class MavenCli
// present supplied by the user. The rule is that we only allow the
execution of one ConfigurationProcessor.
// If there is more than one then we execute the one supplied by the
user, otherwise we execute the
// the default SettingsXmlConfigurationProcessor.
-//
+//
int userSuppliedConfigurationProcessorCount =
configurationProcessors.size() - 1;
if ( userSuppliedConfigurationProcessorCount == 0 )
{
//
-// Our settings.xml source is historically how we have configured
Maven from the CLI so we are going to
+// Our settings.xml source is historically how we have configured
Maven from the CLI so we are going to
// have to honour its existence forever. So let's run it.
//
configurationProcessors.get(
SettingsXmlConfigurationProcessor.HINT ).process( cliRequest );
@@ -1288,7 +1288,7 @@ public class MavenCli
// If we're logging to a file then we don't want the console
transfer listener as it will spew
// download progress all over the place
//
-transferListener = getConsoleTransferListener();
+transferListener = getConsoleTransferListener(
cliRequest.commandLine.hasOption( CLIManager.DEBUG ) );
}
else
{
@@ -1588,9 +1588,9 @@ public class MavenCli
// Customizations available via the CLI
//
-protected TransferListener getConsoleTransferListener()
+protected TransferListener getConsoleTransferListener( boolean
printResourceNames )
{
-return new ConsoleMavenTransferListener( System.out );
+return new ConsoleMavenTransferListener( System.out,
printResourceNames );
}
protected TransferListener getBatchTransferListener()
http://git-wip-us.apache.org/repos/asf/maven/blob/149cce7a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Abstr
maven git commit: [MNG-6102] Introduce ${maven.conf} in m2.conf
Repository: maven
Updated Branches:
refs/heads/MNG-6102 [created] be5caccaf
[MNG-6102] Introduce ${maven.conf} in m2.conf
Set maven.conf to default ${maven.home}/conf in ${maven.home}/bin/m2.conf
to have a canonical property pointing to global configuration files from
within Java code.
This also helps package maintainers to decouple the Maven installation
from a global configuration by solely modifying m2.conf instead of using
dirty hacks, if possible at all.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/be5cacca
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/be5cacca
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/be5cacca
Branch: refs/heads/MNG-6102
Commit: be5caccaff3d00ffca4b3cefe9665b6106bc44bf
Parents: 149cce7
Author: Michael Osipov
Authored: Sun Oct 9 21:00:42 2016 +0200
Committer: Michael Osipov
Committed: Mon Jan 23 20:54:54 2017 +0100
--
apache-maven/src/bin/m2.conf | 4 +++-
apache-maven/src/conf/settings.xml | 2 +-
apache-maven/src/conf/toolchains.xml | 2 +-
.../org/apache/maven/settings/DefaultMavenSettingsBuilder.java | 2 +-
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 2 +-
.../cli/configuration/SettingsXmlConfigurationProcessor.java | 4 ++--
maven-embedder/src/site/apt/logging.apt | 2 +-
7 files changed, 10 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/bin/m2.conf
--
diff --git a/apache-maven/src/bin/m2.conf b/apache-maven/src/bin/m2.conf
index 346554c..2235f82 100644
--- a/apache-maven/src/bin/m2.conf
+++ b/apache-maven/src/bin/m2.conf
@@ -1,6 +1,8 @@
main is org.apache.maven.cli.MavenCli from plexus.core
+set maven.conf default ${maven.home}/conf
+
[plexus.core]
-load ${maven.home}/conf/logging
+load ${maven.conf}/logging
optionally ${maven.home}/lib/ext/*.jar
load ${maven.home}/lib/*.jar
http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/settings.xml
--
diff --git a/apache-maven/src/conf/settings.xml
b/apache-maven/src/conf/settings.xml
index 19d7a97..e27c579 100644
--- a/apache-maven/src/conf/settings.xml
+++ b/apache-maven/src/conf/settings.xml
@@ -32,7 +32,7 @@ under the License.
| 2. Global Level. This settings.xml file provides configuration for all
Maven
| users on a machine (assuming they're all using the same
Maven
| installation). It's normally provided in
- | ${maven.home}/conf/settings.xml.
+ | ${maven.conf}/settings.xml.
|
| NOTE: This location can be overridden with the CLI option:
|
http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/toolchains.xml
--
diff --git a/apache-maven/src/conf/toolchains.xml
b/apache-maven/src/conf/toolchains.xml
index aefddd8..b737c17 100644
--- a/apache-maven/src/conf/toolchains.xml
+++ b/apache-maven/src/conf/toolchains.xml
@@ -32,7 +32,7 @@ under the License.
| 2. Global Level. This toolchains.xml file provides configuration for all
Maven
| users on a machine (assuming they're all using the same
Maven
| installation). It's normally provided in
- | ${maven.home}/conf/toolchains.xml.
+ | ${maven.conf}/toolchains.xml.
|
| NOTE: This location can be overridden with the CLI option:
|
http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
index 820d886..207b9aa 100644
---
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
+++
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
@@ -66,7 +66,7 @@ public class DefaultMavenSettingsBuilder
throws IOException, XmlPullParserException
{
File globalSettingsFile =
-getFile( "${maven.home}/conf/settings.xml", "maven.home",
+getFile( "${maven.conf}/settings.xml", "maven.conf",
MavenSettingsBuilder.ALT_GLOBAL_SETTINGS_XML_LOCATION );
SettingsBuildingRequest request = new DefaultSettingsBuildingRequest();
h
maven git commit: [MNG-6102] Introduce ${maven.conf} in m2.conf
Repository: maven
Updated Branches:
refs/heads/master 149cce7a8 -> be5caccaf
[MNG-6102] Introduce ${maven.conf} in m2.conf
Set maven.conf to default ${maven.home}/conf in ${maven.home}/bin/m2.conf
to have a canonical property pointing to global configuration files from
within Java code.
This also helps package maintainers to decouple the Maven installation
from a global configuration by solely modifying m2.conf instead of using
dirty hacks, if possible at all.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/be5cacca
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/be5cacca
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/be5cacca
Branch: refs/heads/master
Commit: be5caccaff3d00ffca4b3cefe9665b6106bc44bf
Parents: 149cce7
Author: Michael Osipov
Authored: Sun Oct 9 21:00:42 2016 +0200
Committer: Michael Osipov
Committed: Mon Jan 23 20:54:54 2017 +0100
--
apache-maven/src/bin/m2.conf | 4 +++-
apache-maven/src/conf/settings.xml | 2 +-
apache-maven/src/conf/toolchains.xml | 2 +-
.../org/apache/maven/settings/DefaultMavenSettingsBuilder.java | 2 +-
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 2 +-
.../cli/configuration/SettingsXmlConfigurationProcessor.java | 4 ++--
maven-embedder/src/site/apt/logging.apt | 2 +-
7 files changed, 10 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/bin/m2.conf
--
diff --git a/apache-maven/src/bin/m2.conf b/apache-maven/src/bin/m2.conf
index 346554c..2235f82 100644
--- a/apache-maven/src/bin/m2.conf
+++ b/apache-maven/src/bin/m2.conf
@@ -1,6 +1,8 @@
main is org.apache.maven.cli.MavenCli from plexus.core
+set maven.conf default ${maven.home}/conf
+
[plexus.core]
-load ${maven.home}/conf/logging
+load ${maven.conf}/logging
optionally ${maven.home}/lib/ext/*.jar
load ${maven.home}/lib/*.jar
http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/settings.xml
--
diff --git a/apache-maven/src/conf/settings.xml
b/apache-maven/src/conf/settings.xml
index 19d7a97..e27c579 100644
--- a/apache-maven/src/conf/settings.xml
+++ b/apache-maven/src/conf/settings.xml
@@ -32,7 +32,7 @@ under the License.
| 2. Global Level. This settings.xml file provides configuration for all
Maven
| users on a machine (assuming they're all using the same
Maven
| installation). It's normally provided in
- | ${maven.home}/conf/settings.xml.
+ | ${maven.conf}/settings.xml.
|
| NOTE: This location can be overridden with the CLI option:
|
http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/toolchains.xml
--
diff --git a/apache-maven/src/conf/toolchains.xml
b/apache-maven/src/conf/toolchains.xml
index aefddd8..b737c17 100644
--- a/apache-maven/src/conf/toolchains.xml
+++ b/apache-maven/src/conf/toolchains.xml
@@ -32,7 +32,7 @@ under the License.
| 2. Global Level. This toolchains.xml file provides configuration for all
Maven
| users on a machine (assuming they're all using the same
Maven
| installation). It's normally provided in
- | ${maven.home}/conf/toolchains.xml.
+ | ${maven.conf}/toolchains.xml.
|
| NOTE: This location can be overridden with the CLI option:
|
http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
index 820d886..207b9aa 100644
---
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
+++
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
@@ -66,7 +66,7 @@ public class DefaultMavenSettingsBuilder
throws IOException, XmlPullParserException
{
File globalSettingsFile =
-getFile( "${maven.home}/conf/settings.xml", "maven.home",
+getFile( "${maven.conf}/settings.xml", "maven.conf",
MavenSettingsBuilder.ALT_GLOBAL_SETTINGS_XML_LOCATION );
SettingsBuildingRequest request = new DefaultSettingsBuildingRequest();
ht
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-6138 [deleted] eb43b3aa8
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-6081 [deleted] 2559f8ac2
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-5975 [deleted] aab516944
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-6106 [deleted] f8068ddd5
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-5954 [deleted] 4941e6280
maven-wagon git commit: Bump version 2.12-SNAPSHOT
Repository: maven-wagon Updated Branches: refs/heads/master 3512a321e -> 6843ead40 Bump version 2.12-SNAPSHOT Preparations for the next version, 2.11 is burned. Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/6843ead4 Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/6843ead4 Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/6843ead4 Branch: refs/heads/master Commit: 6843ead404b0e05ec97ff80b1cbea0ecc7472e45 Parents: 3512a32 Author: Michael Osipov Authored: Fri Jan 27 12:24:01 2017 +0100 Committer: Michael Osipov Committed: Fri Jan 27 12:24:01 2017 +0100 -- pom.xml | 2 +- wagon-provider-api/pom.xml | 2 +- wagon-provider-test/pom.xml | 2 +- wagon-providers/pom.xml | 2 +- wagon-providers/wagon-file/pom.xml | 2 +- wagon-providers/wagon-ftp/pom.xml | 2 +- wagon-providers/wagon-http-lightweight/pom.xml | 2 +- wagon-providers/wagon-http-shared/pom.xml | 2 +- wagon-providers/wagon-http/pom.xml | 2 +- wagon-providers/wagon-scm/pom.xml | 2 +- wagon-providers/wagon-ssh-common-test/pom.xml | 2 +- wagon-providers/wagon-ssh-common/pom.xml| 2 +- wagon-providers/wagon-ssh-external/pom.xml | 2 +- wagon-providers/wagon-ssh/pom.xml | 2 +- wagon-providers/wagon-webdav-jackrabbit/pom.xml | 2 +- wagon-tcks/pom.xml | 2 +- wagon-tcks/wagon-tck-http/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/6843ead4/pom.xml -- diff --git a/pom.xml b/pom.xml index 006fbe9..4ca8ed0 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ under the License. org.apache.maven.wagon wagon - 2.11-SNAPSHOT + 2.12-SNAPSHOT pom Apache Maven Wagon http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/6843ead4/wagon-provider-api/pom.xml -- diff --git a/wagon-provider-api/pom.xml b/wagon-provider-api/pom.xml index 30013fe..36dac7d 100644 --- a/wagon-provider-api/pom.xml +++ b/wagon-provider-api/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.wagon wagon -2.11-SNAPSHOT +2.12-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/6843ead4/wagon-provider-test/pom.xml -- diff --git a/wagon-provider-test/pom.xml b/wagon-provider-test/pom.xml index d1d6931..9b0f4e5 100644 --- a/wagon-provider-test/pom.xml +++ b/wagon-provider-test/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.wagon wagon -2.11-SNAPSHOT +2.12-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/6843ead4/wagon-providers/pom.xml -- diff --git a/wagon-providers/pom.xml b/wagon-providers/pom.xml index b94482f..ad89ccc 100644 --- a/wagon-providers/pom.xml +++ b/wagon-providers/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.wagon wagon -2.11-SNAPSHOT +2.12-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/6843ead4/wagon-providers/wagon-file/pom.xml -- diff --git a/wagon-providers/wagon-file/pom.xml b/wagon-providers/wagon-file/pom.xml index d1ef313..a96af63 100644 --- a/wagon-providers/wagon-file/pom.xml +++ b/wagon-providers/wagon-file/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.wagon wagon-providers -2.11-SNAPSHOT +2.12-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/6843ead4/wagon-providers/wagon-ftp/pom.xml -- diff --git a/wagon-providers/wagon-ftp/pom.xml b/wagon-providers/wagon-ftp/pom.xml index 8cec0c9..07a1811 100644 --- a/wagon-providers/wagon-ftp/pom.xml +++ b/wagon-providers/wagon-ftp/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.wagon wagon-providers -2.11-SNAPSHOT +2.12-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/6843ead4/wagon-providers/wagon-http-lightweight/pom.xml -- diff --git a/wagon-providers/wagon-http-lightweight/pom.xml b/wagon-providers/wagon-http-lightweight/pom.xml index 050de49..0a055b6 100644 --- a/wagon-providers/wagon-http-lightweight
maven-wagon git commit: [maven-release-plugin] prepare release wagon-2.12
Repository: maven-wagon
Updated Branches:
refs/heads/master 6843ead40 -> 0f2c8bc57
[maven-release-plugin] prepare release wagon-2.12
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/0f2c8bc5
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/0f2c8bc5
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/0f2c8bc5
Branch: refs/heads/master
Commit: 0f2c8bc57a9b3094e6566ca601bf2025dabd0fe9
Parents: 6843ead
Author: Michael Osipov
Authored: Fri Jan 27 12:51:12 2017 +0100
Committer: Michael Osipov
Committed: Fri Jan 27 12:51:12 2017 +0100
--
pom.xml | 4 ++--
wagon-provider-api/pom.xml | 2 +-
wagon-provider-test/pom.xml | 2 +-
wagon-providers/pom.xml | 2 +-
wagon-providers/wagon-file/pom.xml | 2 +-
wagon-providers/wagon-ftp/pom.xml | 2 +-
wagon-providers/wagon-http-lightweight/pom.xml | 2 +-
wagon-providers/wagon-http-shared/pom.xml | 2 +-
wagon-providers/wagon-http/pom.xml | 2 +-
wagon-providers/wagon-scm/pom.xml | 2 +-
wagon-providers/wagon-ssh-common-test/pom.xml | 2 +-
wagon-providers/wagon-ssh-common/pom.xml| 2 +-
wagon-providers/wagon-ssh-external/pom.xml | 2 +-
wagon-providers/wagon-ssh/pom.xml | 2 +-
wagon-providers/wagon-webdav-jackrabbit/pom.xml | 2 +-
wagon-tcks/pom.xml | 2 +-
wagon-tcks/wagon-tck-http/pom.xml | 2 +-
17 files changed, 18 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/0f2c8bc5/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 4ca8ed0..fe90cfc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@ under the License.
org.apache.maven.wagon
wagon
- 2.12-SNAPSHOT
+ 2.12
pom
Apache Maven Wagon
@@ -198,7 +198,7 @@ under the License.
scm:git:https://git-wip-us.apache.org/repos/asf/maven-wagon.git
scm:git:https://git-wip-us.apache.org/repos/asf/maven-wagon.git
https://github.com/apache/maven-wagon/tree/${project.scm.tag}
-master
+wagon-2.12
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/0f2c8bc5/wagon-provider-api/pom.xml
--
diff --git a/wagon-provider-api/pom.xml b/wagon-provider-api/pom.xml
index 36dac7d..f38bb55 100644
--- a/wagon-provider-api/pom.xml
+++ b/wagon-provider-api/pom.xml
@@ -23,7 +23,7 @@ under the License.
org.apache.maven.wagon
wagon
-2.12-SNAPSHOT
+2.12
../pom.xml
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/0f2c8bc5/wagon-provider-test/pom.xml
--
diff --git a/wagon-provider-test/pom.xml b/wagon-provider-test/pom.xml
index 9b0f4e5..91a9a1f 100644
--- a/wagon-provider-test/pom.xml
+++ b/wagon-provider-test/pom.xml
@@ -23,7 +23,7 @@ under the License.
org.apache.maven.wagon
wagon
-2.12-SNAPSHOT
+2.12
../pom.xml
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/0f2c8bc5/wagon-providers/pom.xml
--
diff --git a/wagon-providers/pom.xml b/wagon-providers/pom.xml
index ad89ccc..e29dd55 100644
--- a/wagon-providers/pom.xml
+++ b/wagon-providers/pom.xml
@@ -23,7 +23,7 @@ under the License.
org.apache.maven.wagon
wagon
-2.12-SNAPSHOT
+2.12
../pom.xml
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/0f2c8bc5/wagon-providers/wagon-file/pom.xml
--
diff --git a/wagon-providers/wagon-file/pom.xml
b/wagon-providers/wagon-file/pom.xml
index a96af63..08b9ce5 100644
--- a/wagon-providers/wagon-file/pom.xml
+++ b/wagon-providers/wagon-file/pom.xml
@@ -23,7 +23,7 @@ under the License.
org.apache.maven.wagon
wagon-providers
-2.12-SNAPSHOT
+2.12
../pom.xml
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/0f2c8bc5/wagon-providers/wagon-ftp/pom.xml
--
diff --git a/wagon-providers/wagon-ftp/pom.xml
b/wagon-providers/wagon-ftp/pom.xml
index 07a1811..87925ac 100644
--- a/wagon-providers/wagon-ftp/pom.xml
+++ b/wagon-providers/wagon-ftp/pom.xml
@@ -23,7 +23,7 @@ under the License.
org.apache.maven.wagon
wagon-providers
-2.12-SNAPSHOT
+2.12
../pom.xml
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/0f2c8bc5/wagon-providers/wagon-http-lightweight/pom.xml
maven-wagon git commit: [maven-release-plugin] prepare for next development iteration
Repository: maven-wagon
Updated Branches:
refs/heads/master 0f2c8bc57 -> f76c0982b
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/f76c0982
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/f76c0982
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/f76c0982
Branch: refs/heads/master
Commit: f76c0982bd2fbcd5eded8ce3fd0d15d6e02245e3
Parents: 0f2c8bc
Author: Michael Osipov
Authored: Fri Jan 27 12:51:36 2017 +0100
Committer: Michael Osipov
Committed: Fri Jan 27 12:51:36 2017 +0100
--
pom.xml | 4 ++--
wagon-provider-api/pom.xml | 2 +-
wagon-provider-test/pom.xml | 2 +-
wagon-providers/pom.xml | 2 +-
wagon-providers/wagon-file/pom.xml | 2 +-
wagon-providers/wagon-ftp/pom.xml | 2 +-
wagon-providers/wagon-http-lightweight/pom.xml | 2 +-
wagon-providers/wagon-http-shared/pom.xml | 2 +-
wagon-providers/wagon-http/pom.xml | 2 +-
wagon-providers/wagon-scm/pom.xml | 2 +-
wagon-providers/wagon-ssh-common-test/pom.xml | 2 +-
wagon-providers/wagon-ssh-common/pom.xml| 2 +-
wagon-providers/wagon-ssh-external/pom.xml | 2 +-
wagon-providers/wagon-ssh/pom.xml | 2 +-
wagon-providers/wagon-webdav-jackrabbit/pom.xml | 2 +-
wagon-tcks/pom.xml | 2 +-
wagon-tcks/wagon-tck-http/pom.xml | 2 +-
17 files changed, 18 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f76c0982/pom.xml
--
diff --git a/pom.xml b/pom.xml
index fe90cfc..0930036 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@ under the License.
org.apache.maven.wagon
wagon
- 2.12
+ 2.13-SNAPSHOT
pom
Apache Maven Wagon
@@ -198,7 +198,7 @@ under the License.
scm:git:https://git-wip-us.apache.org/repos/asf/maven-wagon.git
scm:git:https://git-wip-us.apache.org/repos/asf/maven-wagon.git
https://github.com/apache/maven-wagon/tree/${project.scm.tag}
-wagon-2.12
+master
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f76c0982/wagon-provider-api/pom.xml
--
diff --git a/wagon-provider-api/pom.xml b/wagon-provider-api/pom.xml
index f38bb55..4b2dda8 100644
--- a/wagon-provider-api/pom.xml
+++ b/wagon-provider-api/pom.xml
@@ -23,7 +23,7 @@ under the License.
org.apache.maven.wagon
wagon
-2.12
+2.13-SNAPSHOT
../pom.xml
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f76c0982/wagon-provider-test/pom.xml
--
diff --git a/wagon-provider-test/pom.xml b/wagon-provider-test/pom.xml
index 91a9a1f..c1f251c 100644
--- a/wagon-provider-test/pom.xml
+++ b/wagon-provider-test/pom.xml
@@ -23,7 +23,7 @@ under the License.
org.apache.maven.wagon
wagon
-2.12
+2.13-SNAPSHOT
../pom.xml
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f76c0982/wagon-providers/pom.xml
--
diff --git a/wagon-providers/pom.xml b/wagon-providers/pom.xml
index e29dd55..88121d8 100644
--- a/wagon-providers/pom.xml
+++ b/wagon-providers/pom.xml
@@ -23,7 +23,7 @@ under the License.
org.apache.maven.wagon
wagon
-2.12
+2.13-SNAPSHOT
../pom.xml
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f76c0982/wagon-providers/wagon-file/pom.xml
--
diff --git a/wagon-providers/wagon-file/pom.xml
b/wagon-providers/wagon-file/pom.xml
index 08b9ce5..47e4c84 100644
--- a/wagon-providers/wagon-file/pom.xml
+++ b/wagon-providers/wagon-file/pom.xml
@@ -23,7 +23,7 @@ under the License.
org.apache.maven.wagon
wagon-providers
-2.12
+2.13-SNAPSHOT
../pom.xml
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f76c0982/wagon-providers/wagon-ftp/pom.xml
--
diff --git a/wagon-providers/wagon-ftp/pom.xml
b/wagon-providers/wagon-ftp/pom.xml
index 87925ac..fb2bf74 100644
--- a/wagon-providers/wagon-ftp/pom.xml
+++ b/wagon-providers/wagon-ftp/pom.xml
@@ -23,7 +23,7 @@ under the License.
org.apache.maven.wagon
wagon-providers
-2.12
+2.13-SNAPSHOT
../pom.xml
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f76c0982/wagon-providers/wagon-http-lightweight/pom.xml
[maven-wagon] Git Push Summary
Repository: maven-wagon Updated Tags: refs/tags/wagon-2.12 [created] 14de82a8a
maven git commit: Remove non-existent m2 include in component.xml
Repository: maven Updated Branches: refs/heads/MNG-6145 [created] ab0126aef Remove non-existent m2 include in component.xml Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ab0126ae Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ab0126ae Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ab0126ae Branch: refs/heads/MNG-6145 Commit: ab0126aefca67553dae7e78a0dbb1cdd359bf171 Parents: 5b4b8bd Author: Michael Osipov Authored: Fri Oct 7 21:39:24 2016 +0200 Committer: Michael Osipov Committed: Sat Jan 28 15:22:38 2017 +0100 -- apache-maven/src/main/assembly/component.xml | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/ab0126ae/apache-maven/src/main/assembly/component.xml -- diff --git a/apache-maven/src/main/assembly/component.xml b/apache-maven/src/main/assembly/component.xml index 8ccf02a..ca4dcb6 100644 --- a/apache-maven/src/main/assembly/component.xml +++ b/apache-maven/src/main/assembly/component.xml @@ -68,7 +68,6 @@ under the License. src/bin bin -m2 mvn mvnDebug
maven git commit: [MNG-6144] DefaultWagonManagerTest#testGetMissingJarForced() passed incorrect value
Repository: maven
Updated Branches:
refs/heads/MNG-6144 [created] abb68ef52
[MNG-6144] DefaultWagonManagerTest#testGetMissingJarForced() passed incorrect
value
This closes #86
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/abb68ef5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/abb68ef5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/abb68ef5
Branch: refs/heads/MNG-6144
Commit: abb68ef525bdba492b48207cd75eefbd5485d9af
Parents: 5b4b8bd
Author: Michael Osipov
Authored: Sun Oct 16 12:27:41 2016 +0200
Committer: Michael Osipov
Committed: Sat Jan 28 15:24:14 2017 +0100
--
.../apache/maven/repository/legacy/DefaultWagonManagerTest.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/abb68ef5/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
--
diff --git
a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
index b9bcf9b..aa5dd68 100644
---
a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
+++
b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
@@ -138,7 +138,7 @@ public class DefaultWagonManagerTest
try
{
-wagonManager.getArtifact( artifact, repo, null, false );
+wagonManager.getArtifact( artifact, repo, null, true );
fail();
}
maven git commit: [MNG-6147] MetadataResolutionResult#getGraph() contains duplicate if clause
Repository: maven
Updated Branches:
refs/heads/MNG-6147 [created] 4c9b59cc3
[MNG-6147] MetadataResolutionResult#getGraph() contains duplicate if clause
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4c9b59cc
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4c9b59cc
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4c9b59cc
Branch: refs/heads/MNG-6147
Commit: 4c9b59cc387c136582e185ac4849bcb9334270a5
Parents: 5b4b8bd
Author: Michael Osipov
Authored: Sat Jan 28 15:26:52 2017 +0100
Committer: Michael Osipov
Committed: Sat Jan 28 15:26:52 2017 +0100
--
.../maven/repository/metadata/MetadataResolutionResult.java | 4
1 file changed, 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/4c9b59cc/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
--
diff --git
a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
index 1d9e9c4..814b66c 100644
---
a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
+++
b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
@@ -119,10 +119,6 @@ public class MetadataResolutionResult
{
return conflictResolver.resolveConflicts( getGraph(),
ArtifactScopeEnum.test );
}
-else if ( requestType.equals(
MetadataResolutionRequestTypeEnum.classpathRuntime ) )
-{
-return conflictResolver.resolveConflicts( getGraph(),
ArtifactScopeEnum.test );
-}
else if ( requestType.equals( MetadataResolutionRequestTypeEnum.graph
) )
{
return getGraph();
[1/2] maven git commit: [MNG-6147] MetadataResolutionResult#getGraph() contains duplicate if clause
Repository: maven
Updated Branches:
refs/heads/master 5b4b8bd94 -> f53f1547a
[MNG-6147] MetadataResolutionResult#getGraph() contains duplicate if clause
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f53f1547
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f53f1547
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f53f1547
Branch: refs/heads/master
Commit: f53f1547a16fb0f7e288de5c4684c599652ee601
Parents: 920f10a
Author: Michael Osipov
Authored: Sat Jan 28 15:26:52 2017 +0100
Committer: Michael Osipov
Committed: Sat Jan 28 17:09:30 2017 +0100
--
.../maven/repository/metadata/MetadataResolutionResult.java | 4
1 file changed, 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/f53f1547/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
--
diff --git
a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
index 1d9e9c4..814b66c 100644
---
a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
+++
b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
@@ -119,10 +119,6 @@ public class MetadataResolutionResult
{
return conflictResolver.resolveConflicts( getGraph(),
ArtifactScopeEnum.test );
}
-else if ( requestType.equals(
MetadataResolutionRequestTypeEnum.classpathRuntime ) )
-{
-return conflictResolver.resolveConflicts( getGraph(),
ArtifactScopeEnum.test );
-}
else if ( requestType.equals( MetadataResolutionRequestTypeEnum.graph
) )
{
return getGraph();
