[maven-site] 01/02: Link to more relevant docs, replace SVN with Git
This is an automated email from the ASF dual-hosted git repository.
mthmulders pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site.git
commit 39a35e37b852c673386832309673ece913ebcccf
Author: Maarten Mulders
AuthorDate: Mon Jul 13 10:40:07 2020 +0200
Link to more relevant docs, replace SVN with Git
---
content/apt/developers/welcome-to-new-committers.apt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/content/apt/developers/welcome-to-new-committers.apt
b/content/apt/developers/welcome-to-new-committers.apt
index 64ff3a6..ad1400d 100644
--- a/content/apt/developers/welcome-to-new-committers.apt
+++ b/content/apt/developers/welcome-to-new-committers.apt
@@ -53,9 +53,11 @@ Guide for new Maven committers
* {{{/guides/development/guide-maven-development.html}Guide to Maven
development}}
+ * {{{/developers/committer-environment.html}Setup your committer environment}}
+
[]
- And here are the specifics on setting up your SVN access:
+ And here are the specifics on setting up your Git access:
* {{{http://www.apache.org/dev/version-control.html}Apache's Source Code
Repository}}
[maven-site] branch master updated (bfdc0b2 -> cbf249c)
This is an automated email from the ASF dual-hosted git repository. mthmulders pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-site.git. from bfdc0b2 Exercising "Getting Started" gives BUILD FAILURE plus example output issues new 39a35e3 Link to more relevant docs, replace SVN with Git new cbf249c Fix formatting 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. Summary of changes: README.md| 2 +- content/apt/developers/welcome-to-new-committers.apt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-)
[maven-site] 02/02: Fix formatting
This is an automated email from the ASF dual-hosted git repository. mthmulders pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site.git commit cbf249c6b5a2e6d0b0db869246c28267e539c900 Author: Maarten Mulders AuthorDate: Mon Jul 13 10:40:23 2020 +0200 Fix formatting --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8179faa..631a2f0 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Additional Resources + [General GitHub documentation](https://help.github.com/) + [GitHub pull request documentation](https://help.github.com/send-pull-requests/) + [Apache Maven Twitter Account](https://twitter.com/ASFMavenProject) -+ #Maven IRC channel on freenode.org ++ "#Maven" IRC channel on freenode.org [jira]: https://issues.apache.org/jira/projects/MNGSITE/ [license]: https://www.apache.org/licenses/LICENSE-2.0
[maven-parent] branch master updated: Add Maarten Mulders as committer
This is an automated email from the ASF dual-hosted git repository. mthmulders pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-parent.git The following commit(s) were added to refs/heads/master by this push: new b9d6695 Add Maarten Mulders as committer b9d6695 is described below commit b9d669531d481712af39182270f1b9c2dc95e62f Author: Maarten Mulders AuthorDate: Mon Jul 13 11:20:58 2020 +0200 Add Maarten Mulders as committer --- pom.xml | 9 + 1 file changed, 9 insertions(+) diff --git a/pom.xml b/pom.xml index bbc0b26..a63ba7c 100644 --- a/pom.xml +++ b/pom.xml @@ -448,6 +448,15 @@ under the License. Europe/Amsterdam + mthmulders + Maarten Mulders + Info Support + +Committer + + Europe/Amsterdam + + mauro Mauro Talevi
[maven-parent] branch master updated: Add Apache.org email address for mthmulders
This is an automated email from the ASF dual-hosted git repository. mthmulders pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-parent.git The following commit(s) were added to refs/heads/master by this push: new 06ffe94 Add Apache.org email address for mthmulders 06ffe94 is described below commit 06ffe94cbf977decd262d98d85c15359eb828fe1 Author: Maarten Mulders AuthorDate: Mon Jul 13 11:25:06 2020 +0200 Add Apache.org email address for mthmulders --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index a63ba7c..e5f3f7b 100644 --- a/pom.xml +++ b/pom.xml @@ -450,6 +450,7 @@ under the License. mthmulders Maarten Mulders + mthmuld...@apache.org Info Support Committer
[maven-dependency-analyzer] branch master updated: remove reference to deprecated public mutable field (#15)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git
The following commit(s) were added to refs/heads/master by this push:
new 2e9e66f remove reference to deprecated public mutable field (#15)
2e9e66f is described below
commit 2e9e66ffb71bb0c7164738b7b6bd9471d5eec297
Author: Elliotte Rusty Harold
AuthorDate: Mon Jul 13 07:05:46 2020 -0400
remove reference to deprecated public mutable field (#15)
* remove reference to deprecated public mutable field
---
pom.xml | 6 ++
.../shared/dependency/analyzer/asm/DependencyClassFileVisitor.java | 6 --
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3b36466..9d41ad3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,6 +106,12 @@
${mavenVersion}
+ commons-io
+ commons-io
+ 2.6
+
+
+
org.apache.maven
maven-artifact
${mavenVersion}
diff --git
a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java
b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java
index 1c594ae..e0b41b0 100644
---
a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java
+++
b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java
@@ -19,6 +19,7 @@ package org.apache.maven.shared.dependency.analyzer.asm;
* under the License.
*/
+import org.apache.commons.io.IOUtils;
import org.apache.maven.shared.dependency.analyzer.ClassFileVisitor;
import org.objectweb.asm.AnnotationVisitor;
import org.objectweb.asm.ClassReader;
@@ -62,9 +63,10 @@ public class DependencyClassFileVisitor
{
try
{
-ClassReader reader = new ClassReader( in );
+byte[] byteCode = IOUtils.toByteArray( in );
+ClassReader reader = new ClassReader( byteCode );
-final Set constantPoolClassRefs =
ConstantPoolParser.getConstantPoolClassReferences( reader.b );
+final Set constantPoolClassRefs =
ConstantPoolParser.getConstantPoolClassReferences( byteCode );
for ( String string : constantPoolClassRefs )
{
resultCollector.addName( string );
[maven-site] branch master updated: [MNGSITE-408] Fix alignment of events logo Submitted by: David Pead
This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site.git The following commit(s) were added to refs/heads/master by this push: new b0731e3 [MNGSITE-408] Fix alignment of events logo Submitted by: David Pead new ad45e32 Merge pull request #178 from dpd73/bug/MNGSITE-408_Fix_alignment_of_events_logo b0731e3 is described below commit b0731e324dd3a008a803f7b92d18e58f4c8c4b1b Author: David Pead AuthorDate: Mon Jul 13 08:02:55 2020 +0100 [MNGSITE-408] Fix alignment of events logo Submitted by: David Pead o change events to float left --- content/xdoc/index.xml.vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/xdoc/index.xml.vm b/content/xdoc/index.xml.vm index d707d59..e55f030 100644 --- a/content/xdoc/index.xml.vm +++ b/content/xdoc/index.xml.vm @@ -129,7 +129,7 @@ under the License. https://www.apache.org/events/current-event.html";> - https://www.apache.org/events/current-event-234x60.png"; alt="Apache Events" style="vertical-align: text-top"/> + https://www.apache.org/events/current-event-234x60.png"; alt="Apache Events" style="float: left"/> You can also attend https://www.apache.org/events/current-event.html";>Apache Events: don't hesitate to ask on the Maven User mailing list if Maven team members will be there, it can be a great opportunity to meet them.
[maven-site] 01/01: small grammar improvements; add periods and fix run-on sentences
This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch punc in repository https://gitbox.apache.org/repos/asf/maven-site.git commit bb28d0547f13df0987fbde86fb509083b0544e1b Author: Elliotte Rusty Harold AuthorDate: Mon Jul 13 07:16:51 2020 -0400 small grammar improvements; add periods and fix run-on sentences --- content/xdoc/index.xml.vm | 23 +++ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/content/xdoc/index.xml.vm b/content/xdoc/index.xml.vm index e55f030..e88f195 100644 --- a/content/xdoc/index.xml.vm +++ b/content/xdoc/index.xml.vm @@ -37,7 +37,7 @@ under the License. If you think that Maven could help your project, you can find out more information in the "About Maven" -section of the navigation: this includes an in-depth description of what Maven is and +section of the navigation. This includes an in-depth description of what Maven is and a list of some of its main features. @@ -58,9 +58,9 @@ under the License. Information for those needing to build a project that uses Maven -Information for those wanting to use Maven to build their project, including a "10 minute test" that gives a -practical overview of Maven's main features in just 10 minutes and plugin list -for more information on each plugin +Information for developers using Maven to build their project, including a "10 minute test" that gives a +practical overview of Maven's main features and a plugin list +for more information on each plugin. @@ -70,12 +70,11 @@ under the License. -Information for those who want to provide a Maven plugin for shared -functionality or to accompany their own product or toolset +Information for developers writing Maven plugins. Information for those who may or may not use Maven, but are interested in getting project metadata into the -central repository +central repository. @@ -85,11 +84,11 @@ under the License. -Information if you'd like to get involved: Maven is an open source community and welcomes contributions. +Information if you'd like to get involved. Maven is an open source community and welcomes contributions. -Information for those who are currently developers, or who are interested -in contributing to the Maven project itself +Information for those who are currently Maven developers, or who are interested +in contributing to the Maven project itself. @@ -131,8 +130,8 @@ under the License. https://www.apache.org/events/current-event.html";> https://www.apache.org/events/current-event-234x60.png"; alt="Apache Events" style="float: left"/> -You can also attend https://www.apache.org/events/current-event.html";>Apache Events: don't hesitate to ask on the Maven User mailing list -if Maven team members will be there, it can be a great opportunity to meet them. +You can also attend https://www.apache.org/events/current-event.html";>Apache Events. Don't hesitate to ask on the Maven User mailing list +if Maven team members will be there. It can be a great opportunity to meet them.
[maven-site] branch punc created (now bb28d05)
This is an automated email from the ASF dual-hosted git repository. elharo pushed a change to branch punc in repository https://gitbox.apache.org/repos/asf/maven-site.git. at bb28d05 small grammar improvements; add periods and fix run-on sentences This branch includes the following new commits: new bb28d05 small grammar improvements; add periods and fix run-on sentences The 1 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.
[maven-site] 01/01: Merge pull request #179 from apache/punc
This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site.git commit 1012e9e41325148862a26bb185eb3116ab55b721 Merge: ad45e32 bb28d05 Author: Elliotte Rusty Harold AuthorDate: Mon Jul 13 08:03:30 2020 -0400 Merge pull request #179 from apache/punc small grammar improvements; add periods and fix run-on sentences content/xdoc/index.xml.vm | 23 +++ 1 file changed, 11 insertions(+), 12 deletions(-)
[maven-site] branch master updated (ad45e32 -> 1012e9e)
This is an automated email from the ASF dual-hosted git repository. elharo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-site.git. from ad45e32 Merge pull request #178 from dpd73/bug/MNGSITE-408_Fix_alignment_of_events_logo add bb28d05 small grammar improvements; add periods and fix run-on sentences new 1012e9e Merge pull request #179 from apache/punc The 1 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: content/xdoc/index.xml.vm | 23 +++ 1 file changed, 11 insertions(+), 12 deletions(-)
svn commit: r40452 - /release/maven/plugins/
Author: hboutemy Date: Mon Jul 13 15:09:07 2020 New Revision: 40452 Log: Maven WAR Plugin 3.3.1 released Added: release/maven/plugins/maven-war-plugin-3.3.1-source-release.zip (with props) release/maven/plugins/maven-war-plugin-3.3.1-source-release.zip.asc release/maven/plugins/maven-war-plugin-3.3.1-source-release.zip.sha512 Removed: release/maven/plugins/maven-war-plugin-3.3.0-source-release.zip release/maven/plugins/maven-war-plugin-3.3.0-source-release.zip.asc release/maven/plugins/maven-war-plugin-3.3.0-source-release.zip.sha512 Added: release/maven/plugins/maven-war-plugin-3.3.1-source-release.zip == Binary file - no diff available. Propchange: release/maven/plugins/maven-war-plugin-3.3.1-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/plugins/maven-war-plugin-3.3.1-source-release.zip.asc == --- release/maven/plugins/maven-war-plugin-3.3.1-source-release.zip.asc (added) +++ release/maven/plugins/maven-war-plugin-3.3.1-source-release.zip.asc Mon Jul 13 15:09:07 2020 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEE+nfc/vLubrLevt0sASV5Rk0BwGoFAl8IBo0ACgkQASV5Rk0B +wGpGpQf8CAjCrq0lbXSPopGNw0S2TPVzwoCDpqvaB+lUkrzW/u71Y8hkcMznnXwL +Wm7qujP7F/Iekm93I7tKwlLSL2l3meEDtGBmRlrOJcicxQcTgNtWQMthvzHDiS6H +GbSrfnLuNn/I7aMktfYgs9eao0Lev734KqEVC8O3ULbdMR3Y6pf/nUvEmv8YJS2+ +6zZN0yRXP4iriNbcWYYuhI6bIOdFeECOtU33LV/fKXlrPKM7aK5ayaPecU+E1/Jk +/eSfEALyPeDMQxYoaFb4rJaCpeO+CrP2Jq/Q903Yc0cMz1dBNgyFzCBkKxbf/O2o +poNaRRELFtRxZX9djCABcjjttSseHg== +=P3Sb +-END PGP SIGNATURE- Added: release/maven/plugins/maven-war-plugin-3.3.1-source-release.zip.sha512 == --- release/maven/plugins/maven-war-plugin-3.3.1-source-release.zip.sha512 (added) +++ release/maven/plugins/maven-war-plugin-3.3.1-source-release.zip.sha512 Mon Jul 13 15:09:07 2020 @@ -0,0 +1 @@ +d59079cc8b8fbc48d624be97806db9f1f9a42945735e57197ee80197275208f591cfc0fe5ed6b0c0576c76ece85a4b5e0b94cf84ab3cf4b69fc278d6cbfecc32 \ No newline at end of file
[maven-site] branch master updated: Maven WAR Plugin 3.3.1 released
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-site.git
The following commit(s) were added to refs/heads/master by this push:
new 4cd13a9 Maven WAR Plugin 3.3.1 released
4cd13a9 is described below
commit 4cd13a9aef9b507d648d504efcc5838cdffa60fd
Author: Hervé Boutemy
AuthorDate: Mon Jul 13 17:10:20 2020 +0200
Maven WAR Plugin 3.3.1 released
---
content/apt/plugins/index.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/apt/plugins/index.apt b/content/apt/plugins/index.apt
index 0186ee9..5bc3dac 100644
--- a/content/apt/plugins/index.apt
+++ b/content/apt/plugins/index.apt
@@ -95,7 +95,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-rar-plugin/} <<>>}} | B |
2.4 | 2014-09-08 | Build a RAR from the current project. |
{{{https://gitbox.apache.org/repos/asf/maven-rar-plugin.git}Git}} /
{{{https://github.com/apache/maven-rar-plugin/}GitHub}} |
{{{https://issues.apache.org/jira/browse/MRAR}Jira MRAR}}
*--++--++--+++
-| {{{/plugins/maven-war-plugin/} <<>>}} | B |
3.3.0| 2020-06-09 | Build a WAR from the current project. |
{{{https://gitbox.apache.org/repos/asf/maven-war-plugin.git}Git}} /
{{{https://github.com/apache/maven-war-plugin/}GitHub}} |
{{{https://issues.apache.org/jira/browse/MWAR}Jira MWAR}}
+| {{{/plugins/maven-war-plugin/} <<>>}} | B |
3.3.1| 2020-07-13 | Build a WAR from the current project. |
{{{https://gitbox.apache.org/repos/asf/maven-war-plugin.git}Git}} /
{{{https://github.com/apache/maven-war-plugin/}GitHub}} |
{{{https://issues.apache.org/jira/browse/MWAR}Jira MWAR}}
*--++--++--+++
| {{{/plugins/maven-acr-plugin/} <<>>}}| B |
3.1.0| 2018-06-19 | Build a JavaEE application client from the current
project. | {{{https://gitbox.apache.org/repos/asf/maven-acr-plugin.git}Git}} /
{{{https://github.com/apache/maven-acr-plugin/}GitHub}} |
{{{https://issues.apache.org/jira/browse/MACR}Jira MACR}}
*--++--++--+++
[maven-site] branch master updated: use Maven WAR Plugin 3.3.1
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-site.git
The following commit(s) were added to refs/heads/master by this push:
new 6bc98b3 use Maven WAR Plugin 3.3.1
6bc98b3 is described below
commit 6bc98b39430900808b1af4f2555835de387ae45b
Author: Hervé Boutemy
AuthorDate: Mon Jul 13 17:11:33 2020 +0200
use Maven WAR Plugin 3.3.1
---
content/apt/guides/mini/guide-reproducible-builds.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/apt/guides/mini/guide-reproducible-builds.apt
b/content/apt/guides/mini/guide-reproducible-builds.apt
index cce302f..3a5a814 100644
--- a/content/apt/guides/mini/guide-reproducible-builds.apt
+++ b/content/apt/guides/mini/guide-reproducible-builds.apt
@@ -135,7 +135,7 @@ Configuring for Reproducible Builds
*+---+--+
| {{{/plugins/maven-source-plugin/}maven-source-plugin}} |
3.2.1 |
*+---+--+
-| {{{/plugins/maven-war-plugin/}maven-war-plugin}} |
3.3.0 |
+| {{{/plugins/maven-war-plugin/}maven-war-plugin}} |
3.3.1 |
*+---+--+
|
{{{https://codehaus-plexus.github.io/plexus-containers/plexus-component-metadata/}plexus-component-metadata}}
| 2.1.0 |
*+---+--+
svn commit: r1879829 - in /maven/website/content: maven-site-1.0-site.jar plugins/index.html
Author: svn-site-role Date: Mon Jul 13 15:11:44 2020 New Revision: 1879829 Log: Site checkin for project Apache Maven Site Modified: maven/website/content/maven-site-1.0-site.jar maven/website/content/plugins/index.html Modified: maven/website/content/maven-site-1.0-site.jar == Binary files - no diff available. Modified: maven/website/content/plugins/index.html == --- maven/website/content/plugins/index.html (original) +++ maven/website/content/plugins/index.html Mon Jul 13 15:11:44 2020 @@ -267,8 +267,8 @@ Karl-Heinz Marbaise" /> war B -3.3.0 -2020-06-09 +3.3.1 +2020-07-13 Build a WAR from the current project. https://gitbox.apache.org/repos/asf/maven-war-plugin.git";>Git / https://github.com/apache/maven-war-plugin/";>GitHub https://issues.apache.org/jira/browse/MWAR";>Jira MWAR
[maven-site] 01/01: Add short guide "Working with Github pull requests"
This is an automated email from the ASF dual-hosted git repository.
mthmulders pushed a commit to branch add-github-pull-request-guide
in repository https://gitbox.apache.org/repos/asf/maven-site.git
commit 116d5b169b73155d9b56bdb4bb29d1c431f45caa
Author: Maarten Mulders
AuthorDate: Mon Jul 13 20:19:50 2020 +0200
Add short guide "Working with Github pull requests"
---
.../apt/developers/welcome-to-new-committers.apt | 2 +
.../markdown/developers/github-pull-requests.md| 73 ++
content/site.xml | 1 +
3 files changed, 76 insertions(+)
diff --git a/content/apt/developers/welcome-to-new-committers.apt
b/content/apt/developers/welcome-to-new-committers.apt
index ad1400d..c99826b 100644
--- a/content/apt/developers/welcome-to-new-committers.apt
+++ b/content/apt/developers/welcome-to-new-committers.apt
@@ -55,6 +55,8 @@ Guide for new Maven committers
* {{{/developers/committer-environment.html}Setup your committer environment}}
+ * {{{/developers/github-pull-requests.html}Working with pull requests on
Github}}
+
[]
And here are the specifics on setting up your Git access:
diff --git a/content/markdown/developers/github-pull-requests.md
b/content/markdown/developers/github-pull-requests.md
new file mode 100644
index 000..c604101
--- /dev/null
+++ b/content/markdown/developers/github-pull-requests.md
@@ -0,0 +1,73 @@
+
+
+## Working with Github pull requests
+
+In the past, patches would come in through JIRA in the form of a patch file.
+Nowadays, many contributors start with offering pull requests through
[Github](https://github.com/apache).
+This short guide describes how to properly integrate those contributions.
+
+1. Make sure your own copy of the repository is up-to-date with Gitbox.
+Also make sure your working copy is "clean" (you have no uncommitted changes
or unpushed commits).
+
+1. Pull requests may multiple commits.
+Fetch the whole pull request as a patch file from Github by appending `.patch`
to the pull request URL.
+Apply the pull request to your own copy using `git am whatever.patch`.
+
+1. Squash all commits in the pull request into one commit.
+[See below](#squashing-commits) for more details.
+
+1. Make sure the result still fixes the problem at hand.
+
+1. Finally, push the one squashed commit to the main branch on Gitbox.
+It will automatically be pushed to the corresponding branch on Github.
+
+1. Update administration:
+
+1. Close the Github pull request and thank the author for their
contribution.
+
+1. Also, close the accompanying JIRA ticket, referencing the commit hash
that contains the fix.
+
+### Squashing commits
+With `git status` you know how many commits to squash:
+
+On branch master
+Your branch is ahead of 'origin/master' by 6 commits.
+ (use "git push" to publish your local commits)
+
+Use that information to do an interactive rebase with `git rebase -i HEAD~6`.
+Here, 6 is the number of commits in the pull request.
+
+This opens up an editor (for example Vim) which a script.
+Each commit in the pull request is one line starting with `pick`.
+This means the commit should be used in the rebase.
+
+Edit **all but the first** lines by replacing `pick` with `s` or `squash`.
+A _squash_ uses the commit, but melds it into the previous commit.
+Save and quit the editor.
+
+Git will now execute the script you've written.
+For squashing, the editor opens again, this time to build the squashed commit.
+It will list all individual commits with their commit messages.
+The content should be self-explanatory.
+Edit the squashed commit, make sure the first line starts with a reference to
the JIRA issue, save and quit.
+
diff --git a/content/site.xml b/content/site.xml
index f2cef6b..c2ccfa6 100644
--- a/content/site.xml
+++ b/content/site.xml
@@ -185,6 +185,7 @@ under the License.
+
[maven-site] branch add-github-pull-request-guide created (now 116d5b1)
This is an automated email from the ASF dual-hosted git repository. mthmulders pushed a change to branch add-github-pull-request-guide in repository https://gitbox.apache.org/repos/asf/maven-site.git. at 116d5b1 Add short guide "Working with Github pull requests" This branch includes the following new commits: new 116d5b1 Add short guide "Working with Github pull requests" The 1 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.
[maven-archetype] annotated tag maven-archetype-3.2.0 created (now 9b3f568)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to annotated tag maven-archetype-3.2.0 in repository https://gitbox.apache.org/repos/asf/maven-archetype.git. at 9b3f568 (tag) tagging a3c15b9bc123b58605c81dbcad44d062cc2e8388 (commit) replaces maven-archetype-3.1.2 by Hervé Boutemy on Mon Jul 13 23:44:25 2020 +0200 - Log - [maven-release-plugin] copy for tag maven-archetype-3.2.0 --- No new revisions were added by this update.
[maven-archetype] branch master updated: [maven-release-plugin] prepare release maven-archetype-3.2.0
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-archetype.git The following commit(s) were added to refs/heads/master by this push: new a3c15b9 [maven-release-plugin] prepare release maven-archetype-3.2.0 a3c15b9 is described below commit a3c15b9bc123b58605c81dbcad44d062cc2e8388 Author: Hervé Boutemy AuthorDate: Mon Jul 13 23:44:12 2020 +0200 [maven-release-plugin] prepare release maven-archetype-3.2.0 --- archetype-common/pom.xml | 2 +- archetype-models/archetype-catalog/pom.xml| 2 +- archetype-models/archetype-descriptor/pom.xml | 2 +- archetype-models/pom.xml | 2 +- archetype-packaging/pom.xml | 2 +- maven-archetype-plugin/pom.xml| 2 +- pom.xml | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/archetype-common/pom.xml b/archetype-common/pom.xml index b9a3568..0743131 100644 --- a/archetype-common/pom.xml +++ b/archetype-common/pom.xml @@ -26,7 +26,7 @@ org.apache.maven.archetype maven-archetype -3.2.0-SNAPSHOT +3.2.0 archetype-common diff --git a/archetype-models/archetype-catalog/pom.xml b/archetype-models/archetype-catalog/pom.xml index c166ae1..2ef1e73 100644 --- a/archetype-models/archetype-catalog/pom.xml +++ b/archetype-models/archetype-catalog/pom.xml @@ -26,7 +26,7 @@ org.apache.maven.archetype archetype-models -3.2.0-SNAPSHOT +3.2.0 archetype-catalog diff --git a/archetype-models/archetype-descriptor/pom.xml b/archetype-models/archetype-descriptor/pom.xml index 10ef915..c37bd91 100644 --- a/archetype-models/archetype-descriptor/pom.xml +++ b/archetype-models/archetype-descriptor/pom.xml @@ -26,7 +26,7 @@ org.apache.maven.archetype archetype-models -3.2.0-SNAPSHOT +3.2.0 archetype-descriptor diff --git a/archetype-models/pom.xml b/archetype-models/pom.xml index 99b8d78..eef5072 100644 --- a/archetype-models/pom.xml +++ b/archetype-models/pom.xml @@ -26,7 +26,7 @@ org.apache.maven.archetype maven-archetype -3.2.0-SNAPSHOT +3.2.0 archetype-models diff --git a/archetype-packaging/pom.xml b/archetype-packaging/pom.xml index dc2f2ac..15fe36f 100644 --- a/archetype-packaging/pom.xml +++ b/archetype-packaging/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.archetype maven-archetype -3.2.0-SNAPSHOT +3.2.0 archetype-packaging diff --git a/maven-archetype-plugin/pom.xml b/maven-archetype-plugin/pom.xml index 8c03d99..7cac82b 100644 --- a/maven-archetype-plugin/pom.xml +++ b/maven-archetype-plugin/pom.xml @@ -26,7 +26,7 @@ org.apache.maven.archetype maven-archetype -3.2.0-SNAPSHOT +3.2.0
[maven-archetype] 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-archetype.git The following commit(s) were added to refs/heads/master by this push: new cb22c1c [maven-release-plugin] prepare for next development iteration cb22c1c is described below commit cb22c1c35b5729512285fd6e8966c81f081ec72b Author: Hervé Boutemy AuthorDate: Mon Jul 13 23:44:31 2020 +0200 [maven-release-plugin] prepare for next development iteration --- archetype-common/pom.xml | 2 +- archetype-models/archetype-catalog/pom.xml| 2 +- archetype-models/archetype-descriptor/pom.xml | 2 +- archetype-models/pom.xml | 2 +- archetype-packaging/pom.xml | 2 +- maven-archetype-plugin/pom.xml| 2 +- pom.xml | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/archetype-common/pom.xml b/archetype-common/pom.xml index 0743131..073c42d 100644 --- a/archetype-common/pom.xml +++ b/archetype-common/pom.xml @@ -26,7 +26,7 @@ org.apache.maven.archetype maven-archetype -3.2.0 +3.2.1-SNAPSHOT archetype-common diff --git a/archetype-models/archetype-catalog/pom.xml b/archetype-models/archetype-catalog/pom.xml index 2ef1e73..09376f3 100644 --- a/archetype-models/archetype-catalog/pom.xml +++ b/archetype-models/archetype-catalog/pom.xml @@ -26,7 +26,7 @@ org.apache.maven.archetype archetype-models -3.2.0 +3.2.1-SNAPSHOT archetype-catalog diff --git a/archetype-models/archetype-descriptor/pom.xml b/archetype-models/archetype-descriptor/pom.xml index c37bd91..571b263 100644 --- a/archetype-models/archetype-descriptor/pom.xml +++ b/archetype-models/archetype-descriptor/pom.xml @@ -26,7 +26,7 @@ org.apache.maven.archetype archetype-models -3.2.0 +3.2.1-SNAPSHOT archetype-descriptor diff --git a/archetype-models/pom.xml b/archetype-models/pom.xml index eef5072..2673186 100644 --- a/archetype-models/pom.xml +++ b/archetype-models/pom.xml @@ -26,7 +26,7 @@ org.apache.maven.archetype maven-archetype -3.2.0 +3.2.1-SNAPSHOT archetype-models diff --git a/archetype-packaging/pom.xml b/archetype-packaging/pom.xml index 15fe36f..e4e6c3b 100644 --- a/archetype-packaging/pom.xml +++ b/archetype-packaging/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.archetype maven-archetype -3.2.0 +3.2.1-SNAPSHOT archetype-packaging diff --git a/maven-archetype-plugin/pom.xml b/maven-archetype-plugin/pom.xml index 7cac82b..fd424c3 100644 --- a/maven-archetype-plugin/pom.xml +++ b/maven-archetype-plugin/pom.xml @@ -26,7 +26,7 @@ org.apache.maven.archetype maven-archetype -3.2.0 +3.2.1-SNAPSHOT
[maven-surefire] branch faster-queue updated: custom QueueSynchronizer instead of ReentrantLock+Semaphore+CyclicBarrier
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch faster-queue
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/faster-queue by this push:
new 78339d3 custom QueueSynchronizer instead of
ReentrantLock+Semaphore+CyclicBarrier
78339d3 is described below
commit 78339d3c7ff19bdb29d8761b720d88d65fd840ba
Author: tibordigana
AuthorDate: Tue Jul 14 02:22:31 2020 +0200
custom QueueSynchronizer instead of ReentrantLock+Semaphore+CyclicBarrier
---
.../output/ThreadedStreamConsumer.java | 50
.../output/ThreadedStreamConsumerTest.java | 129 +++--
2 files changed, 147 insertions(+), 32 deletions(-)
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
index 34d3a31..5e1968f 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
@@ -28,40 +28,34 @@ import javax.annotation.Nonnull;
import java.io.Closeable;
import java.io.IOException;
import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.Semaphore;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
-import static java.util.concurrent.TimeUnit.SECONDS;
-
/**
* Knows how to reconstruct *all* the state transmitted over stdout by the
forked process.
*
* @author Kristian Rosenvold
*/
public final class ThreadedStreamConsumer
-implements EventHandler, Closeable
+implements EventHandler, Closeable
{
private static final int QUEUE_MAX_ITEMS = 10_000;
private static final Event END_ITEM = new FinalEvent();
private final ConcurrentLinkedDeque queue = new
ConcurrentLinkedDeque<>();
-
private final ReentrantLock queueLock = new ReentrantLock();
-
private final Condition queueCondition = queueLock.newCondition();
-
+private final Semaphore producerBarrier = new Semaphore( 0 );
private final AtomicInteger queueSize = new AtomicInteger();
-
private final AtomicBoolean stop = new AtomicBoolean();
-
private final Thread thread;
-
private final Pumper pumper;
final class Pumper
-implements Runnable
+implements Runnable
{
private final EventHandler target;
@@ -86,9 +80,10 @@ public final class ThreadedStreamConsumer
@Override
public void run()
{
+queueLock.lock();
+//todo CyclicBarrier here
try
{
-queueLock.lock();
while ( !stop.get() || !queue.isEmpty() )
{
try
@@ -97,7 +92,8 @@ public final class ThreadedStreamConsumer
if ( item == null )
{
-queueCondition.await( 1L, SECONDS );
+queueCondition.await();
+producerBarrier.release();
continue;
}
else
@@ -145,6 +141,7 @@ public final class ThreadedStreamConsumer
@Override
public void handleEvent( @Nonnull Event event )
{
+//todo CyclicBarrier here
if ( stop.get() )
{
return;
@@ -156,17 +153,27 @@ public final class ThreadedStreamConsumer
}
int count = queueSize.get();
-if ( count == 0 || count >= QUEUE_MAX_ITEMS )
+boolean min = count == 0;
+boolean max = count >= QUEUE_MAX_ITEMS;
+if ( min || max )
{
+queueLock.lock();
try
{
-queueLock.lock();
-updateAndNotifyReader( event );
+queueSize.incrementAndGet();
+queue.addLast( event );
+producerBarrier.drainPermits();
+queueCondition.signal();
}
finally
{
queueLock.unlock();
}
+
+if ( max )
+{
+producerBarrier.acquireUninterruptibly();
+}
}
else
{
@@ -175,29 +182,24 @@ public final class ThreadedStreamConsumer
}
}
-private void updateAndNotifyReader( @Nonnull Event event )
-{
-queueSize.incrementAndGet();
-queue.addLast( event );
-queueCondition.signal();
-}
-
@Override
public void close()
-throws IOException
+
[maven-apache-parent] branch dependabot/maven/org.apache.maven.plugins-maven-war-plugin-3.3.1 created (now 9f8a64e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-war-plugin-3.3.1 in repository https://gitbox.apache.org/repos/asf/maven-apache-parent.git. at 9f8a64e Bump maven-war-plugin from 3.3.0 to 3.3.1 No new revisions were added by this update.
[maven-indexer] branch dependabot/maven/lucene.version-8.6.0 created (now 8b6ffd0)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/lucene.version-8.6.0 in repository https://gitbox.apache.org/repos/asf/maven-indexer.git. at 8b6ffd0 Bump lucene.version from 5.5.5 to 8.6.0 No new revisions were added by this update.
[maven-site] branch master updated: Disable the "Squash & Merge" button on Github
This is an automated email from the ASF dual-hosted git repository. mthmulders pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site.git The following commit(s) were added to refs/heads/master by this push: new 92dfb51 Disable the "Squash & Merge" button on Github 92dfb51 is described below commit 92dfb51904a06bfd2c89701f5d219128444601f3 Author: Maarten Mulders AuthorDate: Tue Jul 14 08:14:28 2020 +0200 Disable the "Squash & Merge" button on Github --- .asf.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.asf.yaml b/.asf.yaml index db406b9..1f74599 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -1,6 +1,8 @@ # see https://s.apache.org/asfyaml github: description: "Apache Maven site" + enabled_merge_buttons: +squash: false homepage: https://maven.apache.org/ labels: - apache
Error while running github feature from .asf.yaml in maven-site!
An error occurred while running github feature in .asf.yaml!:
422 {u'documentation_url': u'https://developer.github.com/v3/repos/#edit',
u'message': u'Validation Failed', u'errors': [{u'field':
u'merge_commit_allowed', u'message': u'Sorry, you need to allow at least one
merge strategy. (no_merge_method)', u'code': u'invalid', u'resource':
u'Repository'}]}
[maven-site] branch master updated: Enable "Merge" button on Github
This is an automated email from the ASF dual-hosted git repository. mthmulders pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site.git The following commit(s) were added to refs/heads/master by this push: new d244c16 Enable "Merge" button on Github d244c16 is described below commit d244c160ef6be7923f06a4a9d8dcad4e5c1b0692 Author: Maarten Mulders AuthorDate: Tue Jul 14 08:16:21 2020 +0200 Enable "Merge" button on Github --- .asf.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.asf.yaml b/.asf.yaml index 1f74599..87db6e1 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -3,6 +3,7 @@ github: description: "Apache Maven site" enabled_merge_buttons: squash: false +merge: true homepage: https://maven.apache.org/ labels: - apache
svn commit: r1879850 [2/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Modified: maven/website/content/docs/2.2.1/release-notes.html == --- maven/website/content/docs/2.2.1/release-notes.html (original) +++ maven/website/content/docs/2.2.1/release-notes.html Tue Jul 14 06:16:09 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml"; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/"; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 2.2.1 https://github.com/apache/maven-site/tree/master/content/apt/docs/2.2.1/release-notes.apt.vm";> -| Last Published: 2020-07-13 +| Last Published: 2020-07-14 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-3/release-notes.html == --- maven/website/content/docs/3.0-alpha-3/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-3/release-notes.html Tue Jul 14 06:16:09 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml"; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/"; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-3 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-3/release-notes.apt.vm";> -| Last Published: 2020-07-13 +| Last Published: 2020-07-14 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-4/release-notes.html == --- maven/website/content/docs/3.0-alpha-4/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-4/release-notes.html Tue Jul 14 06:16:09 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml"; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/"; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-4 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-4/release-notes.apt.vm";> -| Last Published: 2020-07-13 +| Last Published: 2020-07-14 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-5/release-notes.html == --- maven/website/content/docs/3.0-alpha-5/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-5/release-notes.html Tue Jul 14 06:16:09 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml"; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/"; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-5 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-5/release-notes.apt.vm";> -| Last Published: 2020-07-13 +| Last Published: 2020-07-14 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-6/release-notes.html == --- maven/website/content/docs/3.0-alpha-6/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-6/release-notes.html Tue Jul 14 06:16:09 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml"; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/"; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-6 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-6/release-notes.apt.vm";> -| Last Published: 2020-07-13 +| Last Published: 2020-07-14 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-7/release-notes.html == --- maven/website/content/docs/3.0-alpha-7/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-7/release-notes.html Tue Jul 14 06:16:09 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml"; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/"; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-7 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-7/release-notes.apt.vm";> -| Last Published: 2020-07-13 +| Last Published: 2020-07-14 | Get Sources Download Modified: maven/website/content/docs/3.0-beta-1/release-notes.html == --- maven/website/content/docs/3.0-beta-1/release-notes.html (original) +++ maven/website/content/docs/3.0-beta-1/release-notes.html Tue Jul 14 06:16:09 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml"; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/"; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-beta-1 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-beta-1/rel
svn commit: r1879850 [3/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Modified: maven/website/content/guides/getting-started/windows-prerequisites.html == --- maven/website/content/guides/getting-started/windows-prerequisites.html (original) +++ maven/website/content/guides/getting-started/windows-prerequisites.html Tue Jul 14 06:16:09 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml"; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/"; class="externalLink" title="Apache">Apache/ Maven/ Maven on Windows https://github.com/apache/maven-site/tree/master/content/apt/guides/getting-started/windows-prerequisites.apt";> -| Last Published: 2020-07-13 +| Last Published: 2020-07-14 | Get Sources Download Modified: maven/website/content/guides/index.html == --- maven/website/content/guides/index.html (original) +++ maven/website/content/guides/index.html Tue Jul 14 06:16:09 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml"; lang="en"> @@ -42,7 +42,7 @@ Eric Redmond" /> https://www.apache.org/"; class="externalLink" title="Apache">Apache/ Maven/ Maven Documentation https://github.com/apache/maven-site/tree/master/content/apt/guides/index.apt.vm";> -| Last Published: 2020-07-13 +| Last Published: 2020-07-14 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-archetypes.html == --- maven/website/content/guides/introduction/introduction-to-archetypes.html (original) +++ maven/website/content/guides/introduction/introduction-to-archetypes.html Tue Jul 14 06:16:09 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml"; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/"; class="externalLink" title="Apache">Apache/ Maven/ Introduction to Archetypes https://github.com/apache/maven-site/tree/master/content/apt/guides/introduction/introduction-to-archetypes.apt";> -| Last Published: 2020-07-13 +| Last Published: 2020-07-14 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-dependency-mechanism.html == --- maven/website/content/guides/introduction/introduction-to-dependency-mechanism.html (original) +++ maven/website/content/guides/introduction/introduction-to-dependency-mechanism.html Tue Jul 14 06:16:09 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml"; lang="en"> @@ -44,7 +44,7 @@ Karl Heinz Marbaise" /> https://www.apache.org/"; class="externalLink" title="Apache">Apache/ Maven/ Introduction to the Dependency Mechanism https://github.com/apache/maven-site/tree/master/content/apt/guides/introduction/introduction-to-dependency-mechanism.apt";> -| Last Published: 2020-07-13 +| Last Published: 2020-07-14 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html == --- maven/website/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html (original) +++ maven/website/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html Tue Jul 14 06:16:09 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml"; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/"; class="externalLink" title="Apache">Apache/ Maven/ Optional Dependencies and Dependency Exclusions https://github.com/apache/maven-site/tree/master/content/apt/guides/introduction/introduction-to-optional-and-excludes-dependencies.apt";> -| Last Published: 2020-07-13 +| Last Published: 2020-07-14 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-plugin-prefix-mapping.html == --- maven/website/content/guides/introduction/introduction-to-plugin-prefix-mapping.html (original) +++ maven/website/content/guides/introduction/introduction-to-plugin-prefix-mapping.html Tue Jul 14 06:16:09 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml"; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/"; class="externalLink" title="Apache">Apache/ Maven/ Introduction to Plugin Prefix Resolution https://github.com/apache/maven-site/tree/master/content/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt";> -| Last Published: 2020-07-13 +| Last Published: 2020-07-14 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-plugins.html =
svn commit: r1879850 [4/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Modified: maven/website/content/index.html == --- maven/website/content/index.html (original) +++ maven/website/content/index.html Tue Jul 14 06:16:09 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml"; lang="en"> @@ -42,7 +42,7 @@ https://www.apache.org/"; class="externalLink" title="Apache">Apache/ Maven/ Welcome to Apache Maven https://github.com/apache/maven-site/tree/master/content/xdoc/index.xml.vm";> -| Last Published: 2020-07-13 +| Last Published: 2020-07-14 | Get Sources Download Modified: maven/website/content/install.html == --- maven/website/content/install.html (original) +++ maven/website/content/install.html Tue Jul 14 06:16:09 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml"; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/"; class="externalLink" title="Apache">Apache/ Maven/ Installing Apache Maven https://github.com/apache/maven-site/tree/master/content/markdown/install.md.vm";> -| Last Published: 2020-07-13 +| Last Published: 2020-07-14 | Get Sources Download Modified: maven/website/content/issue-management.html == --- maven/website/content/issue-management.html (original) +++ maven/website/content/issue-management.html Tue Jul 14 06:16:09 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml"; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/"; class="externalLink" title="Apache">Apache/ Maven/ Overview https://github.com/apache/maven-site/tree/master/content/markdown/issue-management.md";> -| Last Published: 2020-07-13 +| Last Published: 2020-07-14 | Get Sources Download Modified: maven/website/content/mailing-lists.html == --- maven/website/content/mailing-lists.html (original) +++ maven/website/content/mailing-lists.html Tue Jul 14 06:16:09 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml"; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/"; class="externalLink" title="Apache">Apache/ Maven/ Project Mailing Lists -| Last Published: 2020-07-13 +| Last Published: 2020-07-14 | Get Sources Download Modified: maven/website/content/maven-1.x-eol.html == --- maven/website/content/maven-1.x-eol.html (original) +++ maven/website/content/maven-1.x-eol.html Tue Jul 14 06:16:09 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml"; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/"; class="externalLink" title="Apache">Apache/ Maven/ End Of Life Apache Maven 1.x https://github.com/apache/maven-site/tree/master/content/markdown/maven-1.x-eol.md";> -| Last Published: 2020-07-13 +| Last Published: 2020-07-14 | Get Sources Download Modified: maven/website/content/maven-2.x-eol.html == --- maven/website/content/maven-2.x-eol.html (original) +++ maven/website/content/maven-2.x-eol.html Tue Jul 14 06:16:09 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml"; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/"; class="externalLink" title="Apache">Apache/ Maven/ End Of Life Apache Maven 2.x https://github.com/apache/maven-site/tree/master/content/markdown/maven-2.x-eol.md";> -| Last Published: 2020-07-13 +| Last Published: 2020-07-14 | Get Sources Download Modified: maven/website/content/maven-ci-friendly.html == --- maven/website/content/maven-ci-friendly.html (original) +++ maven/website/content/maven-ci-friendly.html Tue Jul 14 06:16:09 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml"; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/"; class="externalLink" title="Apache">Apache/ Maven/ Maven CI Friendly Versions https://github.com/apache/maven-site/tree/master/content/markdown/maven-ci-friendly.md";> -| Last Published: 2020-07-13 +| Last Published: 2020-07-14 | Get Sources Download Modified: maven/website/content/maven-conventions.html == --- maven/website/content/maven-conventions.html (original) +++ maven/website/content/maven-conventions.html Tue Jul 14 06:16:09 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml"; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/"; class="externalLink" title="Apache">Apache/ Maven/ Maven Conventions https://github.com/apac
svn commit: r1879850 [1/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Author: svn-site-role Date: Tue Jul 14 06:16:09 2020 New Revision: 1879850 Log: Site checkin for project Apache Maven Site Modified: maven/website/content/about.html maven/website/content/aether.html maven/website/content/apache-resource-bundles/index.html maven/website/content/archives/maven-2.x/index.html maven/website/content/archives/maven-2.x/maven-2.1-architectural-goals.html maven/website/content/articles.html maven/website/content/background/history-of-maven.html maven/website/content/background/philosophy-of-maven.html maven/website/content/ci-management.html maven/website/content/code-quality-management.html maven/website/content/community.html maven/website/content/configure.html maven/website/content/developers/committer-environment.html maven/website/content/developers/committer-settings.html maven/website/content/developers/compatibility-plan.html maven/website/content/developers/conventions/code.html maven/website/content/developers/conventions/git.html maven/website/content/developers/conventions/jira.html maven/website/content/developers/dependency-policies.html maven/website/content/developers/index.html maven/website/content/developers/mojo-api-specification.html maven/website/content/developers/release/index.html maven/website/content/developers/release/maven-core-release.html maven/website/content/developers/release/maven-project-release-procedure.html maven/website/content/developers/release/parent-pom-release.html maven/website/content/developers/release/pmc-gpg-keys.html maven/website/content/developers/retirement-plan-plugins.html maven/website/content/developers/website/component-reference-documentation-helper.html maven/website/content/developers/website/deploy-component-reference-documentation.html maven/website/content/developers/website/deploy-maven-website.html maven/website/content/developers/website/index.html maven/website/content/developers/website/website-overview.html maven/website/content/developers/welcome-to-new-committers.html maven/website/content/docs/2.0.1/release-notes.html maven/website/content/docs/2.0.10/release-notes.html maven/website/content/docs/2.0.11/release-notes.html maven/website/content/docs/2.0.2/release-notes.html maven/website/content/docs/2.0.3/release-notes.html maven/website/content/docs/2.0.4/release-notes.html maven/website/content/docs/2.0.5/release-notes.html maven/website/content/docs/2.0.6/release-notes.html maven/website/content/docs/2.0.7/release-notes.html maven/website/content/docs/2.0.8/release-notes.html maven/website/content/docs/2.0.9/release-notes.html maven/website/content/docs/2.0/release-notes.html maven/website/content/docs/2.1.0/release-notes.html maven/website/content/docs/2.2.0/release-notes.html maven/website/content/docs/2.2.1/release-notes.html maven/website/content/docs/3.0-alpha-3/release-notes.html maven/website/content/docs/3.0-alpha-4/release-notes.html maven/website/content/docs/3.0-alpha-5/release-notes.html maven/website/content/docs/3.0-alpha-6/release-notes.html maven/website/content/docs/3.0-alpha-7/release-notes.html maven/website/content/docs/3.0-beta-1/release-notes.html maven/website/content/docs/3.0-beta-2/release-notes.html maven/website/content/docs/3.0-beta-3/release-notes.html maven/website/content/docs/3.0.1/release-notes.html maven/website/content/docs/3.0.2/release-notes.html maven/website/content/docs/3.0.3/release-notes.html maven/website/content/docs/3.0.4/release-notes.html maven/website/content/docs/3.0.5/release-notes.html maven/website/content/docs/3.0/release-notes.html maven/website/content/docs/3.1.0-alpha-1/release-notes.html maven/website/content/docs/3.1.0/release-notes.html maven/website/content/docs/3.1.1/release-notes.html maven/website/content/docs/3.2.1/release-notes.html maven/website/content/docs/3.2.2/release-notes.html maven/website/content/docs/3.2.3/release-notes.html maven/website/content/docs/3.2.5/release-notes.html maven/website/content/docs/3.3.1/release-notes.html maven/website/content/docs/3.3.3/release-notes.html maven/website/content/docs/3.3.9/release-notes.html maven/website/content/docs/3.5.0-alpha-1/release-notes.html maven/website/content/docs/3.5.0-beta-1/release-notes.html maven/website/content/docs/3.5.0/release-notes.html maven/website/content/docs/3.5.2/release-notes.html maven/website/content/docs/3.5.3/release-notes.html maven/website/content/docs/3.5.4/release-notes.html maven/website/content/docs/3.6.0/release-notes.html maven/website/content/docs/3.6.1/release-notes.html maven/website/content/docs/3.6.2/release-notes.html maven/website/content/docs/3.6.3/release-notes.html maven/website/content/docs/history.html ma
[maven-site] branch master updated: Revert enabling/disabling buttons on Github
This is an automated email from the ASF dual-hosted git repository. mthmulders pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site.git The following commit(s) were added to refs/heads/master by this push: new 79a08fb Revert enabling/disabling buttons on Github 79a08fb is described below commit 79a08fbc0a880751d6d3dda243d3c1c8de37d3ab Author: Maarten Mulders AuthorDate: Tue Jul 14 08:39:13 2020 +0200 Revert enabling/disabling buttons on Github --- .asf.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 87db6e1..db406b9 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -1,9 +1,6 @@ # see https://s.apache.org/asfyaml github: description: "Apache Maven site" - enabled_merge_buttons: -squash: false -merge: true homepage: https://maven.apache.org/ labels: - apache
