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/06/21 19:09:07 UTC
[maven-remote-resources-plugin] branch MRRESOURCES-104 updated
(28549f7 -> df7948c)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MRRESOURCES-104
in repository https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git.
discard 28549f7 WIP - executeGoal will get an exception.
discard 2da18e8 WIP - Fixed.
discard b8967c0 WIP - Try to fix code.
discard a95bdbc Fixed code.
discard ed7b23c Upgraded surefire/failsafe to 2.21.0
discard 22d042b Upgraded minimum target/source for some parts cause JDK 9 does not support target 5 anymore.
discard c1def96 [MRRESOURCES-104] - Upgrade parent to 31
add ec66dac updated Modello xsd url
add 728bcef [MNGSITE-328] use sha1 checksum instead of md5
add e943606 [INFRA-16467] move components documentation out of CMS space
new b249643 [MRRESOURCES-104] - Upgrade parent to 31
new ad51204 Upgraded minimum target/source for some parts cause JDK 9 does not support target 5 anymore.
new 913ab13 Upgraded surefire/failsafe to 2.21.0
new 0a0ff07 Fixed code.
new b5d6fe7 WIP - Try to fix code.
new de8fc50 WIP - Fixed.
new df7948c WIP - executeGoal will get an exception.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (28549f7)
\
N -- N -- N refs/heads/MRRESOURCES-104 (df7948c)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
src/main/mdo/remote-resources.mdo | 4 ++--
src/main/mdo/supplemental-model.mdo | 4 ++--
src/site/xdoc/download.xml.vm | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
[maven-remote-resources-plugin] 07/07: WIP - executeGoal will get
an exception.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MRRESOURCES-104
in repository https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git
commit df7948c41c4643596c831ef0d8ed1534e3974e59
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Apr 8 00:56:17 2018 +0200
WIP - executeGoal will get an exception.
---
.../remote/it/IT_RunOnlyAtExecutionRoot.java | 28 +++++++++++++---------
1 file changed, 17 insertions(+), 11 deletions(-)
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 182841f..a91ffce 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
@@ -58,21 +58,27 @@ public class IT_RunOnlyAtExecutionRoot
// Might reconsider how to write a better testcase.
// verifier.deleteArtifacts( "org.apache.maven.plugin.rresource.it.mrr41" );
- verifier.executeGoal( "generate-resources" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ try
+ {
+ verifier.executeGoal( "generate-resources" );
+ }
+ catch ( VerificationException e )
+ {
+ verifier.resetStreams();
+
+ String depResource = "target/maven-shared-archive-resources/DEPENDENCIES";
+ File output = new File( dir, depResource );
+ assertTrue( output.exists() );
- String depResource = "target/maven-shared-archive-resources/DEPENDENCIES";
- File output = new File( dir, depResource );
- assertTrue( output.exists() );
+ assertFalse( new File( dir, "child1/" + depResource ).exists() );
+ assertFalse( new File( dir, "child2/" + depResource ).exists() );
- assertFalse( new File( dir, "child1/" + depResource ).exists() );
- assertFalse( new File( dir, "child2/" + depResource ).exists() );
+ String content = FileUtils.fileRead( output );
- String content = FileUtils.fileRead( output );
+ assertTrue( content.contains( "Dependency Id: org.apache.maven.plugin.rresource.it.mrr41:release:1.0" ) );
+ assertTrue( content.contains( "Dependency Id: org.apache.maven.plugin.rresource.it.mrr41:snapshot:1.0-SNAPSHOT" ) );
- assertTrue( content.contains( "Dependency Id: org.apache.maven.plugin.rresource.it.mrr41:release:1.0" ) );
- assertTrue( content.contains( "Dependency Id: org.apache.maven.plugin.rresource.it.mrr41:snapshot:1.0-SNAPSHOT" ) );
+ }
}
}
[maven-remote-resources-plugin] 05/07: WIP - Try to fix code.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MRRESOURCES-104
in repository https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git
commit b5d6fe74c6b1d443d322364b6df6679fdfc52377
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Apr 8 00:38:36 2018 +0200
WIP - Try to fix code.
---
src/it/resources/run-only-at-execution-root/resource-projects/pom.xml | 4 ++++
.../run-only-at-execution-root/resource-projects/snapshot/pom.xml | 4 ++++
.../maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java | 1 +
3 files changed, 9 insertions(+)
diff --git a/src/it/resources/run-only-at-execution-root/resource-projects/pom.xml b/src/it/resources/run-only-at-execution-root/resource-projects/pom.xml
index 2c52a6e..6a9ed12 100644
--- a/src/it/resources/run-only-at-execution-root/resource-projects/pom.xml
+++ b/src/it/resources/run-only-at-execution-root/resource-projects/pom.xml
@@ -35,5 +35,9 @@ under the License.
<id>it-remote</id>
<url>file:${remoteRepository}</url>
</repository>
+ <snapshotRepository>
+ <id>it-remote</id>
+ <url>file:${remoteRepository}</url>
+ </snapshotRepository>
</distributionManagement>
</project>
diff --git a/src/it/resources/run-only-at-execution-root/resource-projects/snapshot/pom.xml b/src/it/resources/run-only-at-execution-root/resource-projects/snapshot/pom.xml
index 038ff93..ae02ea7 100644
--- a/src/it/resources/run-only-at-execution-root/resource-projects/snapshot/pom.xml
+++ b/src/it/resources/run-only-at-execution-root/resource-projects/snapshot/pom.xml
@@ -39,6 +39,10 @@ under the License.
</repositories>
<distributionManagement>
+ <snapshotRepository>
+ <id>it-remote</id>
+ <url>file:${remoteRepository}</url>
+ </snapshotRepository>
<repository>
<id>it-remote</id>
<url>file:${remoteRepository}</url>
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..f35bb5e 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
@@ -45,6 +45,7 @@ public class IT_RunOnlyAtExecutionRoot
verifier = TestUtils.newVerifier( new File( dir, "resource-projects" ) );
verifier.executeGoal( "deploy" );
verifier.verifyErrorFreeLog();
+ verifier.setLogFileName( "deploy.log" );
verifier.resetStreams();
verifier = TestUtils.newVerifier( dir );
[maven-remote-resources-plugin] 03/07: Upgraded surefire/failsafe
to 2.21.0
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MRRESOURCES-104
in repository https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git
commit 913ab137a7d771fcf8fd7a45e6ac860733b05fa7
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Apr 7 22:38:18 2018 +0200
Upgraded surefire/failsafe to 2.21.0
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index aad5db3..77a6077 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,6 +71,7 @@ under the License.
</distributionManagement>
<properties>
+ <surefire.version>2.21.0</surefire.version>
<mavenVersion>2.2.1</mavenVersion>
<mavenFilteringVersion>3.1.1</mavenFilteringVersion>
<sitePluginVersion>3.3</sitePluginVersion>
[maven-remote-resources-plugin] 06/07: WIP - Fixed.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MRRESOURCES-104
in repository https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git
commit de8fc50efd9c5815c2e288ae5a762fb6f4457ec1
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Apr 8 00:47:13 2018 +0200
WIP - Fixed.
---
.../maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 f35bb5e..182841f 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,9 +43,9 @@ public class IT_RunOnlyAtExecutionRoot
Verifier verifier;
verifier = TestUtils.newVerifier( new File( dir, "resource-projects" ) );
+ verifier.setLogFileName( "deploy.log" );
verifier.executeGoal( "deploy" );
verifier.verifyErrorFreeLog();
- verifier.setLogFileName( "deploy.log" );
verifier.resetStreams();
verifier = TestUtils.newVerifier( dir );
[maven-remote-resources-plugin] 02/07: Upgraded minimum
target/source for some parts cause JDK 9 does not support target 5 anymore.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MRRESOURCES-104
in repository https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git
commit ad51204e5de90b128a312b0806c95a6bcd841410
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Apr 7 22:34:10 2018 +0200
Upgraded minimum target/source for some parts cause
JDK 9 does not support target 5 anymore.
---
.gitignore | 1 +
src/it/resources/supplemental-artifact/pom.xml | 6 +++++-
src/it/resources/supplemental-artifact/resource-projects/pom.xml | 5 +++++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index f79c928..7495d7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ out/
/bootstrap
/dependencies.xml
.java-version
+.checkstyle
diff --git a/src/it/resources/supplemental-artifact/pom.xml b/src/it/resources/supplemental-artifact/pom.xml
index b20f438..f6976ba 100644
--- a/src/it/resources/supplemental-artifact/pom.xml
+++ b/src/it/resources/supplemental-artifact/pom.xml
@@ -39,7 +39,11 @@ under the License.
<version>1</version>
</dependency>
</dependencies>
-
+
+ <properties>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ <maven.compiler.target>1.6</maven.compiler.target>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/src/it/resources/supplemental-artifact/resource-projects/pom.xml b/src/it/resources/supplemental-artifact/resource-projects/pom.xml
index a1a4dbc..7dfc7c1 100644
--- a/src/it/resources/supplemental-artifact/resource-projects/pom.xml
+++ b/src/it/resources/supplemental-artifact/resource-projects/pom.xml
@@ -24,6 +24,11 @@ under the License.
<version>1</version>
<packaging>pom</packaging>
+ <properties>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ <maven.compiler.target>1.6</maven.compiler.target>
+ </properties>
+
<modules>
<module>supplemental-models</module>
<module>deficient-dep</module>
[maven-remote-resources-plugin] 01/07: [MRRESOURCES-104] - Upgrade
parent to 31
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MRRESOURCES-104
in repository https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git
commit b2496438af0760e2b4506bf032d0053e94a4ce1a
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Mar 25 17:20:07 2018 +0200
[MRRESOURCES-104] - Upgrade parent to 31
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1d6cf69..aad5db3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>30</version>
+ <version>31</version>
<relativePath>../../pom/maven/maven-plugins/pom.xml</relativePath>
</parent>
[maven-remote-resources-plugin] 04/07: Fixed code.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MRRESOURCES-104
in repository https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git
commit 0a0ff07320887d292a532ed7ee0b03a664f37734
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Apr 8 00:22:07 2018 +0200
Fixed code.
---
.../org/apache/maven/plugin/resources/remote/it/support/TestUtils.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
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..366aa16 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
@@ -21,7 +21,6 @@ package org.apache.maven.plugin.resources.remote.it.support;
import java.io.File;
import java.io.IOException;
-import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
@@ -41,7 +40,7 @@ public class TestUtils
throw new IOException( "Cannot find test directory: " + name );
}
- return new File( new URI( resource.toExternalForm() ).normalize().getPath() );
+ return new File( resource.toURI().normalize().getPath() );
}
public static File getBaseDir()