[maven-jar-plugin] branch master updated (78c9ab7 -> 5868117)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git. from 78c9ab7 moved to git add 4d5bdd8 [MJAR-243] - maven-archiver 3.1.1 to 3.2.0 o Based on the update we have to life JDK version to 7 o Needed also to update plexus-archiver and plexus-utilsto keep them in sync based on the transitive dependencies. o Bumped version to 3.1.0 add 5868117 [MJAR-243] - maven-archiver 3.1.1 to 3.2.0 o Based on the update we have to life JDK version to 7 o Needed also to update plexus-archiver and plexus-utilsto keep them in sync based on the transitive dependencies. o Bumped version to 3.1.0 No new revisions were added by this update. Summary of changes: pom.xml | 46 -- 1 file changed, 28 insertions(+), 18 deletions(-) -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" '].
[maven-jar-plugin] 01/02: [MJAR-243] - maven-archiver 3.1.1 to 3.2.0 o Based on the update we have to life JDK version to 7 o Needed also to update plexus-archiver and plexus-utils to keep them in syn
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MJAR-243 in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git commit 4d5bdd86004b529d307df8ad1537d6c5b289fc70 Author: Karl Heinz Marbaise AuthorDate: Fri Dec 22 20:26:50 2017 +0100 [MJAR-243] - maven-archiver 3.1.1 to 3.2.0 o Based on the update we have to life JDK version to 7 o Needed also to update plexus-archiver and plexus-utils to keep them in sync based on the transitive dependencies. o Bumped version to 3.1.0 --- pom.xml | 46 -- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index c78fabe..772bfdc 100644 --- a/pom.xml +++ b/pom.xml @@ -1,25 +1,28 @@ -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 @@ -30,7 +33,7 @@ under the License. maven-jar-plugin - 3.0.3-SNAPSHOT + 3.1.0-SNAPSHOT maven-plugin Apache Maven JAR Plugin @@ -75,8 +78,10 @@ under the License. -3.1.1 +3.2.0 3.0 +1.7 +1.7 @@ -106,15 +111,20 @@ under the License. maven-plugin-annotations provided + org.codehaus.plexus plexus-archiver - 3.4 + 3.5 org.codehaus.plexus plexus-utils - 3.0.24 + 3.1.0 junit -- To stop receiving notification emails like this one, please contact "commits@maven.apache.org" .
[maven-jar-plugin] 02/02: [MJAR-243] - maven-archiver 3.1.1 to 3.2.0 o Based on the update we have to life JDK version to 7 o Needed also to update plexus-archiver and plexus-utils to keep them in syn
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MJAR-243 in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git commit 5868117fc3a466ce0fbbb633b4f556ebe86ecb22 Author: Karl Heinz Marbaise AuthorDate: Fri Dec 22 20:26:50 2017 +0100 [MJAR-243] - maven-archiver 3.1.1 to 3.2.0 o Based on the update we have to life JDK version to 7 o Needed also to update plexus-archiver and plexus-utils to keep them in sync based on the transitive dependencies. o Bumped version to 3.1.0 -- To stop receiving notification emails like this one, please contact "commits@maven.apache.org" .
[maven-jar-plugin] branch MJAR-243 created (now 5868117)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MJAR-243 in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git. at 5868117 [MJAR-243] - maven-archiver 3.1.1 to 3.2.0 o Based on the update we have to life JDK version to 7 o Needed also to update plexus-archiver and plexus-utilsto keep them in sync based on the transitive dependencies. o Bumped version to 3.1.0 This branch includes the following new commits: new 4d5bdd8 [MJAR-243] - maven-archiver 3.1.1 to 3.2.0 o Based on the update we have to life JDK version to 7 o Needed also to update plexus-archiver and plexus-utilsto keep them in sync based on the transitive dependencies. o Bumped version to 3.1.0 new 5868117 [MJAR-243] - maven-archiver 3.1.1 to 3.2.0 o Based on the update we have to life JDK version to 7 o Needed also to update plexus-archiver and plexus-utilsto keep them in sync based on the transitive dependencies. o Bumped version to 3.1.0 The 2 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. -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" '].
[maven-install-plugin] branch master updated: [MINSTALL-141] - plexus-utils 3.0.24 to 3.1.0
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-install-plugin.git The following commit(s) were added to refs/heads/master by this push: new bf0c8b3 [MINSTALL-141] - plexus-utils 3.0.24 to 3.1.0 bf0c8b3 is described below commit bf0c8b3e19e29f70cd815da93f7cfce649553373 Author: Karl Heinz Marbaise AuthorDate: Fri Dec 22 19:32:32 2017 +0100 [MINSTALL-141] - plexus-utils 3.0.24 to 3.1.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c8e9005..6c6d1a5 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ org.codehaus.plexus plexus-utils - 3.0.24 + 3.1.0 -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" '].
[maven-install-plugin] branch master updated: [MINSTALL-140] - maven-shared-utils 3.1.0 to 3.2.0
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-install-plugin.git The following commit(s) were added to refs/heads/master by this push: new e6bc3bb [MINSTALL-140] - maven-shared-utils 3.1.0 to 3.2.0 e6bc3bb is described below commit e6bc3bbdae9ed5c25999dbb00e4dea95d2812bd5 Author: Karl Heinz Marbaise AuthorDate: Fri Dec 22 19:28:39 2017 +0100 [MINSTALL-140] - maven-shared-utils 3.1.0 to 3.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1e6927a..c8e9005 100644 --- a/pom.xml +++ b/pom.xml @@ -143,7 +143,7 @@ org.apache.maven.shared maven-shared-utils - 3.1.0 + 3.2.0 org.codehaus.plexus -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" '].
maven git commit: added space around packaging
Repository: maven Updated Branches: refs/heads/MNG-6308_display_packaging 899f45252 -> 8882a18a6 added space around packaging Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8882a18a Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8882a18a Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8882a18a Branch: refs/heads/MNG-6308_display_packaging Commit: 8882a18a6c97e613df5208722024096060e7dad5 Parents: 899f452 Author: Hervé Boutemy Authored: Fri Dec 22 16:19:49 2017 +0100 Committer: Hervé Boutemy Committed: Fri Dec 22 16:19:49 2017 +0100 -- .../org/apache/maven/cli/event/ExecutionEventLogger.java | 8 .../org/apache/maven/cli/event/ExecutionEventLoggerTest.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/8882a18a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java -- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java index 5378f1a..85760e6 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java @@ -304,10 +304,10 @@ public class ExecutionEventLogger infoMain( building + ( ( pad > 0 ) ? chars( ' ', pad ) : "" ) + progress ); } -// --[packaging]-- -prefix = chars( '-', Math.max( 0, ( LINE_LENGTH - project.getPackaging().length() - 2 ) / 2 ) ); -suffix = chars( '-', Math.max( 0, LINE_LENGTH - project.getPackaging().length() - 2 - prefix.length() ) ); -infoMain( prefix + '[' + project.getPackaging() + ']' + suffix ); +// --[ packaging ]-- +prefix = chars( '-', Math.max( 0, ( LINE_LENGTH - project.getPackaging().length() - 4 ) / 2 ) ); +suffix = chars( '-', Math.max( 0, LINE_LENGTH - project.getPackaging().length() - 4 - prefix.length() ) ); +infoMain( prefix + "[ " + project.getPackaging() + " ]" + suffix ); } } http://git-wip-us.apache.org/repos/asf/maven/blob/8882a18a/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java -- diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java index e6d4e5a..ca4c8a4 100644 --- a/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java +++ b/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java @@ -73,7 +73,7 @@ public class ExecutionEventLoggerTest inOrder.verify( logger ).info( "" ); inOrder.verify( logger ).info( "--< org.apache.maven:maven-embedder >---" ); inOrder.verify( logger ).info( "Building Apache Maven Embedder 3.5.4-SNAPSHOT" ); -inOrder.verify( logger ).info( "-[jar]--" ); +inOrder.verify( logger ).info( "[ jar ]-" ); } @Test @@ -101,6 +101,6 @@ public class ExecutionEventLoggerTest inOrder.verify( logger ).info( "" ); inOrder.verify( logger ).info( "--< org.apache.maven.plugins.overflow:maven-project-info-reports-plugin >--" ); inOrder.verify( logger ).info( "Building Apache Maven Project Info Reports Plugin 3.0.0-SNAPSHOT" ); -inOrder.verify( logger ).info( "-[maven-plugin]-" ); +inOrder.verify( logger ).info( "[ maven-plugin ]" ); } }
maven-integration-testing git commit: [MNG-6308] make IT more tolerant on format change
Repository: maven-integration-testing
Updated Branches:
refs/heads/master 31895fecc -> 11806ae81
[MNG-6308] make IT more tolerant on format change
Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit:
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/11806ae8
Tree:
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/11806ae8
Diff:
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/11806ae8
Branch: refs/heads/master
Commit: 11806ae81f7b76c23e6cda8f3057e1bd283ea1c8
Parents: 31895fe
Author: Hervé Boutemy
Authored: Fri Dec 22 16:06:35 2017 +0100
Committer: Hervé Boutemy
Committed: Fri Dec 22 16:11:21 2017 +0100
--
.../apache/maven/it/MavenITmng6057CheckReactorOrderTest.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/11806ae8/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java
--
diff --git
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java
index 13a009c..1cc5f13 100644
---
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java
+++
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java
@@ -69,9 +69,9 @@ public class MavenITmng6057CheckReactorOrderTest
assertEquals( 3, resultingLines.size() );
// We expect those lines in the following exact order.
-assertEquals( "[INFO] base-project", resultingLines.get( 0 ) );
-assertEquals( "[INFO] module-1", resultingLines.get( 1 ) );
-assertEquals( "[INFO] module-2", resultingLines.get( 2 ) );
+assertTrue( resultingLines.get( 0 ).startsWith( "[INFO] base-project"
) );
+assertTrue( resultingLines.get( 1 ).startsWith( "[INFO] module-1" ) );
+assertTrue( resultingLines.get( 2 ).startsWith( "[INFO] module-2" ) );
}
/**
@@ -94,7 +94,7 @@ public class MavenITmng6057CheckReactorOrderTest
{
if ( start )
{
-if ( line.startsWith( "[INFO] " ) )
+if ( line.startsWith( "[INFO] -" ) )
{
start = false;
}
maven git commit: [MNG-6308] split groupId/artifactId in header and packaging in footer
Repository: maven Updated Branches: refs/heads/MNG-6308_display_packaging bfe51a99e -> 899f45252 [MNG-6308] split groupId/artifactId in header and packaging in footer Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/899f4525 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/899f4525 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/899f4525 Branch: refs/heads/MNG-6308_display_packaging Commit: 899f452522ab811872e09d2f863b3b05d58ae173 Parents: bfe51a9 Author: Hervé Boutemy Authored: Fri Dec 22 15:27:04 2017 +0100 Committer: Hervé Boutemy Committed: Fri Dec 22 15:27:04 2017 +0100 -- .../maven/cli/event/ExecutionEventLogger.java | 31 ++-- .../cli/event/ExecutionEventLoggerTest.java | 10 +++ 2 files changed, 20 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/899f4525/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java -- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java index 8ea3585..5378f1a 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java @@ -267,26 +267,22 @@ public class ExecutionEventLogger logger.info( "" ); -StringBuilder projectKey = new StringBuilder(); -projectKey.append( project.getGroupId() ) -.append( ':' ) -.append( project.getArtifactId() ) -.append( ':' ) -.append( project.getPackaging() ); +// ---< groupId:artifactId >--- +String projectKey = project.getGroupId() + ':' + project.getArtifactId(); -final String preHeader = "-< "; -final String postHeader = " >-"; - -String prefix = -chars( '-', - Math.max( 0, ( LINE_LENGTH - projectKey.length() - preHeader.length() - postHeader.length() ) - / 2 ) ) -+ preHeader; +final String preHeader = "--< "; +final String postHeader = " >--"; + +final int headerLen = preHeader.length() + projectKey.length() + postHeader.length(); + +String prefix = chars( '-', Math.max( 0, ( LINE_LENGTH - headerLen ) / 2 ) ) + preHeader; + String suffix = postHeader -+ chars( '-', Math.max( 0, LINE_LENGTH - projectKey.length() - prefix.length() - preHeader.length() ) ); ++ chars( '-', Math.max( 0, LINE_LENGTH - headerLen - prefix.length() + preHeader.length() ) ); logger.info( buffer().strong( prefix ).project( projectKey ).strong( suffix ).toString() ); +// Building Project Name Version[i/n] String building = "Building " + event.getProject().getName() + " " + event.getProject().getVersion(); if ( totalProjects <= 1 ) @@ -308,7 +304,10 @@ public class ExecutionEventLogger infoMain( building + ( ( pad > 0 ) ? chars( ' ', pad ) : "" ) + progress ); } -infoMain( chars( '-', LINE_LENGTH ) ); +// --[packaging]-- +prefix = chars( '-', Math.max( 0, ( LINE_LENGTH - project.getPackaging().length() - 2 ) / 2 ) ); +suffix = chars( '-', Math.max( 0, LINE_LENGTH - project.getPackaging().length() - 2 - prefix.length() ) ); +infoMain( prefix + '[' + project.getPackaging() + ']' + suffix ); } } http://git-wip-us.apache.org/repos/asf/maven/blob/899f4525/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java -- diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java index 662a8cc..e6d4e5a 100644 --- a/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java +++ b/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java @@ -71,9 +71,9 @@ public class ExecutionEventLoggerTest // verify InOrder inOrder = inOrder( logger ); inOrder.verify( logger ).info( "" ); -inOrder.verify( logger ).info( "< org.apache.maven:maven-embedder:jar >-" ); +inOrder.verify( logger ).info( "--< org.apache.maven:maven-embedder >--
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-6300_ProjectArtifactsCache-bug [deleted] 0ef66d201
maven git commit: [MNG-6300] Multi module release creates empty directories in war file instead of jars
Repository: maven
Updated Branches:
refs/heads/master eee06f7d7 -> 98af937bc
[MNG-6300] Multi module release creates empty directories in war file instead
of jars
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/98af937b
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/98af937b
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/98af937b
Branch: refs/heads/master
Commit: 98af937bc6298e82e489b5f0cd3fb0a1c3d37109
Parents: eee06f7
Author: rfscholte
Authored: Fri Dec 22 14:25:46 2017 +0100
Committer: rfscholte
Committed: Fri Dec 22 14:25:46 2017 +0100
--
.../java/org/apache/maven/RepositoryUtils.java | 69 +
.../internal/LifecycleDependencyResolver.java | 36 ++-
.../org/apache/maven/plugin/CacheUtils.java | 68 -
.../plugin/DefaultPluginArtifactsCache.java | 32 +--
.../plugin/DefaultPluginDescriptorCache.java| 7 +-
.../maven/plugin/DefaultPluginRealmCache.java | 36 ++-
.../plugin/DefaultProjectArtifactsCache.java| 256 ---
.../maven/plugin/ProjectArtifactsCache.java | 90 ---
.../artifact/DefaultProjectArtifactsCache.java | 246 ++
.../project/artifact/ProjectArtifactsCache.java | 90 +++
.../AbstractCoreMavenComponentTestCase.java | 30 ++-
.../LifecycleDependencyResolverTest.java| 90 +++
.../lifecycle-dependency-resolver/lib/pom.xml | 32 +++
.../lifecycle-dependency-resolver/pom.xml | 58 +
.../lifecycle-dependency-resolver/war/pom.xml | 53
15 files changed, 723 insertions(+), 470 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/98af937b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
--
diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
index 52442b7..00f1327 100644
--- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
@@ -22,14 +22,17 @@ package org.apache.maven;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.artifact.ArtifactProperties;
import org.eclipse.aether.artifact.ArtifactType;
@@ -44,6 +47,8 @@ import org.eclipse.aether.repository.Authentication;
import org.eclipse.aether.repository.Proxy;
import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.repository.RepositoryPolicy;
+import org.eclipse.aether.repository.WorkspaceReader;
+import org.eclipse.aether.repository.WorkspaceRepository;
import org.eclipse.aether.util.repository.AuthenticationBuilder;
/**
@@ -364,4 +369,68 @@ public class RepositoryUtils
}
return artifacts;
}
+
+public static WorkspaceRepository getWorkspace( RepositorySystemSession
session )
+{
+WorkspaceReader reader = session.getWorkspaceReader();
+return ( reader != null ) ? reader.getRepository() : null;
+}
+
+public static boolean repositoriesEquals( List r1,
List r2 )
+{
+if ( r1.size() != r2.size() )
+{
+return false;
+}
+
+for ( Iterator it1 = r1.iterator(), it2 =
r2.iterator(); it1.hasNext(); )
+{
+if ( !repositoryEquals( it1.next(), it2.next() ) )
+{
+return false;
+}
+}
+
+return true;
+}
+
+public static int repositoriesHashCode( List
repositories )
+{
+int result = 17;
+for ( RemoteRepository repository : repositories )
+{
+result = 31 * result + repositoryHashCode( repository );
+}
+return result;
+}
+
+private static int repositoryHashCode( RemoteRepository repository )
+{
+int result = 17;
+Object obj = repository.getUrl();
+result = 31 * result + ( obj != null ? obj.hashCode() : 0 );
+return result;
+}
+
+private static boolean policyEquals( RepositoryPolicy p1, RepositoryPolicy
p2 )
+{
+if ( p1 == p2 )
+{
+return true;
+}
+// update policy doesn't affect contents
+
[maven-pdf-plugin] branch master updated: removed obsolete explanations about old issues with plugins
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git The following commit(s) were added to refs/heads/master by this push: new 5170b6d removed obsolete explanations about old issues with plugins 5170b6d is described below commit 5170b6d83fa06701c520fd13e8cbbdce8c684461 Author: Hervé Boutemy AuthorDate: Fri Dec 22 12:31:18 2017 +0100 removed obsolete explanations about old issues with plugins --- src/site/xdoc/examples/configuring-reports.xml.vm | 332 -- 1 file changed, 332 deletions(-) diff --git a/src/site/xdoc/examples/configuring-reports.xml.vm b/src/site/xdoc/examples/configuring-reports.xml.vm index 1fcfbd1..ad922e7 100644 --- a/src/site/xdoc/examples/configuring-reports.xml.vm +++ b/src/site/xdoc/examples/configuring-reports.xml.vm @@ -31,11 +31,6 @@ under the License. -Note for Maven 3 users: due to the changes in the reporting API, -report inclusion does not work with Maven 3. -See https://issues.apache.org/jira/browse/MPDF-41";>MPDF-41. - - Since version 1.1, all Maven reports will be included by default in the generated PDF. You should configure thesection of your POM similar than the site plugin @@ -136,333 +131,6 @@ under the License. ]]> - - - - The Maven Project supports several reporting plugins. - Unfortunately, some releases reporting plugins have known issues with the PDF plugin, mainly due to - a wrong use of the - Sink object - in their implementation. - - - The following tables show reporting plugins which have been tested with the PDF plugin. The failed plugins - have been fixed and deployed on - https://repository.apache.org/content/repositories/snapshots";>https://repository.apache.org/content/repositories/snapshots, - so you will be able to use them. - - - - Note: fixing these reporting plugins is a work in progress. If you used a SNAPSHOT plugin which - fails with the PDF plugin, you should fill a bug report in our issue tracker. - - -maven-changelog-plugin - - -Reports -Release (2.1) -Snapshot (2.2-SNAPSHOT) - - - -changelog:changelog - - - - - -changelog:dev-activity - - - - - -changelog:file-activity - - - - - -maven-changes-plugin - - -Reports -Release (2.1) -Snapshot (2.2-SNAPSHOT) - - - -changes:changes-report - - - - - -changes:jira-report - - - - - -changes:trac-report - - - - - -maven-checkstyle-plugin - - Note: could take a lot of time. - - - -Reports -Release (2.3) -Snapshot (2.4-SNAPSHOT) - - - -checkstyle:checkstyle - - - - - -maven-dependency-plugin - - -Reports -Release (2.1) -Snapshot (2.2-SNAPSHOT) - - - -dependency:analyze-report - - - - - -maven-plugin-plugin - - -Reports -Release (2.5) -Snapshot (2.5.1-SNAPSHOT) - - - -plugin:report - - - - - -maven-pmd-plugin - - -Reports -Release (2.4) -Snapshot (2.5-SNAPSHOT) - - - -pmd:cpd - - - - - -pmd:pmd - - - - - -maven-project-info-reports-plugin - - Note: dependencies report could take a lot of time. - - - -Reports -Release (2.1.2) -Snapshot (2.2-SNAPSHOT) - - - -project-info-reports:cim - - - - - -project-info-reports:dependencies - - - - - -project-info-reports:dependency-convergence - - - - - -project-info-reports:dependency-management - - - - - -pr
svn commit: r1819030 - in /maven/skins/trunk: maven-default-skin/MOVED_TO_GIT maven-fluido-skin/MOVED_TO_GIT
Author: hboutemy Date: Fri Dec 22 11:28:08 2017 New Revision: 1819030 URL: http://svn.apache.org/viewvc?rev=1819030&view=rev Log: added new gitbox and github git repo urls Modified: maven/skins/trunk/maven-default-skin/MOVED_TO_GIT maven/skins/trunk/maven-fluido-skin/MOVED_TO_GIT Modified: maven/skins/trunk/maven-default-skin/MOVED_TO_GIT URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-default-skin/MOVED_TO_GIT?rev=1819030&r1=1819029&r2=1819030&view=diff == --- maven/skins/trunk/maven-default-skin/MOVED_TO_GIT (original) +++ maven/skins/trunk/maven-default-skin/MOVED_TO_GIT Fri Dec 22 11:28:08 2017 @@ -1 +1,3 @@ https://gitbox.apache.org/repos/asf/maven-default-skin.git +see https://gitbox.apache.org/repos/asf/maven-default-skin.git +or https://github.com/apache/maven-default-skin Modified: maven/skins/trunk/maven-fluido-skin/MOVED_TO_GIT URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/MOVED_TO_GIT?rev=1819030&r1=1819029&r2=1819030&view=diff == --- maven/skins/trunk/maven-fluido-skin/MOVED_TO_GIT (original) +++ maven/skins/trunk/maven-fluido-skin/MOVED_TO_GIT Fri Dec 22 11:28:08 2017 @@ -1 +1,3 @@ https://gitbox.apache.org/repos/asf/maven-fluido-skin.git +see https://gitbox.apache.org/repos/asf/maven-fluido-skin.git +or https://github.com/apache/maven-fluido-skin
svn commit: r1819029 - in /maven/shared/trunk: file-management/ maven-archiver/ maven-artifact-resolver/ maven-artifact-transfer/ maven-common-artifact-filters/ maven-dependency-analyzer/ maven-depend
Author: hboutemy Date: Fri Dec 22 11:27:19 2017 New Revision: 1819029 URL: http://svn.apache.org/viewvc?rev=1819029&view=rev Log: added new gitbox and github git repo urls Modified: maven/shared/trunk/file-management/MOVED_TO_GIT maven/shared/trunk/maven-archiver/MOVED_TO_GIT maven/shared/trunk/maven-artifact-resolver/MOVED_TO_GIT maven/shared/trunk/maven-artifact-transfer/MOVED_TO_GIT maven/shared/trunk/maven-common-artifact-filters/MOVED_TO_GIT maven/shared/trunk/maven-dependency-analyzer/MOVED_TO_GIT maven/shared/trunk/maven-dependency-tree/MOVED_TO_GIT maven/shared/trunk/maven-downloader/MOVED_TO_GIT maven/shared/trunk/maven-filtering/MOVED_TO_GIT maven/shared/trunk/maven-invoker/MOVED_TO_GIT maven/shared/trunk/maven-jarsigner/MOVED_TO_GIT maven/shared/trunk/maven-mapping/MOVED_TO_GIT maven/shared/trunk/maven-osgi/MOVED_TO_GIT maven/shared/trunk/maven-project-utils/MOVED_TO_GIT maven/shared/trunk/maven-reporting-api/MOVED_TO_GIT maven/shared/trunk/maven-reporting-exec/MOVED_TO_GIT maven/shared/trunk/maven-reporting-impl/MOVED_TO_GIT maven/shared/trunk/maven-repository-builder/MOVED_TO_GIT maven/shared/trunk/maven-runtime/MOVED_TO_GIT maven/shared/trunk/maven-script-interpreter/MOVED_TO_GIT maven/shared/trunk/maven-shared-incremental/MOVED_TO_GIT maven/shared/trunk/maven-shared-io/MOVED_TO_GIT maven/shared/trunk/maven-shared-jar/MOVED_TO_GIT maven/shared/trunk/maven-shared-resources/MOVED_TO_GIT maven/shared/trunk/maven-shared-utils/MOVED_TO_GIT maven/shared/trunk/maven-verifier/MOVED_TO_GIT Modified: maven/shared/trunk/file-management/MOVED_TO_GIT URL: http://svn.apache.org/viewvc/maven/shared/trunk/file-management/MOVED_TO_GIT?rev=1819029&r1=1819028&r2=1819029&view=diff == --- maven/shared/trunk/file-management/MOVED_TO_GIT (original) +++ maven/shared/trunk/file-management/MOVED_TO_GIT Fri Dec 22 11:27:19 2017 @@ -1 +1,3 @@ repo moved to gitbox +see https://gitbox.apache.org/repos/asf/file-management.git +or https://github.com/apache/file-management Modified: maven/shared/trunk/maven-archiver/MOVED_TO_GIT URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/MOVED_TO_GIT?rev=1819029&r1=1819028&r2=1819029&view=diff == --- maven/shared/trunk/maven-archiver/MOVED_TO_GIT (original) +++ maven/shared/trunk/maven-archiver/MOVED_TO_GIT Fri Dec 22 11:27:19 2017 @@ -1 +1,3 @@ repo moved to gitbox +see https://gitbox.apache.org/repos/asf/maven-archiver.git +or https://github.com/apache/maven-archiver Modified: maven/shared/trunk/maven-artifact-resolver/MOVED_TO_GIT URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-resolver/MOVED_TO_GIT?rev=1819029&r1=1819028&r2=1819029&view=diff == --- maven/shared/trunk/maven-artifact-resolver/MOVED_TO_GIT (original) +++ maven/shared/trunk/maven-artifact-resolver/MOVED_TO_GIT Fri Dec 22 11:27:19 2017 @@ -1 +1,3 @@ repo moved to gitbox +see https://gitbox.apache.org/repos/asf/maven-artifact-resolver.git +or https://github.com/apache/maven-artifact-resolver Modified: maven/shared/trunk/maven-artifact-transfer/MOVED_TO_GIT URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/MOVED_TO_GIT?rev=1819029&r1=1819028&r2=1819029&view=diff == --- maven/shared/trunk/maven-artifact-transfer/MOVED_TO_GIT (original) +++ maven/shared/trunk/maven-artifact-transfer/MOVED_TO_GIT Fri Dec 22 11:27:19 2017 @@ -1 +1,3 @@ repo moved to gitbox +see https://gitbox.apache.org/repos/asf/maven-artifact-transfer.git +or https://github.com/apache/maven-artifact-transfer Modified: maven/shared/trunk/maven-common-artifact-filters/MOVED_TO_GIT URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/MOVED_TO_GIT?rev=1819029&r1=1819028&r2=1819029&view=diff == --- maven/shared/trunk/maven-common-artifact-filters/MOVED_TO_GIT (original) +++ maven/shared/trunk/maven-common-artifact-filters/MOVED_TO_GIT Fri Dec 22 11:27:19 2017 @@ -1 +1,3 @@ repo moved to gitbox +see https://gitbox.apache.org/repos/asf/maven-common-artifact-filters.git +or https://github.com/apache/maven-common-artifact-filters Modified: maven/shared/trunk/maven-dependency-analyzer/MOVED_TO_GIT URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/MOVED_TO_GIT?rev=1819029&r1=1819028&r2=1819029&view=diff == --- maven/shared/trunk/maven-dependency-analyzer/MOVED_TO_GIT (original) +++ maven/shared/trunk/maven-dependency-analyzer/MOVED_TO_GIT Fri Dec 22 11:27:19 2017 @@ -1 +1,3
svn commit: r1819028 - in /maven/plugins/trunk: maven-acr-plugin/ maven-ant-plugin/ maven-antrun-plugin/ maven-assembly-plugin/ maven-changelog-plugin/ maven-changes-plugin/ maven-checkstyle-plugin/ m
Author: hboutemy Date: Fri Dec 22 11:25:50 2017 New Revision: 1819028 URL: http://svn.apache.org/viewvc?rev=1819028&view=rev Log: added new gitbox and github git repo urls Modified: maven/plugins/trunk/maven-acr-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-ant-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-antrun-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-assembly-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-changelog-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-changes-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-checkstyle-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-clean-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-compiler-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-dependency-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-deploy-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-doap-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-docck-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-ear-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-ejb-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-gpg-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-help-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-install-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-invoker-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-jar-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-jarsigner-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-javadoc-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-jdeprscan-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-jdeps-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-jlink-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-jmod-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-linkcheck-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-patch-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-pdf-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-pmd-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-project-info-reports-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-rar-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-remote-resources-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-repository-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-resources-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-scm-publish-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-scripting-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-shade-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-site-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-source-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-stage-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-toolchains-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-verifier-plugin/MOVED_TO_GIT maven/plugins/trunk/maven-war-plugin/MOVED_TO_GIT Modified: maven/plugins/trunk/maven-acr-plugin/MOVED_TO_GIT URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-acr-plugin/MOVED_TO_GIT?rev=1819028&r1=1819027&r2=1819028&view=diff == --- maven/plugins/trunk/maven-acr-plugin/MOVED_TO_GIT (original) +++ maven/plugins/trunk/maven-acr-plugin/MOVED_TO_GIT Fri Dec 22 11:25:50 2017 @@ -1 +1,3 @@ repo moved to gitbox +see https://gitbox.apache.org/repos/asf/maven-acr-plugin.git +or https://github.com/apache/maven-acr-plugin Modified: maven/plugins/trunk/maven-ant-plugin/MOVED_TO_GIT URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/MOVED_TO_GIT?rev=1819028&r1=1819027&r2=1819028&view=diff == --- maven/plugins/trunk/maven-ant-plugin/MOVED_TO_GIT (original) +++ maven/plugins/trunk/maven-ant-plugin/MOVED_TO_GIT Fri Dec 22 11:25:50 2017 @@ -1 +1,3 @@ repo moved to gitbox +see https://gitbox.apache.org/repos/asf/maven-ant-plugin.git +or https://github.com/apache/maven-ant-plugin Modified: maven/plugins/trunk/maven-antrun-plugin/MOVED_TO_GIT URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/MOVED_TO_GIT?rev=1819028&r1=1819027&r2=1819028&view=diff == --- maven/plugins/trunk/maven-antrun-plugin/MOVED_TO_GIT (original) +++ maven/plugins/trunk/maven-antrun-plugin/MOVED_TO_GIT Fri Dec 22 11:25:50 2017 @@ -1 +1,3 @@ repo moved to gitbox +see https://gitbox.apache.org/repos/asf/maven-antrun-plugin.git +or https://github.com/apache/maven-antrun-plugin Modified: maven/plugins/trunk/maven-assembly-plugin/MOVED_TO_GIT URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/MOVED_TO_GIT?rev=1819028&r1=1819027&r2=1819028&view=diff == --- maven/plugins/trunk/maven-assembly-plugin/MOVED_TO_GIT (original) +++ maven/plugins/trunk/maven-assembly-plugin/MOVED_TO_GIT Fri Dec 22 11:25:50 2017 @@ -1 +1,3 @@ repo moved to gitbox +see https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git +or https://github.com/apache/maven-assembly-plug
maven git commit: [MNG-6308] display packaging when building a module Fix checkstyle reported errors
Repository: maven Updated Branches: refs/heads/MNG-6308_display_packaging f83d435e6 -> bfe51a99e [MNG-6308] display packaging when building a module Fix checkstyle reported errors Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/bfe51a99 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/bfe51a99 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/bfe51a99 Branch: refs/heads/MNG-6308_display_packaging Commit: bfe51a99ed84ece40951caa4b44e6e279d229569 Parents: f83d435 Author: rfscholte Authored: Fri Dec 22 11:57:24 2017 +0100 Committer: rfscholte Committed: Fri Dec 22 11:57:24 2017 +0100 -- .../apache/maven/cli/event/ExecutionEventLogger.java| 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/bfe51a99/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java -- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java index 8dcb397..8ea3585 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java @@ -274,16 +274,16 @@ public class ExecutionEventLogger .append( ':' ) .append( project.getPackaging() ); -final String PREHEADER = "-< "; -final String POSTHEADER = " >-"; +final String preHeader = "-< "; +final String postHeader = " >-"; String prefix = chars( '-', - Math.max( 0, ( LINE_LENGTH - projectKey.length() - PREHEADER.length() - POSTHEADER.length() ) + Math.max( 0, ( LINE_LENGTH - projectKey.length() - preHeader.length() - postHeader.length() ) / 2 ) ) -+ PREHEADER; -String suffix = POSTHEADER -+ chars( '-', Math.max( 0, LINE_LENGTH - projectKey.length() - prefix.length() - PREHEADER.length() ) ); ++ preHeader; +String suffix = postHeader ++ chars( '-', Math.max( 0, LINE_LENGTH - projectKey.length() - prefix.length() - preHeader.length() ) ); logger.info( buffer().strong( prefix ).project( projectKey ).strong( suffix ).toString() );
maven git commit: [MNG-6308] display packaging when building a module highlight projectKey
Repository: maven Updated Branches: refs/heads/MNG-6308_display_packaging abac8ae1a -> f83d435e6 [MNG-6308] display packaging when building a module highlight projectKey Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f83d435e Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f83d435e Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f83d435e Branch: refs/heads/MNG-6308_display_packaging Commit: f83d435e6dc88b39761873c8dcc2bc84b45269bf Parents: abac8ae Author: rfscholte Authored: Fri Dec 22 11:46:53 2017 +0100 Committer: rfscholte Committed: Fri Dec 22 11:46:53 2017 +0100 -- .../maven/cli/event/ExecutionEventLogger.java | 25 +--- 1 file changed, 16 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/f83d435e/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java -- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java index b3e3078..8dcb397 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java @@ -267,18 +267,25 @@ public class ExecutionEventLogger logger.info( "" ); -StringBuilder builder = new StringBuilder(); -builder.append( "-< " ) -.append( project.getGroupId() ) +StringBuilder projectKey = new StringBuilder(); +projectKey.append( project.getGroupId() ) .append( ':' ) .append( project.getArtifactId() ) .append( ':' ) -.append( project.getPackaging() ) -.append( " >-" ); -builder.insert( 0, chars( '-', Math.max( 0, LINE_LENGTH - builder.length() ) / 2 ) ); -builder.append( chars( '-', Math.max( 0, LINE_LENGTH - builder.length() ) ) ); - -infoMain( builder.toString() ); +.append( project.getPackaging() ); + +final String PREHEADER = "-< "; +final String POSTHEADER = " >-"; + +String prefix = +chars( '-', + Math.max( 0, ( LINE_LENGTH - projectKey.length() - PREHEADER.length() - POSTHEADER.length() ) + / 2 ) ) ++ PREHEADER; +String suffix = POSTHEADER ++ chars( '-', Math.max( 0, LINE_LENGTH - projectKey.length() - prefix.length() - PREHEADER.length() ) ); + +logger.info( buffer().strong( prefix ).project( projectKey ).strong( suffix ).toString() ); String building = "Building " + event.getProject().getName() + " " + event.getProject().getVersion();
[maven-pdf-plugin] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 33b8087 [maven-release-plugin] prepare for next development iteration
33b8087 is described below
commit 33b80877360ae84bfa75119d47c8ad1ffab6b2f2
Author: Hervé Boutemy
AuthorDate: Fri Dec 22 10:01:07 2017 +0100
[maven-release-plugin] prepare for next development iteration
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 05a91aa..5a088b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
maven-pdf-plugin
- 1.4
+ 1.5-SNAPSHOT
maven-plugin
Apache Maven PDF Plugin
@@ -59,7 +59,7 @@ under the License.
scm:git:https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git
scm:git:https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git
https://github.com/apache/maven-pdf-plugin/tree/${project.scm.tag}
-maven-pdf-plugin-1.4
+HEAD
JIRA
--
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].
[maven-pdf-plugin] annotated tag maven-pdf-plugin-1.4 created (now 98134b6)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to annotated tag maven-pdf-plugin-1.4 in repository https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git. at 98134b6 (tag) tagging d7cec4572fdaecc0d6e0438cc77db4e55319dc00 (commit) by Hervé Boutemy on Fri Dec 22 10:01:01 2017 +0100 - Log - [maven-release-plugin] copy for tag maven-pdf-plugin-1.4 --- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" '].
[maven-pdf-plugin] branch master updated: [maven-release-plugin] prepare release maven-pdf-plugin-1.4
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new d7cec45 [maven-release-plugin] prepare release maven-pdf-plugin-1.4
d7cec45 is described below
commit d7cec4572fdaecc0d6e0438cc77db4e55319dc00
Author: Hervé Boutemy
AuthorDate: Fri Dec 22 10:00:48 2017 +0100
[maven-release-plugin] prepare release maven-pdf-plugin-1.4
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7c33dac..05a91aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
maven-pdf-plugin
- 1.4-SNAPSHOT
+ 1.4
maven-plugin
Apache Maven PDF Plugin
@@ -59,7 +59,7 @@ under the License.
scm:git:https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git
scm:git:https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git
https://github.com/apache/maven-pdf-plugin/tree/${project.scm.tag}
-HEAD
+maven-pdf-plugin-1.4
JIRA
--
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].
[maven-pdf-plugin] branch master updated: link to same site
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git The following commit(s) were added to refs/heads/master by this push: new 8621400 link to same site 8621400 is described below commit 86214000965c18a97eff2513c81aeef1dc80 Author: Hervé Boutemy AuthorDate: Fri Dec 22 09:46:33 2017 +0100 link to same site --- src/site/xdoc/examples/configuring-reports.xml.vm | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/site/xdoc/examples/configuring-reports.xml.vm b/src/site/xdoc/examples/configuring-reports.xml.vm index 58c871f..1fcfbd1 100644 --- a/src/site/xdoc/examples/configuring-reports.xml.vm +++ b/src/site/xdoc/examples/configuring-reports.xml.vm @@ -38,7 +38,7 @@ under the License. Since version 1.1, all Maven reports will be included by default in the generated PDF. You should configure thesection of your POM similar than the -http://maven.apache.org/plugins/maven-site-plugin/examples/configuring-reports.html";>site plugin +site plugin @@ -139,10 +139,10 @@ under the License. - The Maven Project supports several http://maven.apache.org/plugins/";>reporting plugins. + The Maven Project supports several reporting plugins. Unfortunately, some releases reporting plugins have known issues with the PDF plugin, mainly due to a wrong use of the - http://maven.apache.org/doxia/doxia/doxia-sink-api/apidocs/org/apache/maven/doxia/sink/Sink.html";>Sink object + Sink object in their implementation. @@ -157,7 +157,7 @@ under the License. fails with the PDF plugin, you should fill a bug report in our issue tracker. -http://maven.apache.org/plugins/maven-changelog-plugin";>maven-changelog-plugin +maven-changelog-plugin Reports @@ -184,7 +184,7 @@ under the License. -http://maven.apache.org/plugins/maven-changes-plugin";>maven-changes-plugin +maven-changes-plugin Reports @@ -211,7 +211,7 @@ under the License. -http://maven.apache.org/plugins/maven-checkstyle-plugin";>maven-checkstyle-plugin +maven-checkstyle-plugin Note: could take a lot of time. @@ -229,7 +229,7 @@ under the License. -http://maven.apache.org/plugins/maven-dependency-plugin";>maven-dependency-plugin +maven-dependency-plugin Reports @@ -244,7 +244,7 @@ under the License. -http://maven.apache.org/plugins/maven-plugin-plugin";>maven-plugin-plugin +maven-plugin-plugin Reports @@ -259,7 +259,7 @@ under the License. -http://maven.apache.org/plugins/maven-pmd-plugin";>maven-pmd-plugin +maven-pmd-plugin Reports @@ -280,7 +280,7 @@ under the License. -http://maven.apache.org/plugins/maven-project-info-reports-plugin/";>maven-project-info-reports-plugin +maven-project-info-reports-plugin Note: dependencies report could take a lot of time. @@ -370,7 +370,7 @@ under the License. -http://maven.apache.org/plugins/maven-surefire-report-plugin";>maven-surefire-report-plugin +maven-surefire-report-plugin Reports -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" '].
[maven-pdf-plugin] branch master updated: Doxia is now in Git
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new ec67da7 Doxia is now in Git
ec67da7 is described below
commit ec67da77752be4ca594015f5e3c9f74a2ac6825e
Author: Hervé Boutemy
AuthorDate: Fri Dec 22 09:43:04 2017 +0100
Doxia is now in Git
---
src/site/apt/index.apt.vm | 2 +-
src/site/apt/usage.apt.vm | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
index b794a4e..267b668 100644
--- a/src/site/apt/index.apt.vm
+++ b/src/site/apt/index.apt.vm
@@ -54,7 +54,7 @@ ${project.name}
entire debug logs, POMs or most preferably little demo projects attached to
the issue are very much appreciated.
Of course, patches are welcome, too. Contributors can check out the project
from our
{{{./source-repository.html}source repository}} and will find supplementary
information in the
- {{{http://maven.apache.org/guides/development/guide-helping.html}guide to
helping with Maven}}.
+ {{{/guides/development/guide-helping.html}guide to helping with Maven}}.
* Examples
diff --git a/src/site/apt/usage.apt.vm b/src/site/apt/usage.apt.vm
index 43d5140..14aa492 100644
--- a/src/site/apt/usage.apt.vm
+++ b/src/site/apt/usage.apt.vm
@@ -82,7 +82,7 @@ Using The PDF Plugin
no <<>> element is given. The <<>> generates a Table
of Contents and specifies the order of files to include in the pdf.
For a complete description of the file format, see the
- {{{http://maven.apache.org/doxia/doxia/doxia-core/document.html}Document
Model Reference}}.
+ {{{/doxia/doxia/doxia-core/document.html}Document Model Reference}}.
<>:
@@ -96,7 +96,7 @@ Using The PDF Plugin
* Internationalization
The PDF plugin is able to generate internationalized pdfs, similar to the
- {{{http://maven.apache.org/guides/mini/guide-site.html}site creation}}.
+ {{{/guides/mini/guide-site.html}site creation}}.
To enable multiple locales, add a configuration similar to the following to
your POM:
@@ -149,7 +149,7 @@ Using The PDF Plugin
located in <<>>.
The format of this file has to be exactly the same as the original
-
{{{http://svn.apache.org/repos/asf/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/resources/fo-styles.xslt}default
configuration file}}.
+
{{{https://github.com/apache/maven-doxia/blob/master/doxia-modules/doxia-module-fo/src/main/resources/fo-styles.xslt}default
configuration file}}.
However, you only need to specify the properties that you want to override,
to change the font size of pre-formatted text, you could use:
--
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].
[maven-pdf-plugin] branch master updated: removed MAVENUSER wiki link: not available any more
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new a12f9ec removed MAVENUSER wiki link: not available any more
a12f9ec is described below
commit a12f9ec3962a42b7badca4e3d85d9ddfa2b7d8bc
Author: Hervé Boutemy
AuthorDate: Fri Dec 22 09:39:27 2017 +0100
removed MAVENUSER wiki link: not available any more
---
src/site/apt/index.apt.vm | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
index a4bb3df..b794a4e 100644
--- a/src/site/apt/index.apt.vm
+++ b/src/site/apt/index.apt.vm
@@ -41,9 +41,7 @@ ${project.name}
* Usage
General instructions on how to use the PDF Plugin can be found on the
{{{./usage.html}usage page}}. Some more
- specific use cases are described in the examples given below. Last but not
least, users occasionally contribute
- additional examples, tips or errata to the
- {{{http://docs.codehaus.org/display/MAVENUSER/PDF+Plugin}plugin's wiki
page}}.
+ specific use cases are described in the examples given below.
In case you still have questions regarding the plugin's usage, please have a
look at the {{{./faq.html}FAQ}} and feel
free to contact the {{{./mail-lists.html}user mailing list}}. The posts to
the mailing list are archived and could
--
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].
[maven-pdf-plugin] branch master updated: updated Doxia Sitetools
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 6a57274 updated Doxia Sitetools
6a57274 is described below
commit 6a572743a9438f05c03e1646870182d0744a79c7
Author: Hervé Boutemy
AuthorDate: Fri Dec 22 09:38:17 2017 +0100
updated Doxia Sitetools
---
pom.xml | 2 +-
src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java | 13 +++--
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 06e2221..7c33dac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@ under the License.
1.8
-1.7.1
+1.7.5
2.2.1
diff --git a/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
b/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
index f5330a5..7c1371f 100644
--- a/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
+++ b/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
@@ -34,6 +34,7 @@ import java.util.Map;
import java.util.Properties;
import org.apache.commons.io.input.XmlStreamReader;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
@@ -867,32 +868,32 @@ public class PdfMojo
return;
}
-File skinFile;
+Artifact skinArtifact;
try
{
-skinFile =
+skinArtifact =
siteTool.getSkinArtifactFromRepository( localRepository,
project.getRemoteArtifactRepositories(),
-decorationModel
).getFile();
+decorationModel );
}
catch ( SiteToolException e )
{
throw new MojoExecutionException( "SiteToolException: " +
e.getMessage(), e );
}
-if ( skinFile == null )
+if ( skinArtifact == null )
{
return;
}
if ( getLog().isDebugEnabled() )
{
-getLog().debug( "Copy resources from skin artifact: '" + skinFile
+ "'..." );
+getLog().debug( "Copy resources from skin artifact: '" +
skinArtifact.getId() + "'..." );
}
try
{
final SiteRenderingContext context =
-siteRenderer.createContextForSkin( skinFile, new
HashMap( 2 ), decorationModel,
+siteRenderer.createContextForSkin( skinArtifact, new
HashMap( 2 ), decorationModel,
project.getName(), locale );
context.addSiteDirectory( new File( siteDirectory,
locale.getLanguage() ) );
--
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].
