You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2018/08/01 20:09:51 UTC
[maven-remote-resources-plugin] branch MRRESOURCES-103 updated:
fixup! [MRRESOURCES-103] Upgrade parent to 32 o Fix TLSv1.2 issues
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MRRESOURCES-103
in repository https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git
The following commit(s) were added to refs/heads/MRRESOURCES-103 by this push:
new 4fcb94e fixup! [MRRESOURCES-103] Upgrade parent to 32 o Fix TLSv1.2 issues
4fcb94e is described below
commit 4fcb94ee94ab3aebc857dac121f0ab69be379848
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Wed Aug 1 22:09:46 2018 +0200
fixup! [MRRESOURCES-103] Upgrade parent to 32 o Fix TLSv1.2 issues
---
.../apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java | 1 -
.../maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java | 1 -
.../apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java | 1 -
.../resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java | 1 -
.../apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java | 1 -
.../maven/plugin/resources/remote/it/IT_GetDependencyProjects.java | 1 -
.../maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java | 1 -
.../apache/maven/plugin/resources/remote/it/IT_SupplementalArtifact.java | 1 -
.../maven/plugin/resources/remote/it/support/BootstrapInstaller.java | 1 -
.../org/apache/maven/plugin/resources/remote/it/support/TestUtils.java | 1 +
10 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java
index 19e1fd3..e2ce70e 100644
--- a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java
+++ b/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java
@@ -43,7 +43,6 @@ public class IT_BadDependencyPoms
Verifier verifier = TestUtils.newVerifier( dir );
verifier.deleteArtifacts( "test" );
verifier.getSystemProperties().setProperty( "it.dir", dir.getAbsolutePath() );
- verifier.getSystemProperties().setProperty( "https.protocols", System.getProperty( "https.protocols" ) );
try
{
diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java
index 13327a6..c9e6fc8 100644
--- a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java
+++ b/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java
@@ -37,7 +37,6 @@ public class IT_CustomFilterDelimiter
{
File dir = TestUtils.getTestDir( "custom-filter-delim" );
Verifier verifier = TestUtils.newVerifier( dir );
- verifier.getSystemProperties().setProperty( "https.protocols", System.getProperty( "https.protocols" ) );
verifier.getCliOptions().add( "-X" );
diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java
index 0dcf60c..ff6dc84 100644
--- a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java
+++ b/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java
@@ -41,7 +41,6 @@ public class IT_GenerateFromBundle
verifier.executeGoal( "generate-resources" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.getSystemProperties().setProperty( "https.protocols", System.getProperty( "https.protocols" ) );
File output = new File( dir, "target/maven-shared-archive-resources/DEPENDENCIES" );
String content = FileUtils.fileRead( output );
diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java
index a6c7d17..8c07525 100644
--- a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java
+++ b/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java
@@ -38,7 +38,6 @@ public class IT_GenerateFromBundleWithTypeAndClassifier
File dir = TestUtils.getTestDir( "generate-from-bundle-with-type-and-classifier" );
Verifier verifier = TestUtils.newVerifier( dir );
- verifier.getSystemProperties().setProperty( "https.protocols", System.getProperty( "https.protocols" ) );
verifier.executeGoal( "generate-resources" );
verifier.verifyErrorFreeLog();
diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java
index e7ebb8b..20c7ab3 100644
--- a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java
+++ b/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java
@@ -37,7 +37,6 @@ public class IT_GenerateFromOverride
{
File dir = TestUtils.getTestDir( "generate-from-override" );
Verifier verifier = TestUtils.newVerifier( dir );
- verifier.getSystemProperties().setProperty( "https.protocols", System.getProperty( "https.protocols" ) );
verifier.executeGoal( "generate-resources" );
verifier.verifyErrorFreeLog();
diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GetDependencyProjects.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GetDependencyProjects.java
index 3ef9b5e..1cb27df 100644
--- a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GetDependencyProjects.java
+++ b/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GetDependencyProjects.java
@@ -43,7 +43,6 @@ public class IT_GetDependencyProjects
Verifier verifier;
verifier = TestUtils.newVerifier( dir );
- verifier.getSystemProperties().setProperty( "https.protocols", System.getProperty( "https.protocols" ) );
verifier.executeGoal( "deploy" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java
index f4186dd..cec6660 100644
--- a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java
+++ b/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java
@@ -43,7 +43,6 @@ public class IT_RunOnlyAtExecutionRoot
Verifier verifier;
verifier = TestUtils.newVerifier( new File( dir, "resource-projects" ) );
- verifier.getSystemProperties().setProperty( "https.protocols", System.getProperty( "https.protocols" ) );
verifier.executeGoal( "deploy" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_SupplementalArtifact.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_SupplementalArtifact.java
index da371d5..c16f074 100644
--- a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_SupplementalArtifact.java
+++ b/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_SupplementalArtifact.java
@@ -44,7 +44,6 @@ public class IT_SupplementalArtifact
Verifier verifier;
verifier = TestUtils.newVerifier( resources );
- verifier.getSystemProperties().setProperty( "https.protocols", System.getProperty( "https.protocols" ) );
verifier.deleteArtifacts( "org.apache.maven.plugin.rresource.it.mrr43" );
diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/support/BootstrapInstaller.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/support/BootstrapInstaller.java
index 0a612cd..58310f8 100644
--- a/src/test/java/org/apache/maven/plugin/resources/remote/it/support/BootstrapInstaller.java
+++ b/src/test/java/org/apache/maven/plugin/resources/remote/it/support/BootstrapInstaller.java
@@ -39,7 +39,6 @@ public class BootstrapInstaller
File bootstrapDir = TestUtils.getTestDir( "bootstrap" );
Verifier verifier = TestUtils.newVerifier( bootstrapDir );
- verifier.getSystemProperties().setProperty( "https.protocols", System.getProperty( "https.protocols", "TLSv1.2" ) );
verifier.executeGoal( "deploy" );
diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/support/TestUtils.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/support/TestUtils.java
index f43d804..7f6c7a1 100644
--- a/src/test/java/org/apache/maven/plugin/resources/remote/it/support/TestUtils.java
+++ b/src/test/java/org/apache/maven/plugin/resources/remote/it/support/TestUtils.java
@@ -62,6 +62,7 @@ public class TestUtils
{
Verifier verifier = new Verifier( dir.getAbsolutePath() );
verifier.setLocalRepo( System.getProperty( "localRepositoryPath" ) );
+ verifier.getSystemProperties().setProperty( "https.protocols", System.getProperty( "https.protocols", "TLSv1.2" ) );
return verifier;
}