svn commit: r1770285 - /maven/enforcer/trunk/enforcer-rules/src/site/apt/requireEnvironmentVariable.apt.vm
Author: gboue Date: Thu Nov 17 22:32:38 2016 New Revision: 1770285 URL: http://svn.apache.org/viewvc?rev=1770285=rev Log: Fixing a typo in the documentation of requireEnvironmentVariable. Submitted by: Jérémie Bresson. This closes #19. Modified: maven/enforcer/trunk/enforcer-rules/src/site/apt/requireEnvironmentVariable.apt.vm Modified: maven/enforcer/trunk/enforcer-rules/src/site/apt/requireEnvironmentVariable.apt.vm URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/site/apt/requireEnvironmentVariable.apt.vm?rev=1770285=1770284=1770285=diff == --- maven/enforcer/trunk/enforcer-rules/src/site/apt/requireEnvironmentVariable.apt.vm (original) +++ maven/enforcer/trunk/enforcer-rules/src/site/apt/requireEnvironmentVariable.apt.vm Thu Nov 17 22:32:38 2016 @@ -57,7 +57,7 @@ Require Environment Variable - the_name_you_wish_to_be_checked + the_name_you_wish_to_be_checked true
Re: maven git commit: MNG-5889 - adding logic that looks for the file argument and starts the search for the .mvn directory at the location of the specified POM when present
Hi, This caused some ITs to fail on Windows, which I fixed in commit 8ae1a3e9. There is still one failing IT: MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest. It fails with master and Java 8 (on my machine). Looking at the code, it seems more of an issue with the test that the script itself. I'm not sure why it started to fail in build #1372. Was there a Java version change on Jenkins? Thanks, Guillaume Le 14/11/2016 à 23:12, hbout...@apache.org a écrit : Repository: maven Updated Branches: refs/heads/master 93a71e2de -> da5b4df93 MNG-5889 - adding logic that looks for the file argument and starts the search for the .mvn directory at the location of the specified POM when present Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/da5b4df9 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/da5b4df9 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/da5b4df9 Branch: refs/heads/master Commit: da5b4df930925a0cbee95cfdca5c249ff143d91b Parents: 93a71e2 Author: robert.patrickAuthored: Thu Sep 15 09:53:06 2016 -0500 Committer: Hervé Boutemy Committed: Mon Nov 14 22:28:55 2016 +0100 -- apache-maven/src/bin/mvn | 31 +++-- apache-maven/src/bin/mvn.cmd | 58 --- 2 files changed, 83 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/da5b4df9/apache-maven/src/bin/mvn -- diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn index ff6f250..e795073 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -121,7 +121,7 @@ fi # first directory with .mvn subdirectory is considered project base directory find_maven_basedir() { ( - basedir="`pwd`" + basedir=`find_file_argument_basedir "$@"` wdir="`pwd`" while [ "$wdir" != '/' ] ; do if [ -d "$wdir"/.mvn ] ; then @@ -134,6 +134,33 @@ find_maven_basedir() { ) } +find_file_argument_basedir() { +( + basedir="`pwd`" + + found_file_switch=0 + for arg in "$@"; do +if [ ${found_file_switch} -eq 1 ]; then + if [ -f ${arg} ]; then +basedir=$(dirname $(readlink -f "${arg}")) +if [ ! -d ${basedir} ]; then + echo "Directory ${basedir} extracted from the -f/--file command-line argument ${arg} does not exist" >&2 + exit 1 +fi + else +echo "POM file ${arg} specified with the -f/--file command line argument does not exist" >&2 +exit 1 + fi + break +fi +if [ "$arg" = "-f" -o "$arg" = "--file" ]; then + found_file_switch=1 +fi + done + echo "${basedir}" +) +} + # concatenates all lines of a file concat_lines() { if [ -f "$1" ]; then @@ -141,7 +168,7 @@ concat_lines() { fi } -MAVEN_PROJECTBASEDIR="${MAVEN_BASEDIR:-`find_maven_basedir`}" +MAVEN_PROJECTBASEDIR="${MAVEN_BASEDIR:-`find_maven_basedir "$@"`}" MAVEN_OPTS="`concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config"` $MAVEN_OPTS" # For Cygwin, switch project base directory path to Windows format before http://git-wip-us.apache.org/repos/asf/maven/blob/da5b4df9/apache-maven/src/bin/mvn.cmd -- diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd index cd81e42..21829fa 100644 --- a/apache-maven/src/bin/mvn.cmd +++ b/apache-maven/src/bin/mvn.cmd @@ -86,19 +86,69 @@ set MAVEN_CMD_LINE_ARGS=%* set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% if not "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir -set "EXEC_DIR=%CD%" -set "WDIR=%EXEC_DIR%" +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% + +@REM Look for the --file switch and start the search for the .mvn directory from the specified +@REM POM location, if supplied. + +set FILE_ARG= +:arg_loop +if "%1" == "-f" ( + set "FILE_ARG=%2" + shift + goto process_file_arg +) +if "%1" == "--file" ( + set "FILE_ARG=%2" + shift + goto process_file_arg +) +@REM If none of the above, skip the argument +shift +if not "%~1" == "" ( + goto arg_loop +) else ( + goto findBaseDir +) + +:process_file_arg +if "%FILE_ARG%" == "" ( + goto findBaseDir +) +if not exist "%FILE_ARG%" ( + echo POM file %FILE_ARG% specified the -f/--file command-line argument does not exist >&2 + goto error +) +call :get_directory_from_file %FILE_ARG% +if not exist "%POM_DIR%" ( + echo Directory %POM_DIR% extracted from the -f/--file command-line argument %FILE_ARG% does not exist >&2 + goto error +) +set WDIR=%POM_DIR% +goto findBaseDir + +:get_directory_from_file +set "POM_DIR=%~dp1" +:stripPomDir +if not "_%POM_DIR:~-1%"=="_\" goto pomDirStripped +set "POM_DIR=%POM_DIR:~0,-1%" +goto stripPomDir +:pomDirStripped
maven git commit: [MNG-5889] .mvn directory should be picked when using --file
Repository: maven Updated Branches: refs/heads/master baf343fcb -> 8ae1a3e92 [MNG-5889] .mvn directory should be picked when using --file Fixing the ITs on Windows: accessing arguments should be done with "%~1" to take care of the fact that some parameter already contain quotes (otherwise, it fails by calling mvn --version -Dtest -Dmaven.repo.local="C:\test space\repo" -f "C:\test space\pom.xml" for example). Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8ae1a3e9 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8ae1a3e9 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8ae1a3e9 Branch: refs/heads/master Commit: 8ae1a3e92418fbac59acb07fcbd668d3735c1945 Parents: baf343f Author: Guillaume BouéAuthored: Thu Nov 17 16:50:40 2016 +0100 Committer: Guillaume Boué Committed: Thu Nov 17 16:50:40 2016 +0100 -- apache-maven/src/bin/mvn.cmd | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/8ae1a3e9/apache-maven/src/bin/mvn.cmd -- diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd index 21829fa..6271f17 100644 --- a/apache-maven/src/bin/mvn.cmd +++ b/apache-maven/src/bin/mvn.cmd @@ -94,13 +94,13 @@ set WDIR=%EXEC_DIR% set FILE_ARG= :arg_loop -if "%1" == "-f" ( - set "FILE_ARG=%2" +if "%~1" == "-f" ( + set "FILE_ARG=%~2" shift goto process_file_arg ) -if "%1" == "--file" ( - set "FILE_ARG=%2" +if "%~1" == "--file" ( + set "FILE_ARG=%~2" shift goto process_file_arg )
svn commit: r1001271 - /websites/production/maven/content/
Author: hboutemy Date: Thu Nov 17 14:01:19 2016 New Revision: 1001271 Log: Publishing svnmucc operation to maven site by hboutemy Added: websites/production/maven/content/ - copied from r1001270, websites/staging/maven/trunk/content/
svn commit: r1001267 - in /websites/staging/maven/trunk/content: ./ xsd/assembly-2.0.0.xsd xsd/assembly-component-2.0.0.xsd
Author: buildbot Date: Thu Nov 17 13:16:33 2016 New Revision: 1001267 Log: Staging update by buildbot for maven Added: websites/staging/maven/trunk/content/xsd/assembly-2.0.0.xsd (with props) websites/staging/maven/trunk/content/xsd/assembly-component-2.0.0.xsd (with props) Modified: websites/staging/maven/trunk/content/ (props changed) Propchange: websites/staging/maven/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Thu Nov 17 13:16:33 2016 @@ -1 +1 @@ -1770171 +1770187 Added: websites/staging/maven/trunk/content/xsd/assembly-2.0.0.xsd == Binary file - no diff available. Propchange: websites/staging/maven/trunk/content/xsd/assembly-2.0.0.xsd -- svn:mime-type = application/xml Added: websites/staging/maven/trunk/content/xsd/assembly-component-2.0.0.xsd == Binary file - no diff available. Propchange: websites/staging/maven/trunk/content/xsd/assembly-component-2.0.0.xsd -- svn:mime-type = application/xml
svn commit: r1770187 [2/2] - in /maven/site/trunk/content/resources/xsd: assembly-2.0.0.xsd assembly-component-2.0.0.xsd
Added: maven/site/trunk/content/resources/xsd/assembly-component-2.0.0.xsd URL: http://svn.apache.org/viewvc/maven/site/trunk/content/resources/xsd/assembly-component-2.0.0.xsd?rev=1770187=auto == --- maven/site/trunk/content/resources/xsd/assembly-component-2.0.0.xsd (added) +++ maven/site/trunk/content/resources/xsd/assembly-component-2.0.0.xsd Thu Nov 17 13:16:25 2016 @@ -0,0 +1,1247 @@ + + + + + +http://www.w3.org/2001/XMLSchema; elementFormDefault="qualified" xmlns="http://maven.apache.org/ASSEMBLY-COMPONENT/2.0.0; targetNamespace="http://maven.apache.org/ASSEMBLY-COMPONENT/2.0.0;> + + + 1.0.0+ + Describes the component layout and packaging. + + + + + 1.0.0+ + Describes the component layout and packaging. + + + + + 1.1.2+ + + +Specifies which module files to include in the assembly. A moduleSet +is specified by providing one or more of lt;moduleSetgt; +subelements. + + + + + + + + + + + + 1.0.0+ + + +Specifies which groups of files to include in the assembly. A +fileSet is specified by providing one or more of lt;fileSetgt; +subelements. + + + + + + + + + + + + 1.0.0+ + + +Specifies which single files to include in the assembly. A file +is specified by providing one or more of lt;filegt; +subelements. + + + + + + + + + + + + 1.0.0+ + + +Specifies which dependencies to include in the assembly. A +dependencySet is specified by providing one or more of +lt;dependencySetgt; subelements. + + + + + + + + + + + + 1.1.0+ + + +Specifies a set of repositories to include in the assembly. A +repository is specified by providing one or more of +lt;repositorygt; subelements. + + + + + + + + + + + + 1.1.0+ + + +Set of components which filter various container descriptors out of +the normal archive stream, so they can be aggregated then added. + + + + + + + + + + + + + + 1.0.0+ + +A file allows individual file inclusion with the option to change +the destination filename not supported by fileSets. + + + + + + 1.0.0+ + +Sets the absolute or relative path from the modules directory +of the file to be included in the assembly. + + + + + + 1.0.0+ + +Sets the output directory relative to the root +of the root directory of the assembly. For example, +log will put the specified files in the log directory. + + + + + + 1.0.0+ + +Sets the destination filename in the outputDirectory. +Default is the same name as the sources file. + + + + + + 1.0.0+ + + +Similar to a UNIX permission, sets the file mode of the files included. +THIS IS AN OCTAL VALUE. +Format: (User)(Group)(Other) where each component is a sum of Read = 4, +Write = 2, and Execute = 1. For example, the value 0644 +translates to User read-write, Group and Other read-only. The default value is 0644. +a href=http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html;(more on unix-style permissions)/a + + + + + + + 1.0.0+ + + +Sets the line-endings of the files in this file. +Valid values are: +ul + libkeep/b - Preserve all line endings/li + libunix/b - Use Unix-style line endings/li + liblf/b - Use a single line-feed line endings/li + libdos/b - Use DOS-style line endings/li + libcrlf/b - Use Carraige-return, line-feed line endings/li +/ul + + + + + + + 1.0.0+ + +Sets whether to
svn commit: r1770187 [1/2] - in /maven/site/trunk/content/resources/xsd: assembly-2.0.0.xsd assembly-component-2.0.0.xsd
Author: gboue Date: Thu Nov 17 13:16:25 2016 New Revision: 1770187 URL: http://svn.apache.org/viewvc?rev=1770187=rev Log: [MASSEMBLY-838] Assembly descriptor schemas are missing from web site Adding 2.0.0 assembly descriptors for the Assembly Plugin to the site with regard to the 3.0.0 release of the plugin. XSD generated by checking out the 3.0.0 tag from SVN on Ubuntu 16.04, running "mvn clean package" (Maven 3.3.9) and copying the two generated XSDs by Modello. Added: maven/site/trunk/content/resources/xsd/assembly-2.0.0.xsd (with props) maven/site/trunk/content/resources/xsd/assembly-component-2.0.0.xsd (with props) Added: maven/site/trunk/content/resources/xsd/assembly-2.0.0.xsd URL: http://svn.apache.org/viewvc/maven/site/trunk/content/resources/xsd/assembly-2.0.0.xsd?rev=1770187=auto == --- maven/site/trunk/content/resources/xsd/assembly-2.0.0.xsd (added) +++ maven/site/trunk/content/resources/xsd/assembly-2.0.0.xsd Thu Nov 17 13:16:25 2016 @@ -0,0 +1,1364 @@ + + + + + +http://www.w3.org/2001/XMLSchema; elementFormDefault="qualified" xmlns="http://maven.apache.org/ASSEMBLY/2.0.0; targetNamespace="http://maven.apache.org/ASSEMBLY/2.0.0;> + + + 1.0.0+ + + +An assembly defines a collection of files usually distributed in an +archive format such as zip, tar, or tar.gz that is generated from a +project. For example, a project could produce a ZIP assembly which +contains a projects JAR artifact in the root directory, the +runtime dependencies in a lib/ directory, and a shell script to launch +a stand-alone application. + + + + + + + 1.0.0+ + + +An assembly defines a collection of files usually distributed in an +archive format such as zip, tar, or tar.gz that is generated from a +project. For example, a project could produce a ZIP assembly which +contains a projects JAR artifact in the root directory, the +runtime dependencies in a lib/ directory, and a shell script to launch +a stand-alone application. + + + + + + + 1.0.0+ + +Sets the id of this assembly. This is a symbolic name for a +particular assembly of files from this project. Also, aside from +being used to distinctly name the assembled package by attaching +its value to the generated archive, the id is used as your +artifacts classifier when deploying. + + + + + + 1.0.0+ + + +Specifies the formats of the assembly. + +It is often better to specify the formats via the goal parameter rather +than here. For example, that allows different profiles to generate +different types of archives. + +Multiple formats can be +supplied and the Assembly Plugin will generate an archive for each +of the desired formats. When deploying your project, all file formats +specified will also be deployed. A format is specified by supplying +one of the following values in a lt;formatgt; subelement: +ul + libzip/b - Creates a ZIP file format/li + libtar/b - Creates a TAR format/li + libtar.gz/b or btgz/b - Creates a gzipd TAR format/li + libtar.bz2/b or btbz2/b - Creates a bzipd TAR format/li + libjar/b - Creates a JAR format/li + libdir/b - Creates an exploded directory format/li + libwar/b - Creates a WAR format/li +/ul + + + + + + + + + + + + 0.0.0+ + +Includes a base directory in the final archive. For example, +if you are creating an assembly named your-app, setting +includeBaseDirectory to true will create an archive that +includes this base directory. If this option is set to false +the archive created will unzip its content to the current +directory. + + + + + + 1.1.0+ + +Sets the base directory of the resulting assembly archive. If this is not +set and includeBaseDirectory == true, ${project.build.finalName} will be used instead. +(Since 2.2-beta-1) + + + + + + 0.0.0+ + +Includes a site directory in the final archive. The site directory +location of a project is determined by the siteDirectory parameter +of the Assembly Plugin. + + + + + + 1.1.0+ + + +
maven-archetype git commit: [ARCHETYPE-513] Files in excludePatterns having a default filtered extension are still included
Repository: maven-archetype Updated Branches: refs/heads/master 4a59126c6 -> 44e7ed632 [ARCHETYPE-513] Files in excludePatterns having a default filtered extension are still included If a file having a default filtered extensions was present in a manually excluded pattern, it still ended up in the generated archetype. The fix is to propagate the excludePattern to the creation of the archetype files in (FilesetArchetypeCreator#createArchetypeFiles). Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/44e7ed63 Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/44e7ed63 Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/44e7ed63 Branch: refs/heads/master Commit: 44e7ed6329320ae6b009bf3415b0e615770a110e Parents: 4a59126 Author: Guillaume BouéAuthored: Thu Nov 17 13:27:58 2016 +0100 Committer: Guillaume Boué Committed: Thu Nov 17 13:27:58 2016 +0100 -- .../creator/FilesetArchetypeCreator.java| 18 ++-- .../archetype.properties| 1 + .../invoker.properties | 1 + .../pom.xml | 30 + .../src/main/resources/file.txt | 0 .../src/main/resources/file.xml | 0 .../src/main/resources/toexclude/file.txt | 0 .../src/main/resources/toexclude/file.xml | 0 .../src/main/toexclude/file.txt | 0 .../src/main/toexclude/file.xml | 0 .../src/toexclude/file.txt | 0 .../src/toexclude/file.xml | 0 .../toexclude/file.txt | 0 .../toexclude/file.xml | 0 .../verify.bsh | 46 .../creator/DefaultArchetypeCreatorTest.java| 12 + .../projects/exclude-patterns-2/.sonar/file.txt | 0 .../archetype.properties.sample | 9 .../exclude-patterns-2/folder/.sonar/file.txt | 0 .../projects/exclude-patterns-2/folder/file.txt | 0 .../projects/exclude-patterns-2/pom.xml.sample | 34 +++ 21 files changed, 147 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/44e7ed63/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java -- diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java b/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java index 6af535f..22465fd 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java @@ -211,7 +211,7 @@ public class FilesetArchetypeCreator archetypeDescriptor.setFileSets( filesets ); createArchetypeFiles( reverseProperties, filesets, packageName, basedir, archetypeFilesDirectory, - defaultEncoding ); + defaultEncoding, excludePatterns ); getLogger().debug( "Created files for " + archetypeDescriptor.getName() ); setParentArtifactId( reverseProperties, configurationProperties.getProperty( Constants.ARTIFACT_ID ) ); @@ -805,6 +805,14 @@ public class FilesetArchetypeCreator return result; } +private List addLists( List list, List other ) +{ +List result = new ArrayList( list.size() + other.size() ); +result.addAll( list ); +result.addAll( other ); +return result; +} + private void copyFiles( File basedir, File archetypeFilesDirectory, String directory, List fileSetResources, boolean packaged, String packageName ) throws IOException @@ -832,7 +840,8 @@ public class FilesetArchetypeCreator } private void createArchetypeFiles( Properties reverseProperties, List fileSets, String packageName, - File basedir, File archetypeFilesDirectory, String defaultEncoding ) + File basedir, File archetypeFilesDirectory, String defaultEncoding, + List excludePatterns ) throws IOException { getLogger().debug( "Creating Archetype/Module files from " + basedir + " to " + archetypeFilesDirectory ); @@ -843,7 +852,8 @@ public class FilesetArchetypeCreator scanner.setBasedir( basedir ); scanner.setIncludes( (String[]) concatenateToList( fileSet.getIncludes(),
svn commit: r1001263 - in /websites/staging/maven/trunk/content: ./ maven-site-1.0-site.jar plugins/index.html
Author: buildbot Date: Thu Nov 17 11:42:16 2016 New Revision: 1001263 Log: Staging update by buildbot for maven Modified: websites/staging/maven/trunk/content/ (props changed) websites/staging/maven/trunk/content/maven-site-1.0-site.jar websites/staging/maven/trunk/content/plugins/index.html Propchange: websites/staging/maven/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Thu Nov 17 11:42:16 2016 @@ -1 +1 @@ -1770169 +1770171 Modified: websites/staging/maven/trunk/content/maven-site-1.0-site.jar == Binary files - no diff available. Modified: websites/staging/maven/trunk/content/plugins/index.html == --- websites/staging/maven/trunk/content/plugins/index.html (original) +++ websites/staging/maven/trunk/content/plugins/index.html Thu Nov 17 11:42:16 2016 @@ -204,8 +204,8 @@ Karl-Heinz Marbaise" /> site B -3.5.1 -2016-04-15 +3.6 +2016-11-17 Generate a site for the current project. https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin/;>SVN https://issues.apache.org/jira/browse/MSITE;>JIRA
svn commit: r1770171 - /maven/site/trunk/content/apt/plugins/index.apt
Author: hboutemy Date: Thu Nov 17 11:41:50 2016 New Revision: 1770171 URL: http://svn.apache.org/viewvc?rev=1770171=rev Log: maven-site-plugin 3.6 released Modified: maven/site/trunk/content/apt/plugins/index.apt Modified: maven/site/trunk/content/apt/plugins/index.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1770171=1770170=1770171=diff == --- maven/site/trunk/content/apt/plugins/index.apt (original) +++ maven/site/trunk/content/apt/plugins/index.apt Thu Nov 17 11:41:50 2016 @@ -79,7 +79,7 @@ Available Plugins *--++--++--+++ | {{{/plugins/maven-resources-plugin/} <<>>}} | B | 3.0.1| 2016-06-03 | Copy the resources to the output directory for including in the JAR. | {{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-resources-plugin}SVN}} | {{{https://issues.apache.org/jira/browse/MRESOURCES}JIRA}} *--++--++--+++ -| {{{/plugins/maven-site-plugin/} <<>>}} | B | 3.5.1| 2016-04-15 | Generate a site for the current project. | {{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin/}SVN}} | {{{https://issues.apache.org/jira/browse/MSITE}JIRA}} +| {{{/plugins/maven-site-plugin/} <<>>}} | B | 3.6 | 2016-11-17 | Generate a site for the current project. | {{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin/}SVN}} | {{{https://issues.apache.org/jira/browse/MSITE}JIRA}} *--++--++--+++ | {{{/surefire/maven-surefire-plugin/} <<>>}}| B | 2.19.1 | 2016-01-03 | Run the JUnit unit tests in an isolated classloader. | {{{https://git-wip-us.apache.org/repos/asf/maven-surefire.git}GIT}} | {{{https://issues.apache.org/jira/browse/SUREFIRE}JIRA}} *--++--++--+++
svn commit: r1001262 - in /websites/staging/maven/trunk/content: ./ maven-site-1.0-site.jar
Author: buildbot Date: Thu Nov 17 11:40:21 2016 New Revision: 1001262 Log: Staging update by buildbot for maven Modified: websites/staging/maven/trunk/content/ (props changed) websites/staging/maven/trunk/content/maven-site-1.0-site.jar Propchange: websites/staging/maven/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Thu Nov 17 11:40:21 2016 @@ -1 +1 @@ -1770165 +1770169 Modified: websites/staging/maven/trunk/content/maven-site-1.0-site.jar == Binary files - no diff available.
svn commit: r1770169 - /maven/site/trunk/pom.xml
Author: hboutemy Date: Thu Nov 17 11:39:54 2016 New Revision: 1770169 URL: http://svn.apache.org/viewvc?rev=1770169=rev Log: avoid failure when rebuilding site without cleaning: don't add site.jar to site.jar Modified: maven/site/trunk/pom.xml Modified: maven/site/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=1770169=1770168=1770169=diff == --- maven/site/trunk/pom.xml (original) +++ maven/site/trunk/pom.xml Thu Nov 17 11:39:54 2016 @@ -165,6 +165,9 @@ ${project.reporting.outputDirectory} + +*.jar +
svn commit: r1770166 - /maven/pom/trunk/maven/pom.xml
Author: hboutemy Date: Thu Nov 17 11:27:17 2016 New Revision: 1770166 URL: http://svn.apache.org/viewvc?rev=1770166=rev Log: upgraded maven-site-plugin to 3.6 Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1770166=1770165=1770166=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Thu Nov 17 11:27:17 2016 @@ -911,6 +911,7 @@ under the License. org.apache.maven.plugins maven-site-plugin + 3.6 scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}
svn commit: r1001261 [3/4] - in /websites/staging/maven/trunk/content: ./ apache-resource-bundles/ archetypes/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ d
Modified: websites/staging/maven/trunk/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html == --- websites/staging/maven/trunk/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html (original) +++ websites/staging/maven/trunk/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html Thu Nov 17 11:26:35 2016 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -9,7 +9,7 @@ - + Maven Optional Dependencies and Dependency Exclusions @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Optional Dependencies and Dependency Exclusions -Last Published: 2016-11-15 +Last Published: 2016-11-17 Modified: websites/staging/maven/trunk/content/guides/introduction/introduction-to-plugin-prefix-mapping.html == --- websites/staging/maven/trunk/content/guides/introduction/introduction-to-plugin-prefix-mapping.html (original) +++ websites/staging/maven/trunk/content/guides/introduction/introduction-to-plugin-prefix-mapping.html Thu Nov 17 11:26:35 2016 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -9,7 +9,7 @@ - + Maven Introduction to Plugin Prefix Resolution @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Introduction to Plugin Prefix Resolution -Last Published: 2016-11-15 +Last Published: 2016-11-17 Modified: websites/staging/maven/trunk/content/guides/introduction/introduction-to-plugins.html == --- websites/staging/maven/trunk/content/guides/introduction/introduction-to-plugins.html (original) +++ websites/staging/maven/trunk/content/guides/introduction/introduction-to-plugins.html Thu Nov 17 11:26:35 2016 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -9,7 +9,7 @@ - + Maven Introduction to Maven 2.0 Plugin Development @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Introduction to Maven 2.0 Plugin Development -Last Published: 2016-11-15 +Last Published: 2016-11-17 Modified: websites/staging/maven/trunk/content/guides/introduction/introduction-to-profiles.html == --- websites/staging/maven/trunk/content/guides/introduction/introduction-to-profiles.html (original) +++ websites/staging/maven/trunk/content/guides/introduction/introduction-to-profiles.html Thu Nov 17 11:26:35 2016 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -9,7 +9,7 @@ - + Maven Introduction to build profiles @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Introduction to build profiles -Last Published: 2016-11-15 +Last Published: 2016-11-17 Modified: websites/staging/maven/trunk/content/guides/introduction/introduction-to-repositories.html == --- websites/staging/maven/trunk/content/guides/introduction/introduction-to-repositories.html (original) +++ websites/staging/maven/trunk/content/guides/introduction/introduction-to-repositories.html Thu Nov 17 11:26:35 2016 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -10,7 +10,7 @@ - + Maven Introduction to Repositories @@ -42,7 +42,7 @@ Brian Fox" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Introduction to Repositories -Last Published: 2016-11-15 +Last Published: 2016-11-17 Modified: websites/staging/maven/trunk/content/guides/introduction/introduction-to-the-lifecycle.html == --- websites/staging/maven/trunk/content/guides/introduction/introduction-to-the-lifecycle.html (original) +++ websites/staging/maven/trunk/content/guides/introduction/introduction-to-the-lifecycle.html Thu Nov 17 11:26:35 2016 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -9,7 +9,7 @@ - + Maven Introduction to the Build Lifecycle @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink"
svn commit: r1001261 [4/4] - in /websites/staging/maven/trunk/content: ./ apache-resource-bundles/ archetypes/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ d
Modified: websites/staging/maven/trunk/content/integration.html == --- websites/staging/maven/trunk/content/integration.html (original) +++ websites/staging/maven/trunk/content/integration.html Thu Nov 17 11:26:35 2016 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Maven CI Management @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ CI Management -Last Published: 2016-11-15 +Last Published: 2016-11-17 Modified: websites/staging/maven/trunk/content/issue-tracking.html == --- websites/staging/maven/trunk/content/issue-tracking.html (original) +++ websites/staging/maven/trunk/content/issue-tracking.html Thu Nov 17 11:26:35 2016 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Maven Overview @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Overview -Last Published: 2016-11-15 +Last Published: 2016-11-17 Modified: websites/staging/maven/trunk/content/mail-lists.html == --- websites/staging/maven/trunk/content/mail-lists.html (original) +++ websites/staging/maven/trunk/content/mail-lists.html Thu Nov 17 11:26:35 2016 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Maven Project Mailing Lists @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Project Mailing Lists -Last Published: 2016-11-15 +Last Published: 2016-11-17 Modified: websites/staging/maven/trunk/content/maven-1.x-eol.html == --- websites/staging/maven/trunk/content/maven-1.x-eol.html (original) +++ websites/staging/maven/trunk/content/maven-1.x-eol.html Thu Nov 17 11:26:35 2016 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Maven End Of Life Apache Maven 1.x @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ End Of Life Apache Maven 1.x -Last Published: 2016-11-15 +Last Published: 2016-11-17 Modified: websites/staging/maven/trunk/content/maven-2.x-eol.html == --- websites/staging/maven/trunk/content/maven-2.x-eol.html (original) +++ websites/staging/maven/trunk/content/maven-2.x-eol.html Thu Nov 17 11:26:35 2016 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -9,7 +9,7 @@ - + Maven End Of Life of Maven 2.x @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ End Of Life of Maven 2.x -Last Published: 2016-11-15 +Last Published: 2016-11-17 Modified: websites/staging/maven/trunk/content/maven-conventions.html == --- websites/staging/maven/trunk/content/maven-conventions.html (original) +++ websites/staging/maven/trunk/content/maven-conventions.html Thu Nov 17 11:26:35 2016 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Maven Maven Conventions @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven Conventions -Last Published: 2016-11-15 +Last Published: 2016-11-17 Modified: websites/staging/maven/trunk/content/maven-features.html == --- websites/staging/maven/trunk/content/maven-features.html (original) +++ websites/staging/maven/trunk/content/maven-features.html Thu Nov 17 11:26:35 2016 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -9,7 +9,7 @@ - + Maven Maven Features @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven Features -Last Published: 2016-11-15 +Last Published: 2016-11-17 Modified: websites/staging/maven/trunk/content/maven-jsr330.html == ---
svn commit: r1770165 - /maven/site/trunk/pom.xml
Author: hboutemy Date: Thu Nov 17 11:25:23 2016 New Revision: 1770165 URL: http://svn.apache.org/viewvc?rev=1770165=rev Log: removed confusing prerequisite sections: it's not a plugin Modified: maven/site/trunk/pom.xml Modified: maven/site/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=1770165=1770164=1770165=diff == --- maven/site/trunk/pom.xml (original) +++ maven/site/trunk/pom.xml Thu Nov 17 11:25:23 2016 @@ -33,10 +33,6 @@ Apache Maven Site https://maven.apache.org/ - -3.0 - - scm:svn:https://svn.apache.org/repos/asf/maven/site/trunk/
svn commit: r1770164 - /maven/pom/trunk/asf/pom.xml
Author: hboutemy Date: Thu Nov 17 11:22:26 2016 New Revision: 1770164 URL: http://svn.apache.org/viewvc?rev=1770164=rev Log: updated maven-site-plugin to 3.6 Modified: maven/pom/trunk/asf/pom.xml Modified: maven/pom/trunk/asf/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=1770164=1770163=1770164=diff == --- maven/pom/trunk/asf/pom.xml (original) +++ maven/pom/trunk/asf/pom.xml Thu Nov 17 11:22:26 2016 @@ -241,7 +241,7 @@ under the License. org.apache.maven.plugins maven-site-plugin - 3.5.1 + 3.6 org.apache.maven.plugins
svn commit: r17035 - in /release/maven: ./ plugins/
Author: hboutemy Date: Thu Nov 17 11:12:22 2016 New Revision: 17035 Log: Maven Site Plugin 3.6 released Added: release/maven/plugins/maven-site-plugin-3.6-source-release.zip (with props) release/maven/plugins/maven-site-plugin-3.6-source-release.zip.asc release/maven/plugins/maven-site-plugin-3.6-source-release.zip.md5 Removed: release/maven/plugins/maven-site-plugin-3.5.1-source-release.zip release/maven/plugins/maven-site-plugin-3.5.1-source-release.zip.asc release/maven/plugins/maven-site-plugin-3.5.1-source-release.zip.md5 Modified: release/maven/KEYS Modified: release/maven/KEYS == --- release/maven/KEYS (original) +++ release/maven/KEYS Thu Nov 17 11:12:22 2016 @@ -2991,3 +2991,40 @@ DAHwD80IXAi3LV2AKb81 =I9Tv -END PGP PUBLIC KEY BLOCK- +pub rsa2048 2016-11-12 [SC] + FA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A +uid [ ultime ] Herve Boutemy+sig 3012579464D01C06A 2016-11-12 Herve Boutemy +sub rsa2048 2016-11-12 [E] +sig 012579464D01C06A 2016-11-12 Herve Boutemy + +-BEGIN PGP PUBLIC KEY BLOCK- + +mQENBFgnlA8BCACVtx3oLXcanfvwtMRwal6pLQ8IVMG9+fr4xGdbSHXCRNbosDa5 +agU7WeQMPhusSxJGaA3w7NOdjAwD/LeHADhDPeI6llJg1Fb3EyqH0NZaODKU/Or/ +dID/i1onAX1dE914J4lf3XvIAxGiAjmr3UvWO9RiFxRUkecMAMlCBp2FuHuvxkcn +Mk8q9dP9Ef360wu8X5rj0kgP6vPhgl9/RhuPsUxlazb2Kn9Zxi/RmDKDiH/vDuwy +WdRGFOR1OPV7l3Ws01nrs4vKd2v5rsUmsjvQ8ldxdrA1xzX4IszHRDgSC9PI8ItZ +1VlbaKjE0L03acPfFTg/wRFSF5zsrGNbTmq1ABEBAAG0I0hlcnZlIEJvdXRlbXkg +PGhib3V0ZW15QGFwYWNoZS5vcmc+iQE3BBMBCgAhBQJYJ5QPAhsDBQsJCAcDBRUK +CQgLBRYCAwEAAh4BAheAAAoJEAEleUZNAcBqo5MH/1RQy2ogQHqOZggHXKSdFSyh +N15+Th9MQ6pU2S8Fx14NHzRU8OdQigca5IpFF47At55eLorLDWByxCtE4gWVmwNo +GlvfH8hWep0gYibL628/mmI3lM27QCaoAqCnjdc63ig+aGH+JDHgQIQ1Po0lDTLF +FL3cgSQJhuWw0GnJehVy51iR6kQ7Pphwfz2RuSW0Bv1SVu0lholZwgi1dgGhNHWd +e7jygZC1Yl5veJMjnpFbwtn0L3cqh1yA8g1GD8Gyvvm8a9KH5XGMVjdKnIsvPBbc +5ind6+0Or+ei3LjZummtUtbFLiDS2tdKZ5uPGfYZulg+/xCjznSj73iu3Bsloj25 +AQ0EWCeUDwEIAMGWqQT5ccT/Q1OypoOQGEZn+oRkgEdnzt8mjo7aOXd6pkNTkt3+ +LCkmb8Pp3/a3iYEfvSvBZbb2JbY9xnmM8jBucWnow1iwEPxGhUuu3jlIpRsCwLk+ +utLkMALRkooXqanDoVRWxuVeFYN0as8nndgWiJT30innN4vfaR3x3E6/nS57zp5I +ggxZYsXTRHb25kaof9lglHyXeypW7quKOP4SeES70PVVUnYZBlLpnX8a2msRtJio +uWxCv/kHnYsjW62vc7nqvWAsSsfBT61TVx7yI9CckVFBnkpG1I8C9WpfcR+j9yau +ptgUMfrfDTFg3Aip7czMSoL4Jpu7jBcXy9UAEQEAAYkBHwQYAQoACQUCWCeUDwIb +DAAKCRABJXlGTQHAapGTB/oCoCsuJ7617gpcuEAXxWTBfcXKo4z8ObBek2RUh0AY +9aXjRYSzwwbtVFRC01Esr7R9b5ScY7W1TDQBKL0OSRZ3jwy7/hA7k8P7xAp3mC4+ +FdHaHMH8nGz2IbUjGWl3Yp01NRn4jc8gcnHnqcUff7PXsRMUtJ3dnbsIYOrBAbWK +ld07RVEQUyafgUfdF9cxe6P/slSZxATJrlIPveB5bgcVDMMw1UQNqJL9LWP2IM7x +cljOBHY7jqwqnQ4pRER92VzhLdtsdwF0H1SuERpDxBAuibchMoCfQ3HER+K2mTUo +J04xog7MQs2aaMwSbem1LMvNBZ/mfF7QMYfMV2n7rbIk +=dlid +-END PGP PUBLIC KEY BLOCK- + Added: release/maven/plugins/maven-site-plugin-3.6-source-release.zip == Binary file - no diff available. Propchange: release/maven/plugins/maven-site-plugin-3.6-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/plugins/maven-site-plugin-3.6-source-release.zip.asc == --- release/maven/plugins/maven-site-plugin-3.6-source-release.zip.asc (added) +++ release/maven/plugins/maven-site-plugin-3.6-source-release.zip.asc Thu Nov 17 11:12:22 2016 @@ -0,0 +1,10 @@ +-BEGIN PGP SIGNATURE- + +iQEcBAABCgAGBQJYJ5p/AAoJEAEleUZNAcBqXWgH/ibNN36yG1hp3MPaqPRLQQlF +bFgiYtpPXupgYeT0JmJp3MoQv9u426u1jnaEVluu7g7CIZPvAQdMjAT3/eF5j0HR +QjHGVHWZo9H8IJYEdwirSlVnFts3rQwesUF87aMiQIhS2ws0M5l+A0G4gZHTIFJ6 +kRO5RkW78z5USPI+fZztyHQGWR7Jin1pfoaCQLPEH6VZuckc8n/13G4+jtRet/x8 +NNQLz2BWlKCjlNehOdl6KbOo8tTaxYHRVeGdTu3R/CRQkHfL0gx6FZefG8UYzRhp +TJpu1MfalnSQGYqvuBXMFllEmGe5Wo+oHYnHQQCH7MZOYnrjseUWgaZUnpm9CbQ= +=s6lV +-END PGP SIGNATURE- Added: release/maven/plugins/maven-site-plugin-3.6-source-release.zip.md5 == --- release/maven/plugins/maven-site-plugin-3.6-source-release.zip.md5 (added) +++ release/maven/plugins/maven-site-plugin-3.6-source-release.zip.md5 Thu Nov 17 11:12:22 2016 @@ -0,0 +1 @@ +5a560d4160aa3536ee1db5ebc8815dca \ No newline at end of file