[maven-jlink-plugin] branch dependabot/maven/org.apache.maven.plugins-maven-site-plugin-3.12.1 created (now 53ed085)
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-site-plugin-3.12.1 in repository https://gitbox.apache.org/repos/asf/maven-jlink-plugin.git at 53ed085 Bump maven-site-plugin from 3.9.1 to 3.12.1 No new revisions were added by this update.
[maven-apache-parent] branch dependabot/maven/org.apache.maven.plugins-maven-site-plugin-3.12.1 created (now a05e144)
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-site-plugin-3.12.1 in repository https://gitbox.apache.org/repos/asf/maven-apache-parent.git at a05e144 Bump maven-site-plugin from 3.12.0 to 3.12.1 No new revisions were added by this update.
[maven-site] branch dependabot/maven/org.apache.maven.plugins-maven-site-plugin-3.12.1 created (now 2cc0aa49)
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-site-plugin-3.12.1 in repository https://gitbox.apache.org/repos/asf/maven-site.git at 2cc0aa49 Bump maven-site-plugin from 3.12.0 to 3.12.1 No new revisions were added by this update.
[maven-doxia] 01/01: [DOXIA-670] Remove code duplication in XdocSink
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch DOXIA-670
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit 0f1050179de8a9200fe394e5c97da4fefc19abec
Author: Michael Osipov
AuthorDate: Thu Aug 4 22:08:24 2022 +0200
[DOXIA-670] Remove code duplication in XdocSink
---
.../org/apache/maven/doxia/sink/impl/TextSink.java | 4 +-
.../apache/maven/doxia/module/xdoc/XdocSink.java | 143 -
.../maven/doxia/module/xdoc/XdocSinkTest.java | 19 ++-
.../doxia-module-xdoc/src/test/resources/test.xml | 4 +-
4 files changed, 17 insertions(+), 153 deletions(-)
diff --git
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/TextSink.java
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/TextSink.java
index b5a34f76..5ed83e75 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/TextSink.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/TextSink.java
@@ -968,7 +968,9 @@ public class TextSink
attributes.getAttribute( SinkEventAttributes.DECORATION
).toString() );
}
-write( "begin:verbatim, boxed: " + boxed );
+// TODO Cannot properly detect this when Xdoc is parsed, see DOXIA-670
+// write( "begin:verbatim, boxed: " + boxed );
+write( "begin:verbatim" );
}
@Override
diff --git
a/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
b/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
index de012612..61017a2d 100644
---
a/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
+++
b/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
@@ -49,9 +49,6 @@ public class XdocSink
// Instance fields
// --
-/** An indication on if we're inside a box (verbatim). */
-private boolean boxedFlag;
-
private String encoding;
private String languageId;
@@ -113,8 +110,6 @@ public class XdocSink
protected void init()
{
super.init();
-
-boxedFlag = false;
}
/**
@@ -382,119 +377,6 @@ public class XdocSink
//
// ---
-/**
- * {@inheritDoc}
- *
- * @see XdocMarkup#SOURCE_TAG
- * @see javax.swing.text.html.HTML.Tag#PRE
- * @param attributes a {@link
org.apache.maven.doxia.sink.SinkEventAttributes} object.
- */
-public void verbatim( SinkEventAttributes attributes )
-{
-setVerbatimFlag( true );
-
-MutableAttributeSet atts = SinkUtils.filterAttributes(
-attributes, SinkUtils.SINK_VERBATIM_ATTRIBUTES );
-
-
-if ( atts == null )
-{
-atts = new SinkEventAttributeSet();
-}
-
-boolean boxed = false;
-
-if ( atts.isDefined( SinkEventAttributes.DECORATION ) )
-{
-boxed = "boxed".equals( atts.getAttribute(
SinkEventAttributes.DECORATION ) );
-}
-
-boxedFlag = boxed;
-atts.removeAttribute( SinkEventAttributes.DECORATION );
-
-if ( boxed )
-{
-writeStartTag( SOURCE_TAG, atts );
-}
-else
-{
-atts.removeAttribute( Attribute.ALIGN.toString() );
-writeStartTag( PRE, atts );
-}
-}
-
-/**
- * {@inheritDoc}
- *
- * @see XdocMarkup#SOURCE_TAG
- * @see javax.swing.text.html.HTML.Tag#PRE
- */
-public void verbatim_()
-{
-if ( boxedFlag )
-{
-writeEndTag( SOURCE_TAG );
-}
-else
-{
-writeEndTag( PRE );
-}
-
-setVerbatimFlag( false );
-
-boxedFlag = false;
-}
-
-/**
- * The default align is center.
- *
- * {@inheritDoc}
- * @see javax.swing.text.html.HTML.Tag#TABLE
- */
-public void tableRows( int[] justification, boolean grid )
-{
-// similar to super.tableRows( justification, grid ) but without class.
-
-this.tableRows = true;
-
-setCellJustif( justification );
-
-if ( this.tableAttributes == null )
-{
-this.tableAttributes = new SinkEventAttributeSet( 0 );
-}
-
-MutableAttributeSet att = new SinkEventAttributeSet();
-
-if ( !tableAttributes.isDefined( Attribute.BORDER.toString() ) )
-{
-att.addAttribute( Attribute.BORDER, ( grid ? "1" : "0" ) );
-}
-
-att.addAttributes( tableAttributes );
-
-tableAttributes.removeAttributes( tableAttributes );
-
-writeStartTag( TABLE, att );
-}
-
-/**
- * The default valign is top.
- *
- * {@inheritDoc}
- *
- * @see javax.swing.text.html.HTML.Tag#TR
-
[maven-doxia] branch DOXIA-670 updated (22fdc617 -> 0f105017)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch DOXIA-670 in repository https://gitbox.apache.org/repos/asf/maven-doxia.git discard 22fdc617 [DOXIA-670] Remove code duplication in XdocSink new 0f105017 [DOXIA-670] Remove code duplication in XdocSink This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (22fdc617) \ N -- N -- N refs/heads/DOXIA-670 (0f105017) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 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: .../src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java | 5 - 1 file changed, 5 deletions(-)
[maven-doxia] 01/01: [DOXIA-670] Remove code duplication in XdocSink
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch DOXIA-670
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit 22fdc617993925fb3e4f788ef01336402d89dda8
Author: Michael Osipov
AuthorDate: Thu Aug 4 22:08:24 2022 +0200
[DOXIA-670] Remove code duplication in XdocSink
---
.../org/apache/maven/doxia/sink/impl/TextSink.java | 4 +-
.../apache/maven/doxia/module/xdoc/XdocSink.java | 138 -
.../maven/doxia/module/xdoc/XdocSinkTest.java | 19 +--
.../doxia-module-xdoc/src/test/resources/test.xml | 4 +-
4 files changed, 17 insertions(+), 148 deletions(-)
diff --git
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/TextSink.java
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/TextSink.java
index b5a34f76..5ed83e75 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/TextSink.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/TextSink.java
@@ -968,7 +968,9 @@ public class TextSink
attributes.getAttribute( SinkEventAttributes.DECORATION
).toString() );
}
-write( "begin:verbatim, boxed: " + boxed );
+// TODO Cannot properly detect this when Xdoc is parsed, see DOXIA-670
+// write( "begin:verbatim, boxed: " + boxed );
+write( "begin:verbatim" );
}
@Override
diff --git
a/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
b/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
index de012612..5634df22 100644
---
a/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
+++
b/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
@@ -382,119 +382,6 @@ public class XdocSink
//
// ---
-/**
- * {@inheritDoc}
- *
- * @see XdocMarkup#SOURCE_TAG
- * @see javax.swing.text.html.HTML.Tag#PRE
- * @param attributes a {@link
org.apache.maven.doxia.sink.SinkEventAttributes} object.
- */
-public void verbatim( SinkEventAttributes attributes )
-{
-setVerbatimFlag( true );
-
-MutableAttributeSet atts = SinkUtils.filterAttributes(
-attributes, SinkUtils.SINK_VERBATIM_ATTRIBUTES );
-
-
-if ( atts == null )
-{
-atts = new SinkEventAttributeSet();
-}
-
-boolean boxed = false;
-
-if ( atts.isDefined( SinkEventAttributes.DECORATION ) )
-{
-boxed = "boxed".equals( atts.getAttribute(
SinkEventAttributes.DECORATION ) );
-}
-
-boxedFlag = boxed;
-atts.removeAttribute( SinkEventAttributes.DECORATION );
-
-if ( boxed )
-{
-writeStartTag( SOURCE_TAG, atts );
-}
-else
-{
-atts.removeAttribute( Attribute.ALIGN.toString() );
-writeStartTag( PRE, atts );
-}
-}
-
-/**
- * {@inheritDoc}
- *
- * @see XdocMarkup#SOURCE_TAG
- * @see javax.swing.text.html.HTML.Tag#PRE
- */
-public void verbatim_()
-{
-if ( boxedFlag )
-{
-writeEndTag( SOURCE_TAG );
-}
-else
-{
-writeEndTag( PRE );
-}
-
-setVerbatimFlag( false );
-
-boxedFlag = false;
-}
-
-/**
- * The default align is center.
- *
- * {@inheritDoc}
- * @see javax.swing.text.html.HTML.Tag#TABLE
- */
-public void tableRows( int[] justification, boolean grid )
-{
-// similar to super.tableRows( justification, grid ) but without class.
-
-this.tableRows = true;
-
-setCellJustif( justification );
-
-if ( this.tableAttributes == null )
-{
-this.tableAttributes = new SinkEventAttributeSet( 0 );
-}
-
-MutableAttributeSet att = new SinkEventAttributeSet();
-
-if ( !tableAttributes.isDefined( Attribute.BORDER.toString() ) )
-{
-att.addAttribute( Attribute.BORDER, ( grid ? "1" : "0" ) );
-}
-
-att.addAttributes( tableAttributes );
-
-tableAttributes.removeAttributes( tableAttributes );
-
-writeStartTag( TABLE, att );
-}
-
-/**
- * The default valign is top.
- *
- * {@inheritDoc}
- *
- * @see javax.swing.text.html.HTML.Tag#TR
- */
-public void tableRow()
-{
-MutableAttributeSet att = new SinkEventAttributeSet();
-att.addAttribute( Attribute.VALIGN, "top" );
-
-writeStartTag( TR, att );
-
-setCellCount( 0 );
-}
-
/**
* close.
*/
@@ -505,31 +392,6 @@ public class XdocSink
init();
}
-/**
- * Adds a link with an optional target.
- *
- * @param name the link name.
- * @param target
[maven-doxia] branch DOXIA-670 updated (d4fa4717 -> 22fdc617)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch DOXIA-670 in repository https://gitbox.apache.org/repos/asf/maven-doxia.git discard d4fa4717 [DOXIA-670] Remove code duplication in XdocSink new 22fdc617 [DOXIA-670] Remove code duplication in XdocSink This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d4fa4717) \ N -- N -- N refs/heads/DOXIA-670 (22fdc617) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 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: doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/TextSink.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven-doxia] 01/01: [DOXIA-670] Remove code duplication in XdocSink
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch DOXIA-670
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit d4fa4717b21dcb5c881e58316d03e75cccff600b
Author: Michael Osipov
AuthorDate: Thu Aug 4 22:08:24 2022 +0200
[DOXIA-670] Remove code duplication in XdocSink
---
.../org/apache/maven/doxia/sink/impl/TextSink.java | 4 +-
.../apache/maven/doxia/module/xdoc/XdocSink.java | 138 -
.../maven/doxia/module/xdoc/XdocSinkTest.java | 19 +--
.../doxia-module-xdoc/src/test/resources/test.xml | 4 +-
4 files changed, 17 insertions(+), 148 deletions(-)
diff --git
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/TextSink.java
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/TextSink.java
index b5a34f76..f1455451 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/TextSink.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/TextSink.java
@@ -968,7 +968,9 @@ public class TextSink
attributes.getAttribute( SinkEventAttributes.DECORATION
).toString() );
}
-write( "begin:verbatim, boxed: " + boxed );
+// TODO Cannot properly detect this when Xdoc is parsed
+// write( "begin:verbatim, boxed: " + boxed );
+write( "begin:verbatim" );
}
@Override
diff --git
a/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
b/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
index de012612..5634df22 100644
---
a/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
+++
b/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
@@ -382,119 +382,6 @@ public class XdocSink
//
// ---
-/**
- * {@inheritDoc}
- *
- * @see XdocMarkup#SOURCE_TAG
- * @see javax.swing.text.html.HTML.Tag#PRE
- * @param attributes a {@link
org.apache.maven.doxia.sink.SinkEventAttributes} object.
- */
-public void verbatim( SinkEventAttributes attributes )
-{
-setVerbatimFlag( true );
-
-MutableAttributeSet atts = SinkUtils.filterAttributes(
-attributes, SinkUtils.SINK_VERBATIM_ATTRIBUTES );
-
-
-if ( atts == null )
-{
-atts = new SinkEventAttributeSet();
-}
-
-boolean boxed = false;
-
-if ( atts.isDefined( SinkEventAttributes.DECORATION ) )
-{
-boxed = "boxed".equals( atts.getAttribute(
SinkEventAttributes.DECORATION ) );
-}
-
-boxedFlag = boxed;
-atts.removeAttribute( SinkEventAttributes.DECORATION );
-
-if ( boxed )
-{
-writeStartTag( SOURCE_TAG, atts );
-}
-else
-{
-atts.removeAttribute( Attribute.ALIGN.toString() );
-writeStartTag( PRE, atts );
-}
-}
-
-/**
- * {@inheritDoc}
- *
- * @see XdocMarkup#SOURCE_TAG
- * @see javax.swing.text.html.HTML.Tag#PRE
- */
-public void verbatim_()
-{
-if ( boxedFlag )
-{
-writeEndTag( SOURCE_TAG );
-}
-else
-{
-writeEndTag( PRE );
-}
-
-setVerbatimFlag( false );
-
-boxedFlag = false;
-}
-
-/**
- * The default align is center.
- *
- * {@inheritDoc}
- * @see javax.swing.text.html.HTML.Tag#TABLE
- */
-public void tableRows( int[] justification, boolean grid )
-{
-// similar to super.tableRows( justification, grid ) but without class.
-
-this.tableRows = true;
-
-setCellJustif( justification );
-
-if ( this.tableAttributes == null )
-{
-this.tableAttributes = new SinkEventAttributeSet( 0 );
-}
-
-MutableAttributeSet att = new SinkEventAttributeSet();
-
-if ( !tableAttributes.isDefined( Attribute.BORDER.toString() ) )
-{
-att.addAttribute( Attribute.BORDER, ( grid ? "1" : "0" ) );
-}
-
-att.addAttributes( tableAttributes );
-
-tableAttributes.removeAttributes( tableAttributes );
-
-writeStartTag( TABLE, att );
-}
-
-/**
- * The default valign is top.
- *
- * {@inheritDoc}
- *
- * @see javax.swing.text.html.HTML.Tag#TR
- */
-public void tableRow()
-{
-MutableAttributeSet att = new SinkEventAttributeSet();
-att.addAttribute( Attribute.VALIGN, "top" );
-
-writeStartTag( TR, att );
-
-setCellCount( 0 );
-}
-
/**
* close.
*/
@@ -505,31 +392,6 @@ public class XdocSink
init();
}
-/**
- * Adds a link with an optional target.
- *
- * @param name the link name.
- * @param target the link
[maven-doxia] branch DOXIA-670 created (now d4fa4717)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch DOXIA-670 in repository https://gitbox.apache.org/repos/asf/maven-doxia.git at d4fa4717 [DOXIA-670] Remove code duplication in XdocSink This branch includes the following new commits: new d4fa4717 [DOXIA-670] Remove code duplication in XdocSink 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-doxia] branch DOXIA-668 updated: Pass rather null
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch DOXIA-668
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
The following commit(s) were added to refs/heads/DOXIA-668 by this push:
new ab15f5b4 Pass rather null
ab15f5b4 is described below
commit ab15f5b409af3abd97f776163b3d16a0bc240175
Author: Michael Osipov
AuthorDate: Thu Aug 4 20:47:42 2022 +0200
Pass rather null
---
.../src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java
b/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java
index 8e9cbab4..a6e7918c 100644
---
a/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java
+++
b/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java
@@ -1218,7 +1218,7 @@ public class Xhtml5BaseParser
{
grid = true;
}
-sink.tableRows( new int[0], grid );
+sink.tableRows( null, grid );
}
}
[maven-help-plugin] branch MPH-189 updated: WIP.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MPH-189
in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git
The following commit(s) were added to refs/heads/MPH-189 by this push:
new 4be1283 WIP.
4be1283 is described below
commit 4be128384ada9507dc0aa4074f0ffd9b061efd14
Author: Karl Heinz Marbaise
AuthorDate: Thu Aug 4 21:19:47 2022 +0200
WIP.
---
src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java | 4 ++--
src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java | 2 +-
src/main/java/org/apache/maven/plugins/help/SystemMojo.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java
b/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java
index 801f667..06cd1a5 100644
--- a/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java
+++ b/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java
@@ -116,9 +116,9 @@ public abstract class AbstractHelpMojo
@Parameter( property = "output" )
protected File output;
-protected static String formatMillis( long millis )
+protected static String formatCurrentMillis( )
{
-ZonedDateTime zonedDateTime = ZonedDateTime.ofInstant(
Instant.ofEpochMilli( millis ),
+ZonedDateTime zonedDateTime = ZonedDateTime.ofInstant(
Instant.ofEpochMilli( System.currentTimeMillis() ),
ZoneId.from( ZoneOffset.UTC ) );
return DATE_TIME_FORMATTER.format( zonedDateTime );
}
diff --git
a/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
b/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
index 7cdfda4..996044a 100644
--- a/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
@@ -68,7 +68,7 @@ public class ActiveProfilesMojo
{
StringBuilder sb = new StringBuilder();
sb.append( "Created by: " ).append( getClass().getName() ).append(
LS );
-sb.append( "Created on: " ).append( formatMillis(
System.currentTimeMillis() ) ).append( LS ).append( LS );
+sb.append( "Created on: " ).append( formatCurrentMillis()
).append( LS ).append( LS );
sb.append( message );
try
diff --git a/src/main/java/org/apache/maven/plugins/help/SystemMojo.java
b/src/main/java/org/apache/maven/plugins/help/SystemMojo.java
index 970995a..703d639 100644
--- a/src/main/java/org/apache/maven/plugins/help/SystemMojo.java
+++ b/src/main/java/org/apache/maven/plugins/help/SystemMojo.java
@@ -93,7 +93,7 @@ public class SystemMojo
{
StringBuilder sb = new StringBuilder();
sb.append( "Created by: " ).append( getClass().getName() ).append(
LS );
-sb.append( "Created on: " ).append( formatMillis(
System.currentTimeMillis() ) ).append( LS ).append( LS );
+sb.append( "Created on: " ).append( formatCurrentMillis()
).append( LS ).append( LS );
sb.append( message.toString() );
try
[maven-help-plugin] 01/01: WIP.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MPH-189
in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git
commit f6d41812b9bb7df8f6b962fff0a5a5f198b9df1e
Author: Karl Heinz Marbaise
AuthorDate: Thu Aug 4 21:08:42 2022 +0200
WIP.
---
.../apache/maven/plugins/help/AbstractHelpMojo.java | 19 +--
.../apache/maven/plugins/help/ActiveProfilesMojo.java | 7 ++-
.../org/apache/maven/plugins/help/SystemMojo.java | 11 ---
.../maven/plugins/help/ActiveProfilesMojoTest.java| 2 +-
4 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java
b/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java
index 0f079ff..801f667 100644
--- a/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java
+++ b/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java
@@ -46,6 +46,11 @@ import org.eclipse.aether.resolution.ArtifactRequest;
import java.io.File;
import java.io.IOException;
import java.io.Writer;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.List;
/**
@@ -61,8 +66,11 @@ public abstract class AbstractHelpMojo
protected static final int LINE_LENGTH = 79;
/** The line separator for the current OS. */
-protected static final String LS = System.getProperty( "line.separator" );
-
+protected static final String LS = System.lineSeparator();
+
+protected static final DateTimeFormatter DATE_TIME_FORMATTER =
+DateTimeFormatter.ofPattern( "-MM-dd'T'HH:mm:ssx" );
+
/**
* Maven Project Builder component.
*/
@@ -108,6 +116,13 @@ public abstract class AbstractHelpMojo
@Parameter( property = "output" )
protected File output;
+protected static String formatMillis( long millis )
+{
+ZonedDateTime zonedDateTime = ZonedDateTime.ofInstant(
Instant.ofEpochMilli( millis ),
+ZoneId.from( ZoneOffset.UTC ) );
+return DATE_TIME_FORMATTER.format( zonedDateTime );
+}
+
/**
* Utility method to write a content in a given file.
*
diff --git
a/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
b/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
index 326ee9c..7cdfda4 100644
--- a/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
@@ -23,7 +23,6 @@ import java.io.IOException;
import java.util.List;
import java.util.Map;
-import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@@ -67,12 +66,10 @@ public class ActiveProfilesMojo
if ( output != null )
{
-String formattedDateTime =
DateFormatUtils.ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT
-.format( System.currentTimeMillis() );
StringBuilder sb = new StringBuilder();
sb.append( "Created by: " ).append( getClass().getName() ).append(
LS );
-sb.append( "Created on: " ).append( formattedDateTime ).append( LS
).append( LS );
-sb.append( message.toString() );
+sb.append( "Created on: " ).append( formatMillis(
System.currentTimeMillis() ) ).append( LS ).append( LS );
+sb.append( message );
try
{
diff --git a/src/main/java/org/apache/maven/plugins/help/SystemMojo.java
b/src/main/java/org/apache/maven/plugins/help/SystemMojo.java
index 85973e9..970995a 100644
--- a/src/main/java/org/apache/maven/plugins/help/SystemMojo.java
+++ b/src/main/java/org/apache/maven/plugins/help/SystemMojo.java
@@ -19,15 +19,14 @@ package org.apache.maven.plugins.help;
* under the License.
*/
-import org.apache.commons.lang3.time.DateFormatUtils;
+import java.io.IOException;
+import java.util.Properties;
+
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Mojo;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.cli.CommandLineUtils;
-import java.io.IOException;
-import java.util.Properties;
-
/**
* Displays a list of the platform details like system properties and
environment variables.
*
@@ -92,11 +91,9 @@ public class SystemMojo
if ( output != null )
{
-String formattedDateTime =
DateFormatUtils.ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT
-.format( System.currentTimeMillis() );
StringBuilder sb = new StringBuilder();
sb.append( "Created by: " ).append( getClass().getName() ).append(
LS );
-sb.append( "Created on: "
[maven-help-plugin] branch MPH-189 created (now f6d4181)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MPH-189 in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git at f6d4181 WIP. This branch includes the following new commits: new f6d4181 WIP. 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-doxia] branch DOXIA-668 updated: Try with table border
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch DOXIA-668
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
The following commit(s) were added to refs/heads/DOXIA-668 by this push:
new e7254b3c Try with table border
e7254b3c is described below
commit e7254b3ccb3c58460d6d0d87851a66fcad9f607b
Author: Michael Osipov
AuthorDate: Thu Aug 4 20:42:47 2022 +0200
Try with table border
---
.../apache/maven/doxia/parser/Xhtml5BaseParser.java | 20 ++--
.../apache/maven/doxia/sink/impl/Xhtml5BaseSink.java | 5 +++--
.../maven/doxia/parser/Xhtml5BaseParserTest.java | 4 ++--
.../maven/doxia/module/xhtml5/Xhtml5SinkTest.java| 4 ++--
.../src/test/resources/test.xhtml| 2 +-
5 files changed, 26 insertions(+), 9 deletions(-)
diff --git
a/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java
b/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java
index 203cc2f8..8e9cbab4 100644
---
a/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java
+++
b/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java
@@ -21,6 +21,7 @@ package org.apache.maven.doxia.parser;
import java.io.Reader;
import java.util.Stack;
+import java.util.regex.Pattern;
import javax.swing.text.html.HTML.Attribute;
@@ -46,6 +47,10 @@ public class Xhtml5BaseParser
{
private static final Logger LOGGER = LoggerFactory.getLogger(
Xhtml5BaseParser.class );
+/** Used to identify if a class string contains `bodyTableBorder` */
+private static final Pattern BODYTABLEBORDER_CLASS_PATTERN =
+Pattern.compile( "(?:.*\\s|^)bodyTableBorder(?:\\s.*|$)" );
+
/**
* True if a script/script or style/style
block is read. CDATA sections within are
* handled as rawText.
@@ -389,8 +394,7 @@ public class Xhtml5BaseParser
}
else if ( parser.getName().equals( HtmlMarkup.TABLE.toString() ) )
{
-sink.table( attribs );
-sink.tableRows( new int[0], false );
+handleTableStart( sink, attribs, parser );
}
else if ( parser.getName().equals( HtmlMarkup.TR.toString() ) )
{
@@ -1205,4 +1209,16 @@ public class Xhtml5BaseParser
sink.section_( sectionLevel-- );
}
+private void handleTableStart( Sink sink, SinkEventAttributeSet attribs,
XmlPullParser parser )
+{
+sink.table( attribs );
+String givenTableClass = parser.getAttributeValue( null,
Attribute.CLASS.toString() );
+boolean grid = false;
+if ( givenTableClass != null && BODYTABLEBORDER_CLASS_PATTERN.matcher(
givenTableClass ).matches() )
+{
+grid = true;
+}
+sink.tableRows( new int[0], grid );
+}
+
}
diff --git
a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
index f0c814c1..d8ccda0f 100644
---
a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
+++
b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
@@ -1374,7 +1374,8 @@ public class Xhtml5BaseSink
/**
* The default class style is bodyTable.
- * Note: both parameters are ignored because they have been superseded by
CSS in HTML5.
+ *
+ * @param grid if {@code true} the default class {@code bodyTableBorder}
will be added
*
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#TABLE
@@ -1386,7 +1387,7 @@ public class Xhtml5BaseSink
if ( !this.tableAttributes.isDefined( Attribute.CLASS.toString() ) )
{
-att.addAttribute( Attribute.CLASS, "bodyTable" );
+att.addAttribute( Attribute.CLASS, "bodyTable" + ( grid ? "
bodyTableBorder" : "" ) );
}
att.addAttributes( this.tableAttributes );
diff --git
a/doxia-core/src/test/java/org/apache/maven/doxia/parser/Xhtml5BaseParserTest.java
b/doxia-core/src/test/java/org/apache/maven/doxia/parser/Xhtml5BaseParserTest.java
index 05c073f4..895388c8 100644
---
a/doxia-core/src/test/java/org/apache/maven/doxia/parser/Xhtml5BaseParserTest.java
+++
b/doxia-core/src/test/java/org/apache/maven/doxia/parser/Xhtml5BaseParserTest.java
@@ -160,7 +160,7 @@ public class Xhtml5BaseParserTest
{
// TODO: table caption, see DOXIA-177
-String text = "Headercell";
+String text =
"Headercell";
parser.parse( text, sink );
@@ -797,7 +797,7 @@ public class Xhtml5BaseParserTest
public void testAttributeEntities()
throws Exception
{
-String text = "http://ex.com/ex.js?v=l&l=e\";>";
+String text = "http://ex.com/ex.js?v=l&l=e\";>";
parser.parse( text, sink );
diff --git
[maven-doxia] 01/01: [DOXIA-668] Remove all obsolete attributes in HTML5
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch DOXIA-668
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit c403d7f478ec090736681c43e99f51ec28e5c74b
Author: Michael Osipov
AuthorDate: Tue Aug 2 17:06:50 2022 +0200
[DOXIA-668] Remove all obsolete attributes in HTML5
This closes #114
---
.../maven/doxia/parser/Xhtml5BaseParser.java | 45 +-
.../apache/maven/doxia/sink/impl/SinkUtils.java| 29 ++--
.../maven/doxia/sink/impl/Xhtml5BaseSink.java | 151 +
.../maven/doxia/parser/Xhtml5BaseParserTest.java | 4 +-
.../maven/doxia/sink/impl/Xhtml5BaseSinkTest.java | 29 ++--
.../apache/maven/doxia/module/fml/FmlParser.java | 4 +-
.../apache/maven/doxia/module/xdoc/XdocSink.java | 19 ---
.../maven/doxia/module/xdoc/XdocSinkTest.java | 8 +-
.../src/test/resources/test.xhtml | 30 ++--
9 files changed, 53 insertions(+), 266 deletions(-)
diff --git
a/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java
b/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java
index 6672f280..203cc2f8 100644
---
a/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java
+++
b/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java
@@ -389,7 +389,8 @@ public class Xhtml5BaseParser
}
else if ( parser.getName().equals( HtmlMarkup.TABLE.toString() ) )
{
-handleTableStart( sink, attribs, parser );
+sink.table( attribs );
+sink.tableRows( new int[0], false );
}
else if ( parser.getName().equals( HtmlMarkup.TR.toString() ) )
{
@@ -632,7 +633,6 @@ public class Xhtml5BaseParser
else if ( parser.getName().equals( HtmlMarkup.TABLE.toString() ) )
{
sink.tableRows_();
-
sink.table_();
}
else if ( parser.getName().equals( HtmlMarkup.TR.toString() ) )
@@ -1044,22 +1044,12 @@ public class Xhtml5BaseParser
}
else
{
-String name = parser.getAttributeValue( null,
Attribute.NAME.toString() );
-
-if ( name != null )
+String id = parser.getAttributeValue( null,
Attribute.ID.toString() );
+if ( id != null )
{
-sink.anchor( validAnchor( name ), attribs );
+sink.anchor( validAnchor( id ), attribs );
isAnchor = true;
}
-else
-{
-String id = parser.getAttributeValue( null,
Attribute.ID.toString() );
-if ( id != null )
-{
-sink.anchor( validAnchor( id ), attribs );
-isAnchor = true;
-}
-}
}
}
@@ -1215,29 +1205,4 @@ public class Xhtml5BaseParser
sink.section_( sectionLevel-- );
}
-private void handleTableStart( Sink sink, SinkEventAttributeSet attribs,
XmlPullParser parser )
-{
-sink.table( attribs );
-String border = parser.getAttributeValue( null,
Attribute.BORDER.toString() );
-boolean grid = true;
-
-if ( border == null || "0".equals( border ) )
-{
-grid = false;
-}
-
-String align = parser.getAttributeValue( null,
Attribute.ALIGN.toString() );
-int[] justif = {Sink.JUSTIFY_LEFT};
-
-if ( "center".equals( align ) )
-{
-justif[0] = Sink.JUSTIFY_CENTER;
-}
-else if ( "right".equals( align ) )
-{
-justif[0] = Sink.JUSTIFY_RIGHT;
-}
-
-sink.tableRows( justif, grid );
-}
}
diff --git
a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/SinkUtils.java
b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/SinkUtils.java
index f1c1ede4..87d405f1 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/SinkUtils.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/SinkUtils.java
@@ -103,54 +103,41 @@ public class SinkUtils
private static final String[] IMG_ATTRIBUTES =
{
-SinkEventAttributes.ALIGN, SinkEventAttributes.ALT,
SinkEventAttributes.BORDER,
-SinkEventAttributes.HEIGHT, SinkEventAttributes.HSPACE,
SinkEventAttributes.ISMAP,
-SinkEventAttributes.SRC, SinkEventAttributes.USEMAP,
SinkEventAttributes.VSPACE,
-SinkEventAttributes.WIDTH
+SinkEventAttributes.ALT, SinkEventAttributes.HEIGHT,
SinkEventAttributes.ISMAP,
+SinkEventAttributes.SRC, SinkEventAttributes.WIDTH
};
private static final String[] HR_ATTRIBUTES =
{
-SinkEventAttributes.ALIGN, SinkEventAttributes.NOSHADE,
SinkEventAttributes.SIZE,
-SinkEventAttributes.WIDTH
};
private static final String[] LINK_ATTRIBUTES =
{
-
[maven-doxia] branch DOXIA-668 updated (a711243d -> c403d7f4)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch DOXIA-668
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
omit a711243d [DOXIA-668] Remove all obsolete attributes in HTML5
add 4201a482 Fix dependabot fallout
add 3b1499d0 [DOXIA-669] Improve/rework CachedFileEntityResolver
new c403d7f4 [DOXIA-668] Remove all obsolete attributes in HTML5
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (a711243d)
\
N -- N -- N refs/heads/DOXIA-668 (c403d7f4)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 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:
.../maven/doxia/parser/AbstractXmlParser.java | 107 +++-
.../org/apache/maven/doxia/util/XmlValidator.java | 1 +
doxia-core/src/main/resources/xml.xsd | 286 +
.../apache/maven/doxia/util/XmlValidatorTest.java | 4 +-
doxia-core/src/test/resources/test.xhtml | 96 ---
.../src/test/resources/test.xml| 2 +-
.../doxia-module-fml/src/test/resources/macro.fml | 96 +++
.../src/test/resources/simpleFaq.fml | 2 +-
.../doxia-module-fml/src/test/resources/test.fml | 2 +-
.../src/main/resources/xdoc-2.0.xsd| 2 +-
.../doxia-module-xdoc/src/test/resources/macro.xml | 2 +-
.../src/test/resources/report.xml | 2 +-
.../doxia-module-xdoc/src/test/resources/test.xml | 2 +-
.../doxia-module-xdoc/src/test/resources/toc.xml | 2 +-
.../src/test/resources/test.xhtml | 1 -
pom.xml| 11 +
16 files changed, 443 insertions(+), 175 deletions(-)
create mode 100644 doxia-core/src/main/resources/xml.xsd
copy {doxia-modules/doxia-module-xdoc =>
doxia-core}/src/test/resources/test.xml (97%)
[maven-doxia] branch master updated: [DOXIA-669] Improve/rework CachedFileEntityResolver
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
The following commit(s) were added to refs/heads/master by this push:
new 3b1499d0 [DOXIA-669] Improve/rework CachedFileEntityResolver
3b1499d0 is described below
commit 3b1499d0572718fa4dcb7c6b775bedbe757d46c5
Author: Michael Osipov
AuthorDate: Tue Aug 2 20:54:38 2022 +0200
[DOXIA-669] Improve/rework CachedFileEntityResolver
This closes #115
---
.../maven/doxia/parser/AbstractXmlParser.java | 107 +++-
.../org/apache/maven/doxia/util/XmlValidator.java | 1 +
doxia-core/src/main/resources/xml.xsd | 286 +
.../apache/maven/doxia/util/XmlValidatorTest.java | 4 +-
doxia-core/src/test/resources/test.xhtml | 96 ---
.../src/test/resources/test.xml| 2 +-
.../doxia-module-fml/src/test/resources/macro.fml | 96 +++
.../src/test/resources/simpleFaq.fml | 2 +-
.../doxia-module-fml/src/test/resources/test.fml | 2 +-
.../src/main/resources/xdoc-2.0.xsd| 2 +-
.../doxia-module-xdoc/src/test/resources/macro.xml | 2 +-
.../src/test/resources/report.xml | 2 +-
.../doxia-module-xdoc/src/test/resources/test.xml | 2 +-
.../doxia-module-xdoc/src/test/resources/toc.xml | 2 +-
.../src/test/resources/test.xhtml | 1 -
pom.xml| 1 +
16 files changed, 433 insertions(+), 175 deletions(-)
diff --git
a/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
b/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
index 61363bbd..1cf38ad6 100644
---
a/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
+++
b/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
@@ -21,17 +21,16 @@ package org.apache.maven.doxia.parser;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import java.io.Reader;
import java.io.StringReader;
+import java.net.URI;
import java.net.URL;
+import java.nio.file.Paths;
+import java.util.HashMap;
import java.util.Hashtable;
import java.util.LinkedHashMap;
-import java.util.Locale;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -43,13 +42,13 @@ import
org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
import org.apache.maven.doxia.util.HtmlTools;
import org.apache.maven.doxia.util.XmlValidator;
-import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.MXParser;
import org.codehaus.plexus.util.xml.pull.XmlPullParser;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -694,9 +693,25 @@ public abstract class AbstractXmlParser
public static class CachedFileEntityResolver
implements EntityResolver
{
+private static final Logger LOGGER = LoggerFactory.getLogger(
CachedFileEntityResolver.class );
+
/** Map with systemId as key and the content of systemId as byte[]. */
protected static final Map ENTITY_CACHE = new
Hashtable<>();
+private static final Map WELL_KNOWN_SYSTEM_IDS = new
HashMap<>();
+
+static
+{
+WELL_KNOWN_SYSTEM_IDS.put( "http://www.w3.org/2001/xml.xsd;,
"xml.xsd" );
+WELL_KNOWN_SYSTEM_IDS.put( "https://www.w3.org/2001/xml.xsd;,
"xml.xsd" );
+WELL_KNOWN_SYSTEM_IDS.put(
"http://maven.apache.org/xsd/xdoc-2.0.xsd;, "xdoc-2.0.xsd" );
+WELL_KNOWN_SYSTEM_IDS.put(
"https://maven.apache.org/xsd/xdoc-2.0.xsd;, "xdoc-2.0.xsd" );
+WELL_KNOWN_SYSTEM_IDS.put(
"http://maven.apache.org/xsd/fml-1.0.1.xsd;, "fml-1.0.1.xsd" );
+WELL_KNOWN_SYSTEM_IDS.put(
"https://maven.apache.org/xsd/fml-1.0.1.xsd;, "fml-1.0.1.xsd" );
+WELL_KNOWN_SYSTEM_IDS.put(
"http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent;, "xhtml-lat1.ent" );
+WELL_KNOWN_SYSTEM_IDS.put(
"https://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent;, "xhtml-lat1.ent" );
+}
+
/** {@inheritDoc} */
public InputSource resolveEntity( String publicId, String systemId )
throws SAXException, IOException
@@ -705,44 +720,36 @@ public abstract class AbstractXmlParser
// already cached?
if ( res == null )
{
-String systemName = FileUtils.getFile( systemId ).getName();
-File temp =
[maven-jxr] branch dependabot/maven/org.apache.maven.plugins-maven-site-plugin-3.12.1 created (now 4e70132)
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-site-plugin-3.12.1 in repository https://gitbox.apache.org/repos/asf/maven-jxr.git at 4e70132 Bump maven-site-plugin from 3.12.0 to 3.12.1 No new revisions were added by this update.
svn commit: r56125 - in /release/maven/plugins: maven-site-plugin-3.12.1-source-release.zip maven-site-plugin-3.12.1-source-release.zip.asc maven-site-plugin-3.12.1-source-release.zip.sha512
Author: michaelo Date: Thu Aug 4 12:01:22 2022 New Revision: 56125 Log: Maven Site Plugin 3.12.1 released Added: release/maven/plugins/maven-site-plugin-3.12.1-source-release.zip (with props) release/maven/plugins/maven-site-plugin-3.12.1-source-release.zip.asc release/maven/plugins/maven-site-plugin-3.12.1-source-release.zip.sha512 Added: release/maven/plugins/maven-site-plugin-3.12.1-source-release.zip == Binary file - no diff available. Propchange: release/maven/plugins/maven-site-plugin-3.12.1-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/plugins/maven-site-plugin-3.12.1-source-release.zip.asc == --- release/maven/plugins/maven-site-plugin-3.12.1-source-release.zip.asc (added) +++ release/maven/plugins/maven-site-plugin-3.12.1-source-release.zip.asc Thu Aug 4 12:01:22 2022 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEaoFLH4acK76rfLcnGioclL3ologFAmLm0yEACgkQGioclL3o +loj4aQf+PZ1QsZ+QBzvt5XPpgOHC88p3QF59POs07Fmx1CPVVbg1e5nGSdbs+63f +JeZSfXK4Mz7ya8no+iB8W19/w7WzJveycPVYSnJYRV7g1gzSHOPTbTpB1BsZpQoX +qgte0nsWXg7GpC0gWxc8uLKqN9dKPmLBqNZ/k2GF4s0r+B1j4S7KARpRItarTUE5 +tNvCz8krDZ9IzbnMgg72IqvGe3YEgNYrwaB4SxuGm8qhc10fyg/FCV3nMTe/qIgB +youJhKEdcKDAgLP3shW46WaON47jdevmknzufVX8NrPowRVYxB/UomrjV/4KMut8 +8/Llo6JU/FT1ahiPG85i30470t3bxQ== +=vy/A +-END PGP SIGNATURE- Added: release/maven/plugins/maven-site-plugin-3.12.1-source-release.zip.sha512 == --- release/maven/plugins/maven-site-plugin-3.12.1-source-release.zip.sha512 (added) +++ release/maven/plugins/maven-site-plugin-3.12.1-source-release.zip.sha512 Thu Aug 4 12:01:22 2022 @@ -0,0 +1 @@ +2ca9f152b107141801121490ac11bd2252841a90974daa7a74e3b641ef907564546bc2500ea65c5874cc939cb65d25fc50b3ca6d0d2cc3254371abd51b039019 \ No newline at end of file
svn commit: r1903223 - in /maven/website/components: plugins-archives/maven-site-plugin-3.12.1/ plugins/maven-site-plugin/
Author: michaelo Date: Thu Aug 4 11:07:56 2022 New Revision: 1903223 Log: Publish Maven Site Plugin 3.12.1 documentation Added: maven/website/components/plugins-archives/maven-site-plugin-3.12.1/ - copied from r1903222, maven/website/components/plugins-archives/maven-site-plugin-LATEST/ maven/website/components/plugins/maven-site-plugin/ - copied from r1903222, maven/website/components/plugins-archives/maven-site-plugin-LATEST/
[maven-shade-plugin] branch MSHADE-424 deleted (was cd9c24b)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MSHADE-424 in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git was cd9c24b [MSHADE-424] - Upgrade jdependency 2.8.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[maven-shade-plugin] branch master updated (5ae83a0 -> cd9c24b)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git from 5ae83a0 [MSHADE-423] - Get rid of commons-lang3 add cd9c24b [MSHADE-424] - Upgrade jdependency 2.8.0 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven-shade-plugin] 01/01: [MSHADE-424] - Upgrade jdependency 2.8.0
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MSHADE-424 in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git commit cd9c24bd2440a0f447ecf933e7f0126390d03c37 Author: Karl Heinz Marbaise AuthorDate: Thu Aug 4 11:24:55 2022 +0200 [MSHADE-424] - Upgrade jdependency 2.8.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1b14315..d8498c3 100644 --- a/pom.xml +++ b/pom.xml @@ -207,7 +207,7 @@ org.vafer jdependency - 2.7.0 + 2.8.0 org.apache.commons
[maven-shade-plugin] branch MSHADE-424 created (now cd9c24b)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MSHADE-424 in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git at cd9c24b [MSHADE-424] - Upgrade jdependency 2.8.0 This branch includes the following new commits: new cd9c24b [MSHADE-424] - Upgrade jdependency 2.8.0 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-wrapper] branch enable-to-customize-classworlds.conf created (now 70289ea)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch enable-to-customize-classworlds.conf in repository https://gitbox.apache.org/repos/asf/maven-wrapper.git at 70289ea Enable to customize classworlds.conf This branch includes the following new commits: new 70289ea Enable to customize classworlds.conf 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-wrapper] 01/01: Enable to customize classworlds.conf
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch enable-to-customize-classworlds.conf
in repository https://gitbox.apache.org/repos/asf/maven-wrapper.git
commit 70289ea81465aa5c4410127833fe906b5f71c3c9
Author: Romain Manni-Bucau
AuthorDate: Thu Aug 4 11:15:36 2022 +0200
Enable to customize classworlds.conf
---
.../apache/maven/wrapper/BootstrapMainStarter.java | 37 --
.../org/apache/maven/wrapper/WrapperExecutor.java | 2 +-
.../apache/maven/wrapper/WrapperExecutorTest.java | 8 +++--
3 files changed, 41 insertions(+), 6 deletions(-)
diff --git
a/maven-wrapper/src/main/java/org/apache/maven/wrapper/BootstrapMainStarter.java
b/maven-wrapper/src/main/java/org/apache/maven/wrapper/BootstrapMainStarter.java
index 71f4186..f64ca7f 100644
---
a/maven-wrapper/src/main/java/org/apache/maven/wrapper/BootstrapMainStarter.java
+++
b/maven-wrapper/src/main/java/org/apache/maven/wrapper/BootstrapMainStarter.java
@@ -21,6 +21,7 @@ package org.apache.maven.wrapper;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
@@ -29,6 +30,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Iterator;
import java.util.Locale;
+import java.util.Properties;
/**
* Maven starter, from a provided Maven home directory.
@@ -37,22 +39,51 @@ import java.util.Locale;
*/
public class BootstrapMainStarter
{
-public void start( String[] args, Path mavenHome )
+public void start( String[] args, Path mavenHome, Properties properties )
throws Exception
{
final Path mavenJar = findLauncherJar( mavenHome );
URLClassLoader contextClassLoader = new URLClassLoader( new URL[] {
mavenJar.toUri().toURL() },
-
ClassLoader.getSystemClassLoader().getParent() );
+ClassLoader.getSystemClassLoader().getParent() );
+
+// can be useful to leak the classloader with some daemon mojo but
generally a wrong idea so off by default
+if ( Boolean.parseBoolean( properties.getProperty(
getClass().getName() + ".leakClassloader" ) ) )
+{
+doStart( args, mavenHome, properties, contextClassLoader );
+return;
+}
+
+try ( final URLClassLoader ref = contextClassLoader )
+{
+doStart( args, mavenHome, properties, contextClassLoader );
+}
+}
+
+private void doStart( final String[] args, final Path mavenHome,
+ final Properties properties,
+ final URLClassLoader contextClassLoader )
+throws ClassNotFoundException, NoSuchMethodException,
IllegalAccessException, InvocationTargetException
+{
Thread.currentThread().setContextClassLoader( contextClassLoader );
Class mainClass = contextClassLoader.loadClass(
"org.codehaus.plexus.classworlds.launcher.Launcher" );
System.setProperty( "maven.home",
mavenHome.toAbsolutePath().toString() );
-System.setProperty( "classworlds.conf", mavenHome.resolve(
"bin/m2.conf" ).toAbsolutePath().toString() );
+System.setProperty( "classworlds.conf", getClassworldsConf(
properties, mavenHome ) );
Method mainMethod = mainClass.getMethod( "main", String[].class );
mainMethod.invoke( null, new Object[] { args } );
}
+private String getClassworldsConf( Properties properties, Path mavenHome )
+{
+final String override = properties.getProperty( "classworlds.conf" );
+if ( override != null )
+{
+return override;
+}
+return mavenHome.resolve( "bin/m2.conf" ).toAbsolutePath().toString();
+}
+
private Path findLauncherJar( Path mavenHome )
throws IOException
{
diff --git
a/maven-wrapper/src/main/java/org/apache/maven/wrapper/WrapperExecutor.java
b/maven-wrapper/src/main/java/org/apache/maven/wrapper/WrapperExecutor.java
index f69d7cc..f606fba 100644
--- a/maven-wrapper/src/main/java/org/apache/maven/wrapper/WrapperExecutor.java
+++ b/maven-wrapper/src/main/java/org/apache/maven/wrapper/WrapperExecutor.java
@@ -177,7 +177,7 @@ public class WrapperExecutor
throws Exception
{
Path mavenHome = install.createDist( config );
-bootstrapMainStarter.start( args, mavenHome );
+bootstrapMainStarter.start( args, mavenHome, properties );
}
private String getProperty( String propertyName )
diff --git
a/maven-wrapper/src/test/java/org/apache/maven/wrapper/WrapperExecutorTest.java
b/maven-wrapper/src/test/java/org/apache/maven/wrapper/WrapperExecutorTest.java
index fb91f2d..9e874d6 100644
---
a/maven-wrapper/src/test/java/org/apache/maven/wrapper/WrapperExecutorTest.java
+++
svn commit: r1903222 [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 Thu Aug 4 09:14:31 2022 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -49,7 +49,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: 2022-08-03 +| Last Published: 2022-08-04 | 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 Thu Aug 4 09:14:31 2022 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -49,7 +49,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: 2022-08-03 +| Last Published: 2022-08-04 | 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 Thu Aug 4 09:14:31 2022 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -49,7 +49,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: 2022-08-03 +| Last Published: 2022-08-04 | 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 Thu Aug 4 09:14:31 2022 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -49,7 +49,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: 2022-08-03 +| Last Published: 2022-08-04 | 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 Thu Aug 4 09:14:31 2022 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -49,7 +49,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: 2022-08-03 +| Last Published: 2022-08-04 | 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 Thu Aug 4 09:14:31 2022 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -49,7 +49,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: 2022-08-03 +| Last Published: 2022-08-04 | 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 Thu Aug 4 09:14:31 2022 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -49,7 +49,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-beta-1
svn commit: r1903222 [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: Thu Aug 4 09:14:31 2022 New Revision: 1903222 Log: Site checkin for project Apache Maven Site Modified: maven/website/content/about.html maven/website/content/aether.html maven/website/content/apache-maven.pdf 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
svn commit: r1903222 [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/development/guide-maven-development.html == --- maven/website/content/guides/development/guide-maven-development.html (original) +++ maven/website/content/guides/development/guide-maven-development.html Thu Aug 4 09:14:31 2022 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -52,7 +52,7 @@ Maarten Mulders" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Developing Maven https://github.com/apache/maven-site/tree/master/content/apt/guides/development/guide-maven-development.apt;> -| Last Published: 2022-08-03 +| Last Published: 2022-08-04 | Get Sources Download Modified: maven/website/content/guides/development/guide-plugin-documentation.html == --- maven/website/content/guides/development/guide-plugin-documentation.html (original) +++ maven/website/content/guides/development/guide-plugin-documentation.html Thu Aug 4 09:14:31 2022 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -49,7 +49,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to the Plugin Documentation Standard https://github.com/apache/maven-site/tree/master/content/apt/guides/development/guide-plugin-documentation.apt;> -| Last Published: 2022-08-03 +| Last Published: 2022-08-04 | Get Sources Download Modified: maven/website/content/guides/development/guide-testing-development-plugins.html == --- maven/website/content/guides/development/guide-testing-development-plugins.html (original) +++ maven/website/content/guides/development/guide-testing-development-plugins.html Thu Aug 4 09:14:31 2022 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -49,7 +49,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Testing Development Versions of Plugins https://github.com/apache/maven-site/tree/master/content/apt/guides/development/guide-testing-development-plugins.apt;> -| Last Published: 2022-08-03 +| Last Published: 2022-08-04 | Get Sources Download Modified: maven/website/content/guides/development/guide-testing-releases.html == --- maven/website/content/guides/development/guide-testing-releases.html (original) +++ maven/website/content/guides/development/guide-testing-releases.html Thu Aug 4 09:14:31 2022 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -49,7 +49,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Testing Staged Releases https://github.com/apache/maven-site/tree/master/content/apt/guides/development/guide-testing-releases.apt;> -| Last Published: 2022-08-03 +| Last Published: 2022-08-04 | Get Sources Download Modified: maven/website/content/guides/getting-started/index.html == --- maven/website/content/guides/getting-started/index.html (original) +++ maven/website/content/guides/getting-started/index.html Thu Aug 4 09:14:31 2022 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -50,7 +50,7 @@ Vincent Siveton" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven Getting Started Guide https://github.com/apache/maven-site/tree/master/content/apt/guides/getting-started/index.apt;> -| Last Published: 2022-08-03 +| Last Published: 2022-08-04 | Get Sources Download Modified: maven/website/content/guides/getting-started/maven-in-five-minutes.html == --- maven/website/content/guides/getting-started/maven-in-five-minutes.html (original) +++ maven/website/content/guides/getting-started/maven-in-five-minutes.html Thu Aug 4 09:14:31 2022 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -49,7 +49,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven in 5 Minutes https://github.com/apache/maven-site/tree/master/content/apt/guides/getting-started/maven-in-five-minutes.apt;> -| Last Published: 2022-08-03 +| Last Published: 2022-08-04 | Get Sources Download Modified: maven/website/content/guides/getting-started/windows-prerequisites.html == ---
svn commit: r1903222 [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/guides/mini/guide-using-one-source-directory.html == --- maven/website/content/guides/mini/guide-using-one-source-directory.html (original) +++ maven/website/content/guides/mini/guide-using-one-source-directory.html Thu Aug 4 09:14:31 2022 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -49,7 +49,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Using Maven when You Can't Use the Conventions https://github.com/apache/maven-site/tree/master/content/apt/guides/mini/guide-using-one-source-directory.apt;> -| Last Published: 2022-08-03 +| Last Published: 2022-08-04 | Get Sources Download Modified: maven/website/content/guides/mini/guide-using-toolchains.html == --- maven/website/content/guides/mini/guide-using-toolchains.html (original) +++ maven/website/content/guides/mini/guide-using-toolchains.html Thu Aug 4 09:14:31 2022 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -51,7 +51,7 @@ Karl Heinz Marbaise" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Using Toolchains https://github.com/apache/maven-site/tree/master/content/apt/guides/mini/guide-using-toolchains.apt;> -| Last Published: 2022-08-03 +| Last Published: 2022-08-04 | Get Sources Download Modified: maven/website/content/guides/mini/guide-wagon-providers.html == --- maven/website/content/guides/mini/guide-wagon-providers.html (original) +++ maven/website/content/guides/mini/guide-wagon-providers.html Thu Aug 4 09:14:31 2022 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -49,7 +49,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Selecting Alternative Wagon Providers https://github.com/apache/maven-site/tree/master/content/apt/guides/mini/guide-wagon-providers.apt;> -| Last Published: 2022-08-03 +| Last Published: 2022-08-04 | Get Sources Download Modified: maven/website/content/guides/mini/index.html == --- maven/website/content/guides/mini/index.html (original) +++ maven/website/content/guides/mini/index.html Thu Aug 4 09:14:31 2022 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -49,7 +49,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven Mini Guides https://github.com/apache/maven-site/tree/master/content/apt/guides/mini/index.apt.vm;> -| Last Published: 2022-08-03 +| Last Published: 2022-08-04 | Get Sources Download Modified: maven/website/content/guides/plugin/guide-java-plugin-development.html == --- maven/website/content/guides/plugin/guide-java-plugin-development.html (original) +++ maven/website/content/guides/plugin/guide-java-plugin-development.html Thu Aug 4 09:14:31 2022 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -51,7 +51,7 @@ Olivier Lamy" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Developing Java Plugins https://github.com/apache/maven-site/tree/master/content/apt/guides/plugin/guide-java-plugin-development.apt;> -| Last Published: 2022-08-03 +| Last Published: 2022-08-04 | Get Sources Download Modified: maven/website/content/guides/plugin/guide-java-report-plugin-development.html == --- maven/website/content/guides/plugin/guide-java-report-plugin-development.html (original) +++ maven/website/content/guides/plugin/guide-java-report-plugin-development.html Thu Aug 4 09:14:31 2022 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -50,7 +50,7 @@ Bertrand Martin" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Developing Java Report Plugins https://github.com/apache/maven-site/tree/master/content/apt/guides/plugin/guide-java-report-plugin-development.apt;> -| Last Published: 2022-08-03 +| Last Published: 2022-08-04 | Get Sources Download Modified: maven/website/content/ide.html == --- maven/website/content/ide.html (original) +++ maven/website/content/ide.html Thu Aug 4 09:14:31 2022 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -47,7 +47,7 @@
[maven-site] branch master updated: Apache Maven Resources Plugin Version 3.3.0 Released.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site.git
The following commit(s) were added to refs/heads/master by this push:
new cd969154 Apache Maven Resources Plugin Version 3.3.0 Released.
cd969154 is described below
commit cd9691545149a818d3cb0a665f77b8c69d2b53cd
Author: Karl Heinz Marbaise
AuthorDate: Thu Aug 4 11:09:54 2022 +0200
Apache Maven Resources Plugin Version 3.3.0 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 75dc5ffc..7fbe20d1 100644
--- a/content/apt/plugins/index.apt
+++ b/content/apt/plugins/index.apt
@@ -77,7 +77,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-install-plugin/} <<>>}} | B |
3.0.1| 2022-07-17 | Install the built artifact into the local
repository. |
{{{https://gitbox.apache.org/repos/asf/maven-install-plugin.git}Git}} /
{{{https://github.com/apache/maven-install-plugin/}GitHub}} |
{{{https://issues.apache.org/jira/browse/MINSTALL}Jira MINSTALL}}
*--++--++--+++
-| {{{/plugins/maven-resources-plugin/} <<>>}} | B |
3.2.0| 2020-08-11 | Copy the resources to the output directory for
including in the JAR. |
{{{https://gitbox.apache.org/repos/asf/maven-resources-plugin.git}Git}} /
{{{https://github.com/apache/maven-resources-plugin/}GitHub}} |
{{{https://issues.apache.org/jira/browse/MRESOURCES}Jira MRESOURCES}}
+| {{{/plugins/maven-resources-plugin/} <<>>}} | B |
3.3.0| 2022-07-23 | Copy the resources to the output directory for
including in the JAR. |
{{{https://gitbox.apache.org/repos/asf/maven-resources-plugin.git}Git}} /
{{{https://github.com/apache/maven-resources-plugin/}GitHub}} |
{{{https://issues.apache.org/jira/browse/MRESOURCES}Jira MRESOURCES}}
*--++--++--+++
| {{{/plugins/maven-site-plugin/} <<>>}} | B |
4.0.0-M2 | 2022-06-24 | Generate a site for the current project. |
{{{https://gitbox.apache.org/repos/asf/maven-site-plugin.git}Git}} /
{{{https://github.com/apache/maven-site-plugin/}GitHub}} |
{{{https://issues.apache.org/jira/browse/MSITE}Jira MSITE}}
*--++--++--+++
