You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2018/08/05 15:16:40 UTC
[maven-remote-resources-plugin] branch master updated:
[MRRESOURCES-103] Upgrade parent to 32
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new ec3fbb1 [MRRESOURCES-103] Upgrade parent to 32
ec3fbb1 is described below
commit ec3fbb182ac1da9adf78f1708158545c1b4ae848
Author: rfscholte <rf...@apache.org>
AuthorDate: Sun Aug 5 17:16:34 2018 +0200
[MRRESOURCES-103] Upgrade parent to 32
---
Jenkinsfile | 2 +-
pom.xml | 4 ++--
src/it/resources/it-parent/pom.xml | 8 ++++++++
.../supplemental-artifact/resource-projects/pom.xml | 16 +++++++++++++++-
.../maven/plugin/resources/remote/it/AbstractIT.java | 7 ++-----
.../plugin/resources/remote/it/IT_BadDependencyPoms.java | 5 ++++-
.../resources/remote/it/IT_CustomFilterDelimiter.java | 5 ++++-
.../resources/remote/it/IT_FilterLocalOverride.java | 5 ++++-
.../resources/remote/it/IT_GenerateFromBundle.java | 5 ++++-
.../it/IT_GenerateFromBundleWithTypeAndClassifier.java | 6 +++++-
.../resources/remote/it/IT_GenerateFromOverride.java | 7 +++++--
.../resources/remote/it/IT_GetDependencyProjects.java | 5 ++++-
.../resources/remote/it/IT_RunOnlyAtExecutionRoot.java | 14 +++++++++++++-
.../resources/remote/it/IT_SupplementalArtifact.java | 5 ++++-
.../plugin/resources/remote/it/support/TestUtils.java | 1 +
15 files changed, 76 insertions(+), 19 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 09ac70f..e9f05f7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,4 +17,4 @@
* under the License.
*/
-asfMavenTlpStdBuild()
+asfMavenTlpPlgnBuild()
diff --git a/pom.xml b/pom.xml
index 1d6cf69..e0d5852 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,8 +28,8 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>30</version>
- <relativePath>../../pom/maven/maven-plugins/pom.xml</relativePath>
+ <version>32</version>
+ <relativePath/>
</parent>
<artifactId>maven-remote-resources-plugin</artifactId>
diff --git a/src/it/resources/it-parent/pom.xml b/src/it/resources/it-parent/pom.xml
index 2e62928..6f5bca2 100644
--- a/src/it/resources/it-parent/pom.xml
+++ b/src/it/resources/it-parent/pom.xml
@@ -64,6 +64,14 @@ under the License.
<artifactId>maven-remote-resources-plugin</artifactId>
<version>${project.version}</version>
</plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
+ <configuration>
+ <source>6</source>
+ <target>6</target>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --git a/src/it/resources/supplemental-artifact/resource-projects/pom.xml b/src/it/resources/supplemental-artifact/resource-projects/pom.xml
index a1a4dbc..2080111 100644
--- a/src/it/resources/supplemental-artifact/resource-projects/pom.xml
+++ b/src/it/resources/supplemental-artifact/resource-projects/pom.xml
@@ -28,7 +28,21 @@ under the License.
<module>supplemental-models</module>
<module>deficient-dep</module>
</modules>
-
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
+ <configuration>
+ <source>6</source>
+ <target>6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
<distributionManagement>
<repository>
<id>it-remote</id>
diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/AbstractIT.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/AbstractIT.java
index ada2bb6..814ba12 100644
--- a/src/test/java/org/apache/maven/plugin/resources/remote/it/AbstractIT.java
+++ b/src/test/java/org/apache/maven/plugin/resources/remote/it/AbstractIT.java
@@ -20,17 +20,14 @@ package org.apache.maven.plugin.resources.remote.it;
*/
import org.apache.maven.plugin.resources.remote.it.support.BootstrapInstaller;
-
-import junit.framework.TestCase;
+import org.junit.Before;
public abstract class AbstractIT
- extends TestCase
{
+ @Before
public void setUp()
throws Exception
{
BootstrapInstaller.install();
-
- super.setUp();
}
}
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 e2ce70e..1342825 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
@@ -19,10 +19,13 @@ package org.apache.maven.plugin.resources.remote.it;
* under the License.
*/
+import static org.junit.Assert.assertTrue;
+
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
import org.codehaus.plexus.util.FileUtils;
+import org.junit.Test;
import java.io.File;
import java.io.IOException;
@@ -34,7 +37,7 @@ import java.net.URISyntaxException;
public class IT_BadDependencyPoms
extends AbstractIT
{
-
+ @Test
public void test()
throws IOException, URISyntaxException, VerificationException
{
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 c9e6fc8..6c017c7 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
@@ -19,10 +19,13 @@ package org.apache.maven.plugin.resources.remote.it;
* under the License.
*/
+import static org.junit.Assert.assertTrue;
+
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
import org.codehaus.plexus.util.FileUtils;
+import org.junit.Test;
import java.io.File;
import java.io.IOException;
@@ -31,7 +34,7 @@ import java.net.URISyntaxException;
public class IT_CustomFilterDelimiter
extends AbstractIT
{
-
+ @Test
public void test()
throws IOException, URISyntaxException, VerificationException
{
diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java
index 1fe2a17..ea3c535 100644
--- a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java
+++ b/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java
@@ -19,10 +19,13 @@ package org.apache.maven.plugin.resources.remote.it;
* under the License.
*/
+import static org.junit.Assert.assertTrue;
+
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
import org.codehaus.plexus.util.FileUtils;
+import org.junit.Test;
import java.io.File;
import java.io.IOException;
@@ -31,7 +34,7 @@ import java.net.URISyntaxException;
public class IT_FilterLocalOverride
extends AbstractIT
{
-
+ @Test
public void test()
throws IOException, URISyntaxException, VerificationException
{
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 ff6dc84..325ba89 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
@@ -19,10 +19,13 @@ package org.apache.maven.plugin.resources.remote.it;
* under the License.
*/
+import static org.junit.Assert.assertTrue;
+
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
import org.codehaus.plexus.util.FileUtils;
+import org.junit.Test;
import java.io.File;
import java.io.IOException;
@@ -31,7 +34,7 @@ import java.net.URISyntaxException;
public class IT_GenerateFromBundle
extends AbstractIT
{
-
+ @Test
public void test()
throws IOException, URISyntaxException, VerificationException
{
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 591ab1b..b6b3fca 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
@@ -19,10 +19,13 @@ package org.apache.maven.plugin.resources.remote.it;
* under the License.
*/
+import static org.junit.Assert.assertTrue;
+
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
import org.codehaus.plexus.util.FileUtils;
+import org.junit.Test;
import java.io.File;
import java.io.IOException;
@@ -31,10 +34,11 @@ import java.net.URISyntaxException;
public class IT_GenerateFromBundleWithTypeAndClassifier
extends AbstractIT
{
-
+ @Test
public void test()
throws IOException, URISyntaxException, VerificationException
{
+
File dir = TestUtils.getTestDir( "generate-from-bundle-with-type-and-classifier" );
Verifier verifier = TestUtils.newVerifier( dir );
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 75800b6..30ae904 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
@@ -19,10 +19,13 @@ package org.apache.maven.plugin.resources.remote.it;
* under the License.
*/
+import static org.junit.Assert.assertTrue;
+
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
import org.codehaus.plexus.util.FileUtils;
+import org.junit.Test;
import java.io.File;
import java.io.IOException;
@@ -31,13 +34,13 @@ import java.net.URISyntaxException;
public class IT_GenerateFromOverride
extends AbstractIT
{
-
+ @Test
public void test()
throws IOException, URISyntaxException, VerificationException
{
File dir = TestUtils.getTestDir( "generate-from-override" );
Verifier verifier = TestUtils.newVerifier( dir );
-
+
verifier.executeGoal( "generate-resources" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
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 1cb27df..09e15ba 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
@@ -19,10 +19,13 @@ package org.apache.maven.plugin.resources.remote.it;
* under the License.
*/
+import static org.junit.Assert.assertTrue;
+
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
import org.codehaus.plexus.util.FileUtils;
+import org.junit.Test;
import java.io.File;
import java.io.IOException;
@@ -34,7 +37,7 @@ import java.net.URISyntaxException;
public class IT_GetDependencyProjects
extends AbstractIT
{
-
+ @Test
public void test()
throws IOException, URISyntaxException, VerificationException
{
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 cec6660..c092bad 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
@@ -19,10 +19,16 @@ package org.apache.maven.plugin.resources.remote.it;
* under the License.
*/
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.Os;
+import org.junit.Test;
import java.io.File;
import java.io.IOException;
@@ -34,16 +40,21 @@ import java.net.URISyntaxException;
public class IT_RunOnlyAtExecutionRoot
extends AbstractIT
{
-
+ @Test
public void test()
throws IOException, URISyntaxException, VerificationException
{
+ // Workaround for Windows + Maven-3.5.x + Jenkins due to MNG-6261
+ assumeTrue( !(System.getenv( "JENKINS_HOME" ) != null && Os.isFamily( Os.FAMILY_WINDOWS ) && System.getenv( "MAVEN_HOME" ).contains( "-3.5." ) ) );
+
File dir = TestUtils.getTestDir( "run-only-at-execution-root" );
Verifier verifier;
verifier = TestUtils.newVerifier( new File( dir, "resource-projects" ) );
verifier.executeGoal( "deploy" );
+ verifier.setLogFileName( "first.log" );
+ verifier.displayStreamBuffers();
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -58,6 +69,7 @@ public class IT_RunOnlyAtExecutionRoot
// verifier.deleteArtifacts( "org.apache.maven.plugin.rresource.it.mrr41" );
verifier.executeGoal( "generate-resources" );
+ verifier.displayStreamBuffers();
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 c16f074..94078a7 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
@@ -19,10 +19,13 @@ package org.apache.maven.plugin.resources.remote.it;
* under the License.
*/
+import static org.junit.Assert.assertTrue;
+
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
import org.codehaus.plexus.util.FileUtils;
+import org.junit.Test;
import java.io.File;
import java.io.IOException;
@@ -34,7 +37,7 @@ import java.net.URISyntaxException;
public class IT_SupplementalArtifact
extends AbstractIT
{
-
+ @Test
public void test()
throws IOException, URISyntaxException, VerificationException
{
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;
}