(maven-compiler-plugin) 01/01: subject verb agreement
This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch elharo-patch-1 in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git commit faaaed135d57380f343b20df46c4cb16b011b32a Author: Elliotte Rusty Harold AuthorDate: Sun Dec 31 00:12:04 2023 + subject verb agreement minor grammar fix --- src/site/apt/examples/pass-compiler-arguments.apt.vm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/site/apt/examples/pass-compiler-arguments.apt.vm b/src/site/apt/examples/pass-compiler-arguments.apt.vm index d8b9197..46057ff 100644 --- a/src/site/apt/examples/pass-compiler-arguments.apt.vm +++ b/src/site/apt/examples/pass-compiler-arguments.apt.vm @@ -28,8 +28,8 @@ Pass Compiler Arguments - Sometimes, you need to pass other compiler arguments that are not handled by - the Compiler Plugin itself but is supported by the <<>> selected. + Sometimes, you need to pass compiler arguments that are not handled by + the Compiler Plugin itself but are supported by the <<>> selected. For such arguments, use the Compiler Plugin's <<>> parameter The following example passes compiler arguments to the <<>> compiler:
(maven-compiler-plugin) branch elharo-patch-1 created (now faaaed1)
This is an automated email from the ASF dual-hosted git repository. elharo pushed a change to branch elharo-patch-1 in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git at faaaed1 subject verb agreement This branch includes the following new commits: new faaaed1 subject verb agreement 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-surefire) branch SUREFIRE-2225 updated (f6d0459c3 -> 4eb0fd5ae)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch SUREFIRE-2225 in repository https://gitbox.apache.org/repos/asf/maven-surefire.git discard f6d0459c3 [SUREFIRE-2225] Surefire ITs fail when project directory contains space new 4eb0fd5ae [SUREFIRE-2225] Surefire ITs fail when project directory contains space 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 (f6d0459c3) \ N -- N -- N refs/heads/SUREFIRE-2225 (4eb0fd5ae) 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: .../java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java | 1 - 1 file changed, 1 deletion(-)
(maven-surefire) 01/01: [SUREFIRE-2225] Surefire ITs fail when project directory contains space
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch SUREFIRE-2225
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 4eb0fd5aec588c6fc83705561cceadc64afec7f7
Author: Michael Osipov
AuthorDate: Sat Dec 30 23:07:53 2023 +0100
[SUREFIRE-2225] Surefire ITs fail when project directory contains space
This closes #705
---
.../java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java | 4
surefire-its/src/test/resources/junit47-parallel/pom.xml | 2 +-
.../test/resources/testng-740-parallel-without-threadcount/pom.xml| 2 +-
surefire-its/src/test/resources/testng-740-parallel/pom.xml | 2 +-
surefire-its/src/test/resources/testng-simple/pom.xml | 2 +-
5 files changed, 8 insertions(+), 4 deletions(-)
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
index 148a689fa..2df39a478 100755
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
@@ -80,6 +80,10 @@ public final class SurefireLauncher {
goals.add("-Dsurefire.version=" + surefireVersion);
String jacocoAgent = System.getProperty("jacoco.agent", "");
+// Remove unnecessary backslash escaping for Windows, see
https://github.com/jacoco/jacoco/issues/1559
+jacocoAgent = jacocoAgent.replace("", "\\");
+// Remove quotes which will cause a syntax error raised by cmd.exe
because of quote escaping
+jacocoAgent = jacocoAgent.replace("\"", "");
goals.add("-Djacoco.agent=" + jacocoAgent);
goals.add("-nsu");
diff --git a/surefire-its/src/test/resources/junit47-parallel/pom.xml
b/surefire-its/src/test/resources/junit47-parallel/pom.xml
index e9d6a6caa..ac04eedd3 100644
--- a/surefire-its/src/test/resources/junit47-parallel/pom.xml
+++ b/surefire-its/src/test/resources/junit47-parallel/pom.xml
@@ -62,7 +62,7 @@
maven-surefire-plugin
- ${argLine} ${jacoco.agent}
+ ${argLine} "${jacoco.agent}"
diff --git
a/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml
b/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml
index 216efb5a3..8d4fd2203 100644
---
a/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml
+++
b/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml
@@ -43,7 +43,7 @@
maven-surefire-plugin
${surefire.version}
-${argLine} ${jacoco.agent}
+${argLine} "${jacoco.agent}"
methods
diff --git a/surefire-its/src/test/resources/testng-740-parallel/pom.xml
b/surefire-its/src/test/resources/testng-740-parallel/pom.xml
index bc39aae81..867d6adb2 100644
--- a/surefire-its/src/test/resources/testng-740-parallel/pom.xml
+++ b/surefire-its/src/test/resources/testng-740-parallel/pom.xml
@@ -43,7 +43,7 @@
maven-surefire-plugin
${surefire.version}
-${argLine} ${jacoco.agent}
+${argLine} "${jacoco.agent}"
methods
10
diff --git a/surefire-its/src/test/resources/testng-simple/pom.xml
b/surefire-its/src/test/resources/testng-simple/pom.xml
index 427c713e0..cace78a2e 100644
--- a/surefire-its/src/test/resources/testng-simple/pom.xml
+++ b/surefire-its/src/test/resources/testng-simple/pom.xml
@@ -87,7 +87,7 @@
maven-surefire-plugin
${surefire.version}
- ${argLine} ${jacoco.agent}
+ ${argLine} "${jacoco.agent}"
reversealphabetical
(maven-surefire) branch SUREFIRE-2225 updated (d827cab2c -> f6d0459c3)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch SUREFIRE-2225 in repository https://gitbox.apache.org/repos/asf/maven-surefire.git discard d827cab2c [SUREFIRE-2225] Surefire ITs fail when project directory contains space new f6d0459c3 [SUREFIRE-2225] Surefire ITs fail when project directory contains space 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 (d827cab2c) \ N -- N -- N refs/heads/SUREFIRE-2225 (f6d0459c3) 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: .../java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(maven-surefire) 01/01: [SUREFIRE-2225] Surefire ITs fail when project directory contains space
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch SUREFIRE-2225
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit f6d0459c3f8a109dfb771b654c15b8aa20a1e9b0
Author: Michael Osipov
AuthorDate: Sat Dec 30 23:07:53 2023 +0100
[SUREFIRE-2225] Surefire ITs fail when project directory contains space
This closes #705
---
.../java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java | 5 +
surefire-its/src/test/resources/junit47-parallel/pom.xml | 2 +-
.../test/resources/testng-740-parallel-without-threadcount/pom.xml | 2 +-
surefire-its/src/test/resources/testng-740-parallel/pom.xml | 2 +-
surefire-its/src/test/resources/testng-simple/pom.xml| 2 +-
5 files changed, 9 insertions(+), 4 deletions(-)
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
index 148a689fa..ab8fed58c 100755
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
@@ -79,7 +79,12 @@ public final class SurefireLauncher {
goals.add("-Dsurefire.version=" + surefireVersion);
+
String jacocoAgent = System.getProperty("jacoco.agent", "");
+// Remove unnecessary backslash escaping for Windows, see
https://github.com/jacoco/jacoco/issues/1559
+jacocoAgent = jacocoAgent.replace("", "\\");
+// Remove quotes which will cause a syntax error raised by cmd.exe
because of quote escaping
+jacocoAgent = jacocoAgent.replace("\"", "");
goals.add("-Djacoco.agent=" + jacocoAgent);
goals.add("-nsu");
diff --git a/surefire-its/src/test/resources/junit47-parallel/pom.xml
b/surefire-its/src/test/resources/junit47-parallel/pom.xml
index e9d6a6caa..ac04eedd3 100644
--- a/surefire-its/src/test/resources/junit47-parallel/pom.xml
+++ b/surefire-its/src/test/resources/junit47-parallel/pom.xml
@@ -62,7 +62,7 @@
maven-surefire-plugin
- ${argLine} ${jacoco.agent}
+ ${argLine} "${jacoco.agent}"
diff --git
a/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml
b/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml
index 216efb5a3..8d4fd2203 100644
---
a/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml
+++
b/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml
@@ -43,7 +43,7 @@
maven-surefire-plugin
${surefire.version}
-${argLine} ${jacoco.agent}
+${argLine} "${jacoco.agent}"
methods
diff --git a/surefire-its/src/test/resources/testng-740-parallel/pom.xml
b/surefire-its/src/test/resources/testng-740-parallel/pom.xml
index bc39aae81..867d6adb2 100644
--- a/surefire-its/src/test/resources/testng-740-parallel/pom.xml
+++ b/surefire-its/src/test/resources/testng-740-parallel/pom.xml
@@ -43,7 +43,7 @@
maven-surefire-plugin
${surefire.version}
-${argLine} ${jacoco.agent}
+${argLine} "${jacoco.agent}"
methods
10
diff --git a/surefire-its/src/test/resources/testng-simple/pom.xml
b/surefire-its/src/test/resources/testng-simple/pom.xml
index 427c713e0..cace78a2e 100644
--- a/surefire-its/src/test/resources/testng-simple/pom.xml
+++ b/surefire-its/src/test/resources/testng-simple/pom.xml
@@ -87,7 +87,7 @@
maven-surefire-plugin
${surefire.version}
- ${argLine} ${jacoco.agent}
+ ${argLine} "${jacoco.agent}"
reversealphabetical
(maven-surefire) 01/01: [SUREFIRE-2225] Surefire ITs fail when project directory contains space
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch SUREFIRE-2225
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit d827cab2cf66ec5cfabe586ef4402cc400800f76
Author: Michael Osipov
AuthorDate: Sat Dec 30 23:07:53 2023 +0100
[SUREFIRE-2225] Surefire ITs fail when project directory contains space
This closes #705
---
.../java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java | 5 +
surefire-its/src/test/resources/junit47-parallel/pom.xml | 2 +-
.../test/resources/testng-740-parallel-without-threadcount/pom.xml | 2 +-
surefire-its/src/test/resources/testng-740-parallel/pom.xml | 2 +-
surefire-its/src/test/resources/testng-simple/pom.xml| 2 +-
5 files changed, 9 insertions(+), 4 deletions(-)
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
index 148a689fa..37cf93a96 100755
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
@@ -79,7 +79,12 @@ public final class SurefireLauncher {
goals.add("-Dsurefire.version=" + surefireVersion);
+
String jacocoAgent = System.getProperty("jacoco.agent", "");
+// Remove unnecessary backslash escaping for Windows, see
https://github.com/jacoco/jacoco/issues/1559
+jacocoAgent = jacocoAgent.replace("", "\\");
+// Remove quotes which will cause us syntax error with cmd.exe because
of quoe escaping
+jacocoAgent = jacocoAgent.replace("\"", "");
goals.add("-Djacoco.agent=" + jacocoAgent);
goals.add("-nsu");
diff --git a/surefire-its/src/test/resources/junit47-parallel/pom.xml
b/surefire-its/src/test/resources/junit47-parallel/pom.xml
index e9d6a6caa..ac04eedd3 100644
--- a/surefire-its/src/test/resources/junit47-parallel/pom.xml
+++ b/surefire-its/src/test/resources/junit47-parallel/pom.xml
@@ -62,7 +62,7 @@
maven-surefire-plugin
- ${argLine} ${jacoco.agent}
+ ${argLine} "${jacoco.agent}"
diff --git
a/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml
b/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml
index 216efb5a3..8d4fd2203 100644
---
a/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml
+++
b/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml
@@ -43,7 +43,7 @@
maven-surefire-plugin
${surefire.version}
-${argLine} ${jacoco.agent}
+${argLine} "${jacoco.agent}"
methods
diff --git a/surefire-its/src/test/resources/testng-740-parallel/pom.xml
b/surefire-its/src/test/resources/testng-740-parallel/pom.xml
index bc39aae81..867d6adb2 100644
--- a/surefire-its/src/test/resources/testng-740-parallel/pom.xml
+++ b/surefire-its/src/test/resources/testng-740-parallel/pom.xml
@@ -43,7 +43,7 @@
maven-surefire-plugin
${surefire.version}
-${argLine} ${jacoco.agent}
+${argLine} "${jacoco.agent}"
methods
10
diff --git a/surefire-its/src/test/resources/testng-simple/pom.xml
b/surefire-its/src/test/resources/testng-simple/pom.xml
index 427c713e0..cace78a2e 100644
--- a/surefire-its/src/test/resources/testng-simple/pom.xml
+++ b/surefire-its/src/test/resources/testng-simple/pom.xml
@@ -87,7 +87,7 @@
maven-surefire-plugin
${surefire.version}
- ${argLine} ${jacoco.agent}
+ ${argLine} "${jacoco.agent}"
reversealphabetical
(maven-surefire) branch SUREFIRE-2225 created (now d827cab2c)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch SUREFIRE-2225 in repository https://gitbox.apache.org/repos/asf/maven-surefire.git at d827cab2c [SUREFIRE-2225] Surefire ITs fail when project directory contains space This branch includes the following new commits: new d827cab2c [SUREFIRE-2225] Surefire ITs fail when project directory contains space 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-surefire) branch maven-verifier-2.0.0-M1 updated: Quote ${jacoco.agent} in ITs
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-verifier-2.0.0-M1
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/maven-verifier-2.0.0-M1 by
this push:
new eed6e4d12 Quote ${jacoco.agent} in ITs
eed6e4d12 is described below
commit eed6e4d126657a5e9b2be2f885502e65dfb62449
Author: Michael Osipov
AuthorDate: Sat Dec 30 23:40:50 2023 +0100
Quote ${jacoco.agent} in ITs
---
surefire-its/src/test/resources/junit47-parallel/pom.xml| 2 +-
.../src/test/resources/testng-740-parallel-without-threadcount/pom.xml | 2 +-
surefire-its/src/test/resources/testng-740-parallel/pom.xml | 2 +-
surefire-its/src/test/resources/testng-simple/pom.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/surefire-its/src/test/resources/junit47-parallel/pom.xml
b/surefire-its/src/test/resources/junit47-parallel/pom.xml
index e9d6a6caa..ac04eedd3 100644
--- a/surefire-its/src/test/resources/junit47-parallel/pom.xml
+++ b/surefire-its/src/test/resources/junit47-parallel/pom.xml
@@ -62,7 +62,7 @@
maven-surefire-plugin
- ${argLine} ${jacoco.agent}
+ ${argLine} "${jacoco.agent}"
diff --git
a/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml
b/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml
index 216efb5a3..8d4fd2203 100644
---
a/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml
+++
b/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml
@@ -43,7 +43,7 @@
maven-surefire-plugin
${surefire.version}
-${argLine} ${jacoco.agent}
+${argLine} "${jacoco.agent}"
methods
diff --git a/surefire-its/src/test/resources/testng-740-parallel/pom.xml
b/surefire-its/src/test/resources/testng-740-parallel/pom.xml
index bc39aae81..867d6adb2 100644
--- a/surefire-its/src/test/resources/testng-740-parallel/pom.xml
+++ b/surefire-its/src/test/resources/testng-740-parallel/pom.xml
@@ -43,7 +43,7 @@
maven-surefire-plugin
${surefire.version}
-${argLine} ${jacoco.agent}
+${argLine} "${jacoco.agent}"
methods
10
diff --git a/surefire-its/src/test/resources/testng-simple/pom.xml
b/surefire-its/src/test/resources/testng-simple/pom.xml
index 427c713e0..cace78a2e 100644
--- a/surefire-its/src/test/resources/testng-simple/pom.xml
+++ b/surefire-its/src/test/resources/testng-simple/pom.xml
@@ -87,7 +87,7 @@
maven-surefire-plugin
${surefire.version}
- ${argLine} ${jacoco.agent}
+ ${argLine} "${jacoco.agent}"
reversealphabetical
(maven-surefire) branch maven-verifier-2.0.0-M1 updated: formatting
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-verifier-2.0.0-M1
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/maven-verifier-2.0.0-M1 by
this push:
new a2f988df7 formatting
a2f988df7 is described below
commit a2f988df70d840531c167e043c8447f939263fb8
Author: Michael Osipov
AuthorDate: Sat Dec 30 23:21:16 2023 +0100
formatting
---
.../java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
index d0f47cee0..8f4cff8eb 100755
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
@@ -79,7 +79,8 @@ public final class SurefireLauncher {
goals.add("-Dsurefire.version=" + surefireVersion);
-String jacocoAgent = System.getProperty("jacoco.agent",
"").replace("\"", "").replace("", "\\");
+String jacocoAgent =
+System.getProperty("jacoco.agent", "").replace("\"",
"").replace("", "\\");
goals.add("-Djacoco.agent=" + jacocoAgent);
goals.add("-nsu");
(maven-surefire) branch maven-verifier-2.0.0-M1 updated: Fix jacocoAgent
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-verifier-2.0.0-M1
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/maven-verifier-2.0.0-M1 by
this push:
new 8cefc26b4 Fix jacocoAgent
8cefc26b4 is described below
commit 8cefc26b4cae595e0acdc85c7b9fcb684cf81793
Author: Michael Osipov
AuthorDate: Sat Dec 30 23:07:53 2023 +0100
Fix jacocoAgent
---
.../java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
index 327bfb595..d0f47cee0 100755
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
@@ -79,7 +79,7 @@ public final class SurefireLauncher {
goals.add("-Dsurefire.version=" + surefireVersion);
-String jacocoAgent = System.getProperty("jacoco.agent", "");
+String jacocoAgent = System.getProperty("jacoco.agent",
"").replace("\"", "").replace("", "\\");
goals.add("-Djacoco.agent=" + jacocoAgent);
goals.add("-nsu");
(maven-invoker-plugin) branch dependabot/maven/org.apache.maven.shared-maven-shared-utils-3.4.2 deleted (was ab2d79b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.shared-maven-shared-utils-3.4.2 in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git was ab2d79b Bump org.apache.maven.shared:maven-shared-utils from 3.4.1 to 3.4.2 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-invoker-plugin) branch master updated (8b48295 -> f9bb666)
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-invoker-plugin.git from 8b48295 Bump org.codehaus.plexus:plexus-interpolation from 1.26 to 1.27 add f9bb666 Bump org.apache.maven.shared:maven-shared-utils from 3.4.1 to 3.4.2 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(maven-doxia) 01/02: [DOXIA-720] Cleanup - sisu-maven-plugin already configured in parent
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch DOXIA-720s in repository https://gitbox.apache.org/repos/asf/maven-doxia.git commit 6fd6b29fa9ae50b98d032f1d7c889057fb49e1b2 Author: Sylwester Lachiewicz AuthorDate: Sat Dec 30 22:12:28 2023 +0100 [DOXIA-720] Cleanup - sisu-maven-plugin already configured in parent --- pom.xml | 8 1 file changed, 8 deletions(-) diff --git a/pom.xml b/pom.xml index a6e2aae8..8d8fb83c 100644 --- a/pom.xml +++ b/pom.xml @@ -312,14 +312,6 @@ under the License. org.eclipse.sisu sisu-maven-plugin - - - - main-index - test-index - - -
(maven-doxia) 02/02: [DOXIA-720] Cleanup - less checkstyle violations
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch DOXIA-720s in repository https://gitbox.apache.org/repos/asf/maven-doxia.git commit f182deeff8f0ddbeb5a10c86843d9fcf4c9db051 Author: Sylwester Lachiewicz AuthorDate: Sat Dec 30 22:23:19 2023 +0100 [DOXIA-720] Cleanup - less checkstyle violations --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8d8fb83c..fd9b6699 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ under the License. doxia-archives/doxia-LATEST - RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,MethodName,InnerAssignment,MagicNumber + MethodName,MethodLength,FileLength,InnerAssignment 2023-10-13T19:24:20Z 1.7.36 5.10.0
(maven-doxia) branch DOXIA-720s created (now f182deef)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch DOXIA-720s in repository https://gitbox.apache.org/repos/asf/maven-doxia.git at f182deef [DOXIA-720] Cleanup - less checkstyle violations This branch includes the following new commits: new 6fd6b29f [DOXIA-720] Cleanup - sisu-maven-plugin already configured in parent new f182deef [DOXIA-720] Cleanup - less checkstyle violations 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.
(maven-doxia) branch dependabot/maven/junitVersion-5.10.1 deleted (was 147177c1)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch dependabot/maven/junitVersion-5.10.1 in repository https://gitbox.apache.org/repos/asf/maven-doxia.git was 147177c1 Bump junitVersion from 5.10.0 to 5.10.1 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-doxia) 01/01: [DOXIA-721] Bump JUnit to 5.10.1
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-721
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit 84df2d4fa4074aececb1c397900460e81e3248ca
Author: Sylwester Lachiewicz
AuthorDate: Sat Dec 30 22:37:14 2023 +0100
[DOXIA-721] Bump JUnit to 5.10.1
---
doxia-core/pom.xml| 5 +
doxia-modules/pom.xml | 5 +
pom.xml | 27 +--
3 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/doxia-core/pom.xml b/doxia-core/pom.xml
index 98558551..4ed1ab3c 100644
--- a/doxia-core/pom.xml
+++ b/doxia-core/pom.xml
@@ -68,6 +68,11 @@ under the License.
plexus-testing
test
+
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
com.google.inject
guice
diff --git a/doxia-modules/pom.xml b/doxia-modules/pom.xml
index 126aa3a1..b9efa960 100644
--- a/doxia-modules/pom.xml
+++ b/doxia-modules/pom.xml
@@ -53,6 +53,11 @@ under the License.
+
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
org.apache.maven.doxia
doxia-core
diff --git a/pom.xml b/pom.xml
index 62951bce..ef902d49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,6 @@ under the License.
RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,MethodName,InnerAssignment,MagicNumber
2023-10-13T19:24:20Z
1.7.36
-5.10.0
0.3.5
2.9.1
@@ -215,14 +214,11 @@ under the License.
-org.junit.jupiter
-junit-jupiter-api
-${junitVersion}
-
-
-org.junit.jupiter
-junit-jupiter-engine
-${junitVersion}
+org.junit
+junit-bom
+5.10.1
+pom
+import
@@ -238,19 +234,6 @@ under the License.
-
-
- org.junit.jupiter
- junit-jupiter-api
- test
-
-
- org.junit.jupiter
- junit-jupiter-engine
- test
-
-
-
(maven-doxia) branch DOXIA-721 created (now 84df2d4f)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch DOXIA-721 in repository https://gitbox.apache.org/repos/asf/maven-doxia.git at 84df2d4f [DOXIA-721] Bump JUnit to 5.10.1 This branch includes the following new commits: new 84df2d4f [DOXIA-721] Bump JUnit to 5.10.1 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 dependabot/maven/org.apache.maven-maven-parent-41 deleted (was e3ab71c7)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch dependabot/maven/org.apache.maven-maven-parent-41 in repository https://gitbox.apache.org/repos/asf/maven-doxia.git was e3ab71c7 Bump org.apache.maven:maven-parent from 40 to 41 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-doxia-converter) 01/01: Switch a few core plugins to the new api
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch mvn4 in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git commit 6f187844615a1d547df3dee37911cf285ed451ea Author: Guillaume Nodet AuthorDate: Thu Feb 24 17:00:55 2022 +0100 Switch a few core plugins to the new api --- pom.xml | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 036b506..6529371 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.doxia doxia-tools -41 +42-SNAPSHOT @@ -224,6 +224,13 @@ under the License. + +org.apache.maven.plugins +maven-compiler-plugin + + alwaysNew + +
(maven-doxia-converter) branch mvn4 updated (11b3d18 -> 6f18784)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch mvn4 in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git discard 11b3d18 Switch a few core plugins to the new api discard a6e4ce3 mvn4 aggregator add 6e29da6 Bump jacoco-maven-plugin from 0.8.7 to 0.8.8 add 9c565b5 Bump doxia-tools from 34 to 35 add 2368651 Bump icu4j from 70.1 to 71.1 add 5d0557c Bump plexus-utils from 3.4.1 to 3.4.2 add 82b9763 Bump maven-assembly-plugin from 3.3.0 to 3.4.0 add 785d0eb Bump maven-assembly-plugin from 3.4.0 to 3.4.1 add 5b46d11 Bump maven-assembly-plugin from 3.4.1 to 3.4.2 add 441bc58 Bump doxia-tools from 35 to 37 add 762e2fe fix Jira project: DOXIATOOLS add 7b5f6ce [MNGSITE-505] use dlcdn.apache.org (no mirrors) + downloads.apache.org add ae5da9a [MNGSITE-505] use dlcdn.apache.org add 3b3eeb5 [DOXIATOOLS-74] add Markdown add 20630f6 [maven-release-plugin] prepare release doxia-converter-1.3 add 1605025 [maven-release-plugin] prepare for next development iteration add a0adb86 Fix output from -h to include markdown format add 843303c DOXIATOOLS-75 improved directory input support (#38) add 732 [DOXIATOOLS-77] Bump plexus-utils from 3.4.2 to 3.5.0 (#34) add cc0c435 [DOXIATOOLS-78] Bump icu4j from 71.1 to 72.1 (#33) add 0796878 [DOXIATOOLS-79] Bump doxia-tools from 37 to 39 add 8785c54 [DOXIATOOLS-79] apply formatting with spotless:apply add 2da6066 [DOXIATOOLS-79] ignore formatting commit add 417258a Bump maven-assembly-plugin from 3.4.2 to 3.5.0 add 786c94d [DOXIATOOLS-80] Update to Doxia 2.0.0-M6 (#41) add 036123e Support GitHub auto-linking to JIRA add 026b2fd [MNG-6825] Replace StringUtils with Commons Lang3 add 5940df4 Bump maven-gh-actions-shared to v3 add 8af9981 [MNG-6829] Replace StringUtils#isEmpty(String) and #isNotEmpty(String) (#49) add 4aa2b71 Bump jacoco-maven-plugin from 0.8.8 to 0.8.10 add c6b17eb Bump icu4j from 72.1 to 73.2 add 0564daf Bump org.apache.maven.plugins:maven-assembly-plugin from 3.5.0 to 3.6.0 add 91668b2 Bump commons-io:commons-io from 2.11.0 to 2.15.1 add b97c559 Bump org.jacoco:jacoco-maven-plugin from 0.8.10 to 0.8.11 add c5be7ff Bump commons-cli:commons-cli from 1.5.0 to 1.6.0 add e12ccca Bump org.apache.maven.doxia:doxia-tools from 39 to 41 add 2337218 Bump com.ibm.icu:icu4j from 73.2 to 74.2 add 46f1e0a Bump org.codehaus.plexus:plexus-utils from 3.5.0 to 4.0.0 and add plexus-xml 3.0.0 new 6f18784 Switch a few core plugins to the new api 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 (11b3d18) \ N -- N -- N refs/heads/mvn4 (6f18784) 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: .asf.yaml | 14 + .../maven-verify.yml => .git-blame-ignore-revs | 16 +- .github/workflows/maven-verify.yml | 2 +- README.md | 6 +- pom.xml| 76 ++- .../java/org/apache/maven/doxia/Converter.java | 26 +- .../org/apache/maven/doxia/ConverterException.java | 17 +- .../org/apache/maven/doxia/DefaultConverter.java | 753 + .../maven/doxia/UnsupportedFormatException.java| 25 +- .../org/apache/maven/doxia/cli/CLIManager.java | 143 ++-- .../org/apache/maven/doxia/cli/ConverterCli.java | 196 +++--- .../org/apache/maven/doxia/util/ConverterUtil.java | 104 --- .../maven/doxia/wrapper/AbstractFileWrapper.java | 79 +-- .../maven/doxia/wrapper/AbstractWrapper.java | 118 .../maven/doxia/wrapper/InputFileWrapper.java | 55 +- .../maven/doxia/wrapper/InputReaderWrapper.java| 38 +- .../maven/doxia/wrapper/OutputFileWrapper.java | 50 +- .../maven/doxia/wrapper/OutputStreamWrapper.java | 46 +- src/site/apt/index.apt | 6 +- src/site/apt/usage.apt.vm | 16 +- src/site/xdoc/download.xml.vm | 76 +--
(maven-surefire) 01/01: Upgrade Maven Verifier
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch maven-verifier-2.0.0-M1 in repository https://gitbox.apache.org/repos/asf/maven-surefire.git commit f1e473095af15fbce524c445ea07e53340a40da0 Author: Michael Osipov AuthorDate: Sat Dec 30 21:15:48 2023 +0100 Upgrade Maven Verifier --- pom.xml | 2 +- surefire-its/pom.xml| 6 ++ .../maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java | 2 +- .../java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java | 2 +- .../apache/maven/surefire/its/JUnitPlatformStreamCorruptionIT.java | 2 +- .../org/apache/maven/surefire/its/MultiModuleProjectWithJPMSIT.java | 2 +- .../src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java | 2 +- .../src/test/java/org/apache/maven/surefire/its/RunOrderIT.java | 2 +- .../src/test/java/org/apache/maven/surefire/its/Surefire1602IT.java | 2 +- .../test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java | 2 +- .../apache/maven/surefire/its/fixture/FailsafeOutputValidator.java | 2 +- .../java/org/apache/maven/surefire/its/fixture/MavenLauncher.java | 6 +++--- .../java/org/apache/maven/surefire/its/fixture/OutputValidator.java | 4 ++-- .../org/apache/maven/surefire/its/fixture/SurefireLauncher.java | 2 +- .../its/jiras/Surefire1082ParallelJUnitParameterizedIT.java | 2 +- .../maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java| 2 +- .../surefire/its/jiras/Surefire1177TestngParallelSuitesIT.java | 2 +- .../maven/surefire/its/jiras/Surefire1185DoNotSpawnTestsIT.java | 2 +- .../maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java | 2 +- .../surefire/its/jiras/Surefire1383ScanSessionDependenciesIT.java | 2 +- .../its/jiras/Surefire1426JvmCrashShouldNotBeIgnoredIT.java | 2 +- .../surefire/its/jiras/Surefire1535TestNGParallelSuitesIT.java | 2 +- .../surefire/its/jiras/Surefire1993JpmsProvidingModulesIT.java | 2 +- .../java/org/apache/maven/surefire/its/jiras/Surefire2065IT.java| 2 +- .../its/jiras/Surefire2095FailsafeJvmCrashShouldNotBeIgnoredIT.java | 2 +- .../its/jiras/Surefire649EmptyStringSystemPropertiesIT.java | 2 +- .../its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java | 2 +- .../its/jiras/Surefire747MethodParallelWithSuiteCountIT.java| 2 +- .../maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java| 2 +- .../maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java | 2 +- 30 files changed, 38 insertions(+), 32 deletions(-) diff --git a/pom.xml b/pom.xml index 80b25983c..776b06076 100644 --- a/pom.xml +++ b/pom.xml @@ -227,7 +227,7 @@ org.apache.maven.shared maven-verifier -1.8.0 +2.0.0-M1 org.codehaus.plexus diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml index 7d7f28f4b..ebef0e41f 100644 --- a/surefire-its/pom.xml +++ b/surefire-its/pom.xml @@ -47,6 +47,12 @@ maven-verifier test + + org.hamcrest + hamcrest + 2.2 + test + org.apache.maven maven-settings diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java index 5857c242b..a893c3587 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java @@ -20,7 +20,7 @@ package org.apache.maven.surefire.its; import java.util.ArrayList; -import org.apache.maven.it.VerificationException; +import org.apache.maven.shared.verifier.VerificationException; import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; import org.apache.maven.surefire.its.fixture.SurefireLauncher; import org.junit.Test; diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java index d6513b167..62f432ef1 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java @@ -21,7 +21,7 @@ package org.apache.maven.surefire.its; import java.util.ArrayList; import java.util.List; -import org.apache.maven.it.VerificationException; +import org.apache.maven.shared.verifier.VerificationException; import org.apache.maven.surefire.its.fixture.OutputValidator; import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; import org.junit.Test; diff --git
(maven-surefire) branch maven-verifier-2.0.0-M1 created (now f1e473095)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch maven-verifier-2.0.0-M1 in repository https://gitbox.apache.org/repos/asf/maven-surefire.git at f1e473095 Upgrade Maven Verifier This branch includes the following new commits: new f1e473095 Upgrade Maven Verifier 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 master updated: [DOXIA-720] Upgrade to Parent 41
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 cd6f0ce9 [DOXIA-720] Upgrade to Parent 41
cd6f0ce9 is described below
commit cd6f0ce93f488a6504c975cef831e43777dfcd91
Author: Michael Osipov
AuthorDate: Sat Dec 30 20:19:21 2023 +0100
[DOXIA-720] Upgrade to Parent 41
---
pom.xml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 62951bce..a6e2aae8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
org.apache.maven
maven-parent
-40
+41
@@ -86,7 +86,6 @@ under the License.
2023-10-13T19:24:20Z
1.7.36
5.10.0
-0.3.5
2.9.1
@@ -183,7 +182,6 @@ under the License.
org.eclipse.sisu
org.eclipse.sisu.plexus
-${sisuVersion}
com.google.inject
(maven-doxia) branch DOXIA-717 deleted (was 6056509c)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch DOXIA-717 in repository https://gitbox.apache.org/repos/asf/maven-doxia.git was 6056509c [DOXIA-717] Upgrade to org.codehaus.plexus:plexus-testing 1.3.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-doxia) branch master updated (87e8ba0e -> 6056509c)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-doxia.git from 87e8ba0e [DOXIA-719] Properly manage Commons IO/Lang 3 add 6056509c [DOXIA-717] Upgrade to org.codehaus.plexus:plexus-testing 1.3.0 No new revisions were added by this update. Summary of changes: doxia-core/pom.xml | 1 - doxia-modules/doxia-module-apt/pom.xml | 1 - doxia-modules/doxia-module-fml/pom.xml | 1 - doxia-modules/doxia-module-markdown/pom.xml | 1 - doxia-modules/doxia-module-xdoc/pom.xml | 1 - doxia-modules/doxia-module-xhtml5/pom.xml | 1 - pom.xml | 6 +++--- 7 files changed, 3 insertions(+), 9 deletions(-)
(maven-doxia) branch DOXIA-717 updated (a33b2fb0 -> 6056509c)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch DOXIA-717 in repository https://gitbox.apache.org/repos/asf/maven-doxia.git discard a33b2fb0 Merge branch 'DOXIA-717' discard 13ca11a8 [DOXIA-717] Upgrade to org.codehaus.plexus:plexus-testing 1.3.0 new 6056509c [DOXIA-717] Upgrade to org.codehaus.plexus:plexus-testing 1.3.0 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 (a33b2fb0) \ N -- N -- N refs/heads/DOXIA-717 (6056509c) 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) 01/01: [DOXIA-717] Upgrade to org.codehaus.plexus:plexus-testing 1.3.0
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch DOXIA-717 in repository https://gitbox.apache.org/repos/asf/maven-doxia.git commit 6056509c937713463e7eaad8c4e23150376178aa Author: Sylwester Lachiewicz AuthorDate: Sat Dec 30 12:22:06 2023 +0100 [DOXIA-717] Upgrade to org.codehaus.plexus:plexus-testing 1.3.0 This also upgrades to Guice 6.0.0 which is required by Plexus Testing 1.3.0. This closes #190 --- doxia-core/pom.xml | 1 - doxia-modules/doxia-module-apt/pom.xml | 1 - doxia-modules/doxia-module-fml/pom.xml | 1 - doxia-modules/doxia-module-markdown/pom.xml | 1 - doxia-modules/doxia-module-xdoc/pom.xml | 1 - doxia-modules/doxia-module-xhtml5/pom.xml | 1 - pom.xml | 6 +++--- 7 files changed, 3 insertions(+), 9 deletions(-) diff --git a/doxia-core/pom.xml b/doxia-core/pom.xml index 8b24de88..98558551 100644 --- a/doxia-core/pom.xml +++ b/doxia-core/pom.xml @@ -71,7 +71,6 @@ under the License. com.google.inject guice - no_aop test diff --git a/doxia-modules/doxia-module-apt/pom.xml b/doxia-modules/doxia-module-apt/pom.xml index 03d3cead..4cebec4b 100644 --- a/doxia-modules/doxia-module-apt/pom.xml +++ b/doxia-modules/doxia-module-apt/pom.xml @@ -61,7 +61,6 @@ under the License. com.google.inject guice - no_aop test diff --git a/doxia-modules/doxia-module-fml/pom.xml b/doxia-modules/doxia-module-fml/pom.xml index d973f11c..5ca4f69f 100644 --- a/doxia-modules/doxia-module-fml/pom.xml +++ b/doxia-modules/doxia-module-fml/pom.xml @@ -63,7 +63,6 @@ under the License. com.google.inject guice - no_aop test diff --git a/doxia-modules/doxia-module-markdown/pom.xml b/doxia-modules/doxia-module-markdown/pom.xml index 89776f70..8ec9ded5 100644 --- a/doxia-modules/doxia-module-markdown/pom.xml +++ b/doxia-modules/doxia-module-markdown/pom.xml @@ -161,7 +161,6 @@ under the License. com.google.inject guice - no_aop test diff --git a/doxia-modules/doxia-module-xdoc/pom.xml b/doxia-modules/doxia-module-xdoc/pom.xml index 0a8bd7bc..648687ed 100644 --- a/doxia-modules/doxia-module-xdoc/pom.xml +++ b/doxia-modules/doxia-module-xdoc/pom.xml @@ -63,7 +63,6 @@ under the License. com.google.inject guice - no_aop test diff --git a/doxia-modules/doxia-module-xhtml5/pom.xml b/doxia-modules/doxia-module-xhtml5/pom.xml index b7798e66..1ec21c90 100644 --- a/doxia-modules/doxia-module-xhtml5/pom.xml +++ b/doxia-modules/doxia-module-xhtml5/pom.xml @@ -62,7 +62,6 @@ under the License. com.google.inject guice - no_aop test diff --git a/pom.xml b/pom.xml index 9279c963..62951bce 100644 --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ under the License. org.codehaus.plexus plexus-testing -1.1.0 +1.3.0 test @@ -188,8 +188,8 @@ under the License. com.google.inject guice -4.2.3 -no_aop +6.0.0 +test org.codehaus.plexus
(maven-doxia) branch DOXIA-717 updated (13ca11a8 -> a33b2fb0)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch DOXIA-717 in repository https://gitbox.apache.org/repos/asf/maven-doxia.git from 13ca11a8 [DOXIA-717] Upgrade to org.codehaus.plexus:plexus-testing 1.3.0 add a8a8f2a4 (doc) Adjust dependabot config add e43b2001 [DOXIA-716] Update and unify XMLReader creation and configuration add 87e8ba0e [DOXIA-719] Properly manage Commons IO/Lang 3 new a33b2fb0 Merge branch 'DOXIA-717' 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: .github/dependabot.yml | 24 + doxia-core/pom.xml | 5 +- .../maven/doxia/parser/AbstractXmlParser.java | 6 +- .../org/apache/maven/doxia/util/XmlValidator.java | 117 + .../apache/maven/doxia/util/XmlValidatorTest.java | 3 + .../maven/doxia/xsd/AbstractXmlValidator.java | 23 ++-- doxia-modules/doxia-module-apt/pom.xml | 8 +- doxia-modules/doxia-module-fml/pom.xml | 8 ++ doxia-modules/doxia-module-markdown/pom.xml| 8 ++ doxia-modules/doxia-module-xdoc/pom.xml| 8 ++ doxia-modules/doxia-module-xhtml5/pom.xml | 9 ++ pom.xml| 10 ++ 12 files changed, 129 insertions(+), 100 deletions(-)
(maven-doxia) 01/01: Merge branch 'DOXIA-717'
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch DOXIA-717 in repository https://gitbox.apache.org/repos/asf/maven-doxia.git commit a33b2fb0ab6cf9a7958626e406bf18b076873a20 Merge: 87e8ba0e 13ca11a8 Author: Michael Osipov AuthorDate: Sat Dec 30 20:13:20 2023 +0100 Merge branch 'DOXIA-717' doxia-core/pom.xml | 1 - doxia-modules/doxia-module-apt/pom.xml | 1 - doxia-modules/doxia-module-fml/pom.xml | 1 - doxia-modules/doxia-module-markdown/pom.xml | 1 - doxia-modules/doxia-module-xdoc/pom.xml | 1 - doxia-modules/doxia-module-xhtml5/pom.xml | 1 - pom.xml | 6 +++--- 7 files changed, 3 insertions(+), 9 deletions(-)
(maven-doxia) 01/01: [DOXIA-717] Upgrade to org.codehaus.plexus:plexus-testing 1.3.0
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch DOXIA-717 in repository https://gitbox.apache.org/repos/asf/maven-doxia.git commit 13ca11a846e945a07ab41c30f62f4f7234ebdfe5 Author: Sylwester Lachiewicz AuthorDate: Sat Dec 30 12:22:06 2023 +0100 [DOXIA-717] Upgrade to org.codehaus.plexus:plexus-testing 1.3.0 This also upgrades to Guice 6.0.0 which is required by Plexus Testing 1.3.0. This closes #190 --- doxia-core/pom.xml | 1 - doxia-modules/doxia-module-apt/pom.xml | 1 - doxia-modules/doxia-module-fml/pom.xml | 1 - doxia-modules/doxia-module-markdown/pom.xml | 1 - doxia-modules/doxia-module-xdoc/pom.xml | 1 - doxia-modules/doxia-module-xhtml5/pom.xml | 1 - pom.xml | 6 +++--- 7 files changed, 3 insertions(+), 9 deletions(-) diff --git a/doxia-core/pom.xml b/doxia-core/pom.xml index c388c5bf..40318206 100644 --- a/doxia-core/pom.xml +++ b/doxia-core/pom.xml @@ -68,7 +68,6 @@ under the License. com.google.inject guice - no_aop test diff --git a/doxia-modules/doxia-module-apt/pom.xml b/doxia-modules/doxia-module-apt/pom.xml index 74ccc07d..bea9f696 100644 --- a/doxia-modules/doxia-module-apt/pom.xml +++ b/doxia-modules/doxia-module-apt/pom.xml @@ -57,7 +57,6 @@ under the License. com.google.inject guice - no_aop test diff --git a/doxia-modules/doxia-module-fml/pom.xml b/doxia-modules/doxia-module-fml/pom.xml index 40054f54..5081fa28 100644 --- a/doxia-modules/doxia-module-fml/pom.xml +++ b/doxia-modules/doxia-module-fml/pom.xml @@ -55,7 +55,6 @@ under the License. com.google.inject guice - no_aop test diff --git a/doxia-modules/doxia-module-markdown/pom.xml b/doxia-modules/doxia-module-markdown/pom.xml index f8fb1771..91d17227 100644 --- a/doxia-modules/doxia-module-markdown/pom.xml +++ b/doxia-modules/doxia-module-markdown/pom.xml @@ -153,7 +153,6 @@ under the License. com.google.inject guice - no_aop test diff --git a/doxia-modules/doxia-module-xdoc/pom.xml b/doxia-modules/doxia-module-xdoc/pom.xml index 0d513032..57b81418 100644 --- a/doxia-modules/doxia-module-xdoc/pom.xml +++ b/doxia-modules/doxia-module-xdoc/pom.xml @@ -55,7 +55,6 @@ under the License. com.google.inject guice - no_aop test diff --git a/doxia-modules/doxia-module-xhtml5/pom.xml b/doxia-modules/doxia-module-xhtml5/pom.xml index 17e5fbed..738e25b1 100644 --- a/doxia-modules/doxia-module-xhtml5/pom.xml +++ b/doxia-modules/doxia-module-xhtml5/pom.xml @@ -53,7 +53,6 @@ under the License. com.google.inject guice - no_aop test diff --git a/pom.xml b/pom.xml index 35cba5d5..a5712cf7 100644 --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ under the License. org.codehaus.plexus plexus-testing -1.1.0 +1.3.0 test @@ -188,8 +188,8 @@ under the License. com.google.inject guice -4.2.3 -no_aop +6.0.0 +test org.codehaus.plexus
(maven-doxia) branch DOXIA-717 updated (ebb37344 -> 13ca11a8)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch DOXIA-717 in repository https://gitbox.apache.org/repos/asf/maven-doxia.git omit ebb37344 [DOXIA-717] Update org.codehaus.plexus:plexus-testing to 1.3.0 new 13ca11a8 [DOXIA-717] Upgrade to org.codehaus.plexus:plexus-testing 1.3.0 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 (ebb37344) \ N -- N -- N refs/heads/DOXIA-717 (13ca11a8) 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) branch dependabot/maven/commons-io-commons-io-2.15.1 deleted (was 996cf579)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/commons-io-commons-io-2.15.1 in repository https://gitbox.apache.org/repos/asf/maven-doxia.git was 996cf579 Bump commons-io:commons-io from 2.11.0 to 2.15.1 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-doxia) branch master updated: [DOXIA-719] Properly manage Commons IO/Lang 3
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 87e8ba0e [DOXIA-719] Properly manage Commons IO/Lang 3
87e8ba0e is described below
commit 87e8ba0e44fd5bea37edacbea62f6936c2274914
Author: Michael Osipov
AuthorDate: Sat Dec 30 20:06:26 2023 +0100
[DOXIA-719] Properly manage Commons IO/Lang 3
---
doxia-core/pom.xml | 5 -
doxia-modules/doxia-module-apt/pom.xml | 8 ++--
doxia-modules/doxia-module-fml/pom.xml | 8
doxia-modules/doxia-module-markdown/pom.xml | 8
doxia-modules/doxia-module-xdoc/pom.xml | 8
doxia-modules/doxia-module-xhtml5/pom.xml | 9 +
pom.xml | 10 ++
7 files changed, 53 insertions(+), 3 deletions(-)
diff --git a/doxia-core/pom.xml b/doxia-core/pom.xml
index c388c5bf..8b24de88 100644
--- a/doxia-core/pom.xml
+++ b/doxia-core/pom.xml
@@ -51,13 +51,16 @@ under the License.
commons-io
commons-io
- 2.11.0
org.apache.commons
commons-text
1.10.0
+
+ org.apache.commons
+ commons-lang3
+
diff --git a/doxia-modules/doxia-module-apt/pom.xml
b/doxia-modules/doxia-module-apt/pom.xml
index 74ccc07d..03d3cead 100644
--- a/doxia-modules/doxia-module-apt/pom.xml
+++ b/doxia-modules/doxia-module-apt/pom.xml
@@ -47,8 +47,12 @@ under the License.
slf4j-api
- org.codehaus.plexus
- plexus-utils
+ commons-io
+ commons-io
+
+
+ org.apache.commons
+ commons-lang3
javax.inject
diff --git a/doxia-modules/doxia-module-fml/pom.xml
b/doxia-modules/doxia-module-fml/pom.xml
index 40054f54..d973f11c 100644
--- a/doxia-modules/doxia-module-fml/pom.xml
+++ b/doxia-modules/doxia-module-fml/pom.xml
@@ -50,6 +50,14 @@ under the License.
javax.inject
javax.inject
+
+ commons-io
+ commons-io
+
+
+ org.apache.commons
+ commons-lang3
+
diff --git a/doxia-modules/doxia-module-markdown/pom.xml
b/doxia-modules/doxia-module-markdown/pom.xml
index f8fb1771..89776f70 100644
--- a/doxia-modules/doxia-module-markdown/pom.xml
+++ b/doxia-modules/doxia-module-markdown/pom.xml
@@ -61,6 +61,14 @@ under the License.
javax.inject
javax.inject
+
+ commons-io
+ commons-io
+
+
+ org.apache.commons
+ commons-lang3
+
com.vladsch.flexmark
diff --git a/doxia-modules/doxia-module-xdoc/pom.xml
b/doxia-modules/doxia-module-xdoc/pom.xml
index 0d513032..0a8bd7bc 100644
--- a/doxia-modules/doxia-module-xdoc/pom.xml
+++ b/doxia-modules/doxia-module-xdoc/pom.xml
@@ -50,6 +50,14 @@ under the License.
javax.inject
javax.inject
+
+ commons-io
+ commons-io
+
+
+ org.apache.commons
+ commons-lang3
+
diff --git a/doxia-modules/doxia-module-xhtml5/pom.xml
b/doxia-modules/doxia-module-xhtml5/pom.xml
index 17e5fbed..b7798e66 100644
--- a/doxia-modules/doxia-module-xhtml5/pom.xml
+++ b/doxia-modules/doxia-module-xhtml5/pom.xml
@@ -50,6 +50,15 @@ under the License.
javax.inject
javax.inject
+
+ commons-io
+ commons-io
+
+
+ org.apache.commons
+ commons-lang3
+
+
com.google.inject
guice
diff --git a/pom.xml b/pom.xml
index 35cba5d5..9279c963 100644
--- a/pom.xml
+++ b/pom.xml
@@ -225,6 +225,16 @@ under the License.
${junitVersion}
+
+org.apache.commons
+commons-lang3
+3.14.0
+
+
+commons-io
+commons-io
+2.15.1
+
(maven-doxia) branch DOXIA-716 deleted (was e43b2001)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch DOXIA-716 in repository https://gitbox.apache.org/repos/asf/maven-doxia.git was e43b2001 [DOXIA-716] Update and unify XMLReader creation and configuration 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-doxia) branch master updated (a8a8f2a4 -> e43b2001)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-doxia.git from a8a8f2a4 (doc) Adjust dependabot config add e43b2001 [DOXIA-716] Update and unify XMLReader creation and configuration No new revisions were added by this update. Summary of changes: .../maven/doxia/parser/AbstractXmlParser.java | 6 +- .../org/apache/maven/doxia/util/XmlValidator.java | 117 + .../apache/maven/doxia/util/XmlValidatorTest.java | 3 + .../maven/doxia/xsd/AbstractXmlValidator.java | 23 ++-- 4 files changed, 74 insertions(+), 75 deletions(-)
(maven-doxia) branch DOXIA-716 updated (ce01ba04 -> e43b2001)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch DOXIA-716 in repository https://gitbox.apache.org/repos/asf/maven-doxia.git discard ce01ba04 Reuse XmlValidator discard c8edfefb Make XMLValidator configurable discard 154be56d Cache XMLReader omit 90040e0d [DOXIA-716] Update and unify XMLReader creation and configuration add a8a8f2a4 (doc) Adjust dependabot config new e43b2001 [DOXIA-716] Update and unify XMLReader creation and configuration 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 (ce01ba04) \ N -- N -- N refs/heads/DOXIA-716 (e43b2001) 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: .github/dependabot.yml | 24 ++-- 1 file changed, 2 insertions(+), 22 deletions(-)
(maven-doxia) 01/01: [DOXIA-716] Update and unify XMLReader creation and configuration
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch DOXIA-716
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit e43b2001d52119a1f48815180effd2ce643809ae
Author: Michael Osipov
AuthorDate: Fri Dec 29 21:52:37 2023 +0100
[DOXIA-716] Update and unify XMLReader creation and configuration
This closes #187
---
.../maven/doxia/parser/AbstractXmlParser.java | 6 +-
.../org/apache/maven/doxia/util/XmlValidator.java | 117 +
.../apache/maven/doxia/util/XmlValidatorTest.java | 3 +
.../maven/doxia/xsd/AbstractXmlValidator.java | 23 ++--
4 files changed, 74 insertions(+), 75 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 d0d143d6..aa60cb52 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
@@ -114,7 +114,11 @@ public abstract class AbstractXmlParser extends
AbstractParser implements XmlMar
throw new ParseException("Error reading the model", e);
}
-new XmlValidator().validate(content);
+XmlValidator validator = new XmlValidator();
+validator.setDefaultHandler(new
XmlValidator.MessagesErrorHandler());
+validator.setEntityResolver(new CachedFileEntityResolver());
+
+validator.validate(content);
src = new StringReader(content);
}
diff --git
a/doxia-core/src/main/java/org/apache/maven/doxia/util/XmlValidator.java
b/doxia-core/src/main/java/org/apache/maven/doxia/util/XmlValidator.java
index 34c0530d..709efc46 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/util/XmlValidator.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/util/XmlValidator.java
@@ -18,24 +18,26 @@
*/
package org.apache.maven.doxia.util;
-import javax.xml.XMLConstants;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
import java.io.IOException;
import java.io.StringReader;
+import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.maven.doxia.markup.XmlMarkup;
-import
org.apache.maven.doxia.parser.AbstractXmlParser.CachedFileEntityResolver;
import org.apache.maven.doxia.parser.ParseException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.DefaultHandler;
-import org.xml.sax.helpers.XMLReaderFactory;
/**
* A class to validate xml documents.
@@ -45,18 +47,37 @@ import org.xml.sax.helpers.XMLReaderFactory;
public class XmlValidator {
private static final Logger LOGGER =
LoggerFactory.getLogger(XmlValidator.class);
-/**
- * Doctype pattern i.e. ".*]*)>.*"
- * see http://www.w3.org/TR/REC-xml/#NT-doctypedecl;>http://www.w3.org/TR/REC-xml/#NT-doctypedecl.
- */
-private static final Pattern PATTERN_DOCTYPE = Pattern.compile(".*" +
XmlMarkup.DOCTYPE_START + "([^>]*)>.*");
-
-/** Tag pattern as defined in http://www.w3.org/TR/REC-xml/#NT-Name */
-private static final Pattern PATTERN_TAG =
Pattern.compile(".*<([A-Za-z][A-Za-z0-9:_.-]*)([^>]*)>.*");
-
/** lazy xmlReader to validate xml content*/
private XMLReader xmlReader;
+private boolean validate = true;
+private DefaultHandler defaultHandler;
+private EntityResolver entityResolver;
+
+public boolean isValidate() {
+return validate;
+}
+
+public void setValidate(boolean validate) {
+this.validate = validate;
+}
+
+public DefaultHandler getDefaultHandler() {
+return defaultHandler;
+}
+
+public void setDefaultHandler(DefaultHandler defaultHandler) {
+this.defaultHandler = defaultHandler;
+}
+
+public EntityResolver getEntityResolver() {
+return entityResolver;
+}
+
+public void setEntityResolver(EntityResolver entityResolver) {
+this.entityResolver = entityResolver;
+}
+
/**
* Validate an XML content with SAX.
*
@@ -65,57 +86,42 @@ public class XmlValidator {
*/
public void validate(String content) throws ParseException {
try {
-// 1 if there's a doctype
-boolean hasDoctype = false;
-Matcher matcher = PATTERN_DOCTYPE.matcher(content);
-if (matcher.find()) {
-hasDoctype = true;
-}
-
-// 2 check for an xmlns instance
-boolean hasXsd = false;
-matcher = PATTERN_TAG.matcher(content);
-if (matcher.find()) {
(maven-invoker-plugin) branch dependabot/maven/org.codehaus.plexus-plexus-interpolation-1.27 deleted (was 1d3e636)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.codehaus.plexus-plexus-interpolation-1.27 in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git was 1d3e636 Bump org.codehaus.plexus:plexus-interpolation from 1.26 to 1.27 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-invoker-plugin) branch master updated (d3a7592 -> 8b48295)
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-invoker-plugin.git from d3a7592 [MINVOKER-350] - Upgrade maven-plugin parent to 41 add 8b48295 Bump org.codehaus.plexus:plexus-interpolation from 1.26 to 1.27 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
svn commit: r1915002 - in /maven/doxia/website/content: doxia-example-book/doxia-example-book.pdf doxia-example-book/doxia-example-book.rtf mailing-lists.html
Author: svn-site-role
Date: Sat Dec 30 13:33:11 2023
New Revision: 1915002
Log:
Site checkin for project Doxia Site
Modified:
maven/doxia/website/content/doxia-example-book/doxia-example-book.pdf
maven/doxia/website/content/doxia-example-book/doxia-example-book.rtf
maven/doxia/website/content/mailing-lists.html
Modified: maven/doxia/website/content/doxia-example-book/doxia-example-book.pdf
==
Binary files - no diff available.
Modified: maven/doxia/website/content/doxia-example-book/doxia-example-book.rtf
==
--- maven/doxia/website/content/doxia-example-book/doxia-example-book.rtf
(original)
+++ maven/doxia/website/content/doxia-example-book/doxia-example-book.rtf Sat
Dec 30 13:33:11 2023
@@ -2,30 +2,30 @@
\deff0{\fonttbl{\f0\froman\fcharset0 Times New Roman;}{\f1\fswiss\fcharset0
Arial;}{\f2\froman\fcharset2 Symbol;}}
{\colortbl\red0\green0\blue0;\red255\green255\blue255;\red255\green0\blue0;\red0\green0\blue255;}
{\*\listtable
-{\list\listtemplateid2061223012\hybrid
+{\list\listtemplateid908660048\hybrid
{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelstartat1{\leveltext\'01\u-3913
?;}{\levelnumbers;}\f2\fi0\li300\ri0\tx300}
-\listid1587161517}
-{\list\listtemplateid1152922113\hybrid
+\listid1093164338}
+{\list\listtemplateid1732695638\hybrid
{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelstartat1{\leveltext\'01\u-3913
?;}{\levelnumbers;}\f2\fi0\li300\ri0\tx300}
-\listid886787744}
-{\list\listtemplateid1789412448\hybrid
+\listid177232649}
+{\list\listtemplateid594156424\hybrid
{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers
\'01;}\fi0\li400\ri0\tx400}
-\listid453631735}
-{\list\listtemplateid128503\hybrid
+\listid1644810980}
+{\list\listtemplateid603998889\hybrid
{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers
\'01;}\fi0\li400\ri0\tx400}
-\listid966421571}
-{\list\listtemplateid1651124222\hybrid
+\listid1670900754}
+{\list\listtemplateid1617829886\hybrid
{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelstartat1{\leveltext\'01\u-3913
?;}{\levelnumbers;}\f2\fi0\li300\ri0\tx300}
-\listid1193328831}
+\listid1835522317}
}
{\*\listoverridetable
-{\listoverride\listid1587161517\listoverridecount0\ls1}
-{\listoverride\listid886787744\listoverridecount0\ls2}
-{\listoverride\listid453631735\listoverridecount0\ls3}
-{\listoverride\listid966421571\listoverridecount0\ls4}
-{\listoverride\listid1193328831\listoverridecount0\ls5}
+{\listoverride\listid1093164338\listoverridecount0\ls1}
+{\listoverride\listid177232649\listoverridecount0\ls2}
+{\listoverride\listid1644810980\listoverridecount0\ls3}
+{\listoverride\listid1670900754\listoverridecount0\ls4}
+{\listoverride\listid1835522317\listoverridecount0\ls5}
}
-{\info{\operator iText by lowagie.com}{\creationdate
\yr2023\mo11\dy30\hr13\min31\sec2}{\creationdate
\yr2023\mo11\dy30\hr13\min31\sec2}{\operator Doxia iText}}
+{\info{\operator iText by lowagie.com}{\creationdate
\yr2023\mo11\dy30\hr13\min32\sec21}{\creationdate
\yr2023\mo11\dy30\hr13\min32\sec21}{\operator Doxia iText}}
\paperw11907\paperh16840\margl720\margr720\margt720\margb720
{\footer }{\header }\pgwsxn11907\pghsxn16840\sectd{\footer }{\header
}\pgwsxn11907\pghsxn16840\pard\li0\ri0\f1\fs48\cf2 1. \f1\fs48\cf2
Bindings\par\par\pard\li0\ri0\f1\fs44\cf0 1.1. \f1\fs44\cf0 Bindings Overview
\par\par\f0\fs20\cf0 \par \pard\li0\ri0\f0\fs20\cf0 \par \f1\fs20\cf0 Bindings
are one of the most important pieces of XFire. They control how the incoming
and outoing XML is mapped to objects. \par\pard\li0\ri0\f0\fs20\cf0 \par
\f1\fs20\cf0 The default binding in XFire is "Aegis". Aegis means "shield", and
the point of it is to create a simple layer which makes going between objects
and XML easy. Aegis also provides the layer which allows other bindings to
integrate with XFire - like JAXB, XMLBeans and Castor.
\par\pard\li0\ri0\f0\fs20\cf0 \par \f1\fs20\cf0 Lets take a look at how you
would use a different binding with XFire. The BindingProvider class is the one
for actually taking the xml streams and reading/writing to them. When we create
a service we need to actually s
upply a BindingProvider to the service. In the simplest case of creating a
service you're probably writing code like this: \par\f1\fs20\cf0 \par\trowd
\trftsWidth3\trwWidth10400\trkeep\trqc\trgaph10\trbrdrl\brdrs\brdrw20\brdrcf0
Modified: maven/doxia/website/content/mailing-lists.html
==
--- maven/doxia/website/content/mailing-lists.html (original)
+++ maven/doxia/website/content/mailing-lists.html Sat Dec 30 13:33:11 2023
@@ -141,26 +141,12 @@
https://mail-archives.apache.org/mod_mbox/maven-users;>mail-archives.apache.org
svn commit: r1915001 - in /maven/doxia/website/content: doxia-example-book/doxia-example-book.pdf doxia-example-book/doxia-example-book.rtf resources.html
Author: svn-site-role
Date: Sat Dec 30 13:31:54 2023
New Revision: 1915001
Log:
Site checkin for project Doxia Site
Modified:
maven/doxia/website/content/doxia-example-book/doxia-example-book.pdf
maven/doxia/website/content/doxia-example-book/doxia-example-book.rtf
maven/doxia/website/content/resources.html
Modified: maven/doxia/website/content/doxia-example-book/doxia-example-book.pdf
==
Binary files - no diff available.
Modified: maven/doxia/website/content/doxia-example-book/doxia-example-book.rtf
==
--- maven/doxia/website/content/doxia-example-book/doxia-example-book.rtf
(original)
+++ maven/doxia/website/content/doxia-example-book/doxia-example-book.rtf Sat
Dec 30 13:31:54 2023
@@ -2,30 +2,30 @@
\deff0{\fonttbl{\f0\froman\fcharset0 Times New Roman;}{\f1\fswiss\fcharset0
Arial;}{\f2\froman\fcharset2 Symbol;}}
{\colortbl\red0\green0\blue0;\red255\green255\blue255;\red255\green0\blue0;\red0\green0\blue255;}
{\*\listtable
-{\list\listtemplateid1097697570\hybrid
+{\list\listtemplateid2061223012\hybrid
{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelstartat1{\leveltext\'01\u-3913
?;}{\levelnumbers;}\f2\fi0\li300\ri0\tx300}
-\listid468211219}
-{\list\listtemplateid1785030616\hybrid
+\listid1587161517}
+{\list\listtemplateid1152922113\hybrid
{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelstartat1{\leveltext\'01\u-3913
?;}{\levelnumbers;}\f2\fi0\li300\ri0\tx300}
-\listid1758485199}
-{\list\listtemplateid1791224190\hybrid
+\listid886787744}
+{\list\listtemplateid1789412448\hybrid
{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers
\'01;}\fi0\li400\ri0\tx400}
-\listid180155351}
-{\list\listtemplateid1504559390\hybrid
+\listid453631735}
+{\list\listtemplateid128503\hybrid
{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers
\'01;}\fi0\li400\ri0\tx400}
-\listid1486156815}
-{\list\listtemplateid1622041931\hybrid
+\listid966421571}
+{\list\listtemplateid1651124222\hybrid
{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelstartat1{\leveltext\'01\u-3913
?;}{\levelnumbers;}\f2\fi0\li300\ri0\tx300}
-\listid1661354836}
+\listid1193328831}
}
{\*\listoverridetable
-{\listoverride\listid468211219\listoverridecount0\ls1}
-{\listoverride\listid1758485199\listoverridecount0\ls2}
-{\listoverride\listid180155351\listoverridecount0\ls3}
-{\listoverride\listid1486156815\listoverridecount0\ls4}
-{\listoverride\listid1661354836\listoverridecount0\ls5}
+{\listoverride\listid1587161517\listoverridecount0\ls1}
+{\listoverride\listid886787744\listoverridecount0\ls2}
+{\listoverride\listid453631735\listoverridecount0\ls3}
+{\listoverride\listid966421571\listoverridecount0\ls4}
+{\listoverride\listid1193328831\listoverridecount0\ls5}
}
-{\info{\operator iText by lowagie.com}{\creationdate
\yr2023\mo11\dy30\hr13\min16\sec22}{\creationdate
\yr2023\mo11\dy30\hr13\min16\sec22}{\operator Doxia iText}}
+{\info{\operator iText by lowagie.com}{\creationdate
\yr2023\mo11\dy30\hr13\min31\sec2}{\creationdate
\yr2023\mo11\dy30\hr13\min31\sec2}{\operator Doxia iText}}
\paperw11907\paperh16840\margl720\margr720\margt720\margb720
{\footer }{\header }\pgwsxn11907\pghsxn16840\sectd{\footer }{\header
}\pgwsxn11907\pghsxn16840\pard\li0\ri0\f1\fs48\cf2 1. \f1\fs48\cf2
Bindings\par\par\pard\li0\ri0\f1\fs44\cf0 1.1. \f1\fs44\cf0 Bindings Overview
\par\par\f0\fs20\cf0 \par \pard\li0\ri0\f0\fs20\cf0 \par \f1\fs20\cf0 Bindings
are one of the most important pieces of XFire. They control how the incoming
and outoing XML is mapped to objects. \par\pard\li0\ri0\f0\fs20\cf0 \par
\f1\fs20\cf0 The default binding in XFire is "Aegis". Aegis means "shield", and
the point of it is to create a simple layer which makes going between objects
and XML easy. Aegis also provides the layer which allows other bindings to
integrate with XFire - like JAXB, XMLBeans and Castor.
\par\pard\li0\ri0\f0\fs20\cf0 \par \f1\fs20\cf0 Lets take a look at how you
would use a different binding with XFire. The BindingProvider class is the one
for actually taking the xml streams and reading/writing to them. When we create
a service we need to actually s
upply a BindingProvider to the service. In the simplest case of creating a
service you're probably writing code like this: \par\f1\fs20\cf0 \par\trowd
\trftsWidth3\trwWidth10400\trkeep\trqc\trgaph10\trbrdrl\brdrs\brdrw20\brdrcf0
Modified: maven/doxia/website/content/resources.html
==
--- maven/doxia/website/content/resources.html (original)
+++ maven/doxia/website/content/resources.html Sat Dec 30 13:31:54 2023
@@ -139,18 +139,7 @@
http://en.wikipedia.org/wiki/Lightweight_markup_language;>Lightweight
markup language
(maven-doxia-site) branch DOXIA-540 deleted (was 69b2d34)
This is an automated email from the ASF dual-hosted git repository. elharo pushed a change to branch DOXIA-540 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git was 69b2d34 Merge branch 'master' into DOXIA-540 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-doxia-site) branch master updated: [DOXIA-540] remove markmail links (#32)
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-doxia-site.git The following commit(s) were added to refs/heads/master by this push: new 541 [DOXIA-540] remove markmail links (#32) 541 is described below commit 54130bfc08838efe75232a72bd74f6340246 Author: Elliotte Rusty Harold AuthorDate: Sat Dec 30 13:30:50 2023 + [DOXIA-540] remove markmail links (#32) * remove markmail links --- pom.xml | 9 - 1 file changed, 9 deletions(-) diff --git a/pom.xml b/pom.xml index 0286bf5..2879788 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,6 @@ under the License. https://mail-archives.apache.org/mod_mbox/maven-users https://www.mail-archive.com/users@maven.apache.org/ - https://markmail.org/list/org.apache.maven.users @@ -57,7 +56,6 @@ under the License. https://mail-archives.apache.org/mod_mbox/maven-dev https://www.mail-archive.com/dev@maven.apache.org/ - https://markmail.org/list/org.apache.maven.dev @@ -68,7 +66,6 @@ under the License. https://www.mail-archive.com/commits@maven.apache.org https://old.nabble.com/Maven---Commits-f15575.html - https://markmail.org/list/org.apache.maven.commits @@ -78,7 +75,6 @@ under the License. https://mail-archives.apache.org/mod_mbox/maven-issues/ https://www.mail-archive.com/issues@maven.apache.org - https://markmail.org/list/org.apache.maven.issues @@ -86,7 +82,6 @@ under the License. https://mail-archives.apache.org/mod_mbox/maven-doxia-dev/ https://www.mail-archive.com/doxia-dev@maven.apache.org - https://markmail.org/list/org.apache.maven.doxia-dev @@ -94,7 +89,6 @@ under the License. https://mail-archives.apache.org/mod_mbox/maven-doxia-users/ https://www.mail-archive.com/doxia-users@maven.apache.org - https://markmail.org/list/org.apache.maven.doxia-users @@ -102,7 +96,6 @@ under the License. https://mail-archives.apache.org/mod_mbox/maven-doxia-commits/ https://www.mail-archive.com/doxia-commits@maven.apache.org - https://markmail.org/list/org.apache.maven.doxia-commits @@ -116,7 +109,6 @@ under the License. https://www.mail-archive.com/announce@maven.apache.org https://www.nabble.com/Maven-Announcements-f15617.html - https://markmail.org/list/org.apache.maven.announces @@ -126,7 +118,6 @@ under the License. https://mail-archives.apache.org/mod_mbox/maven-notifications/ https://www.mail-archive.com/notifications@maven.apache.org - https://markmail.org/list/org.apache.maven.notifications
(maven-doxia-site) branch elharo-patch-1 deleted (was 5c44a81)
This is an automated email from the ASF dual-hosted git repository. elharo pushed a change to branch elharo-patch-1 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git was 5c44a81 [DOXIA-540] Remove IDE integration 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-doxia-site) branch master updated: [DOXIA-540] Remove IDE integration (#33)
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-doxia-site.git
The following commit(s) were added to refs/heads/master by this push:
new afe1163 [DOXIA-540] Remove IDE integration (#33)
afe1163 is described below
commit afe1163c4af0b44a5c9d9eb96c817dcbb5884f7f
Author: Elliotte Rusty Harold
AuthorDate: Sat Dec 30 13:30:19 2023 +
[DOXIA-540] Remove IDE integration (#33)
Per @mosipov none of this is working
---
content/apt/resources.apt | 10 --
1 file changed, 10 deletions(-)
diff --git a/content/apt/resources.apt b/content/apt/resources.apt
index 973eb95..d456567 100644
--- a/content/apt/resources.apt
+++ b/content/apt/resources.apt
@@ -46,16 +46,6 @@ External Resources
| {{{http://en.wikipedia.org/wiki/Lightweight_markup_language}Lightweight
markup language}} | wikipedia.org | ?
*---+--+--+
-* Tools
-
-*---+--+
-|| Name|| Author
-*---+--+
-| {{{http://apteditor.sourceforge.net/}APT Editor (Eclipse plugin)}} | Mathieu
Avoine
-*---+--+
-| {{{http://code.google.com/p/nb-doxia-support/}nb-doxia-support (NetBeans
plugin)}} | Allan Lykke Christensen
-*---+--+
-
Related External Projects
* {{{http://www.xwiki.org/}XWiki}} which uses Doxia in its
(maven-doxia-site) branch elharo-patch-1 created (now 5c44a81)
This is an automated email from the ASF dual-hosted git repository. elharo pushed a change to branch elharo-patch-1 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git at 5c44a81 [DOXIA-540] Remove IDE integration This branch includes the following new commits: new 5c44a81 [DOXIA-540] Remove IDE integration 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-site) 01/01: [DOXIA-540] Remove IDE integration
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch elharo-patch-1
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit 5c44a811aa5d47bea78ac9ea4ddf1480d803e705
Author: Elliotte Rusty Harold
AuthorDate: Sat Dec 30 13:23:49 2023 +
[DOXIA-540] Remove IDE integration
Per @mosipov none of this is working
---
content/apt/resources.apt | 10 --
1 file changed, 10 deletions(-)
diff --git a/content/apt/resources.apt b/content/apt/resources.apt
index 973eb95..d456567 100644
--- a/content/apt/resources.apt
+++ b/content/apt/resources.apt
@@ -46,16 +46,6 @@ External Resources
| {{{http://en.wikipedia.org/wiki/Lightweight_markup_language}Lightweight
markup language}} | wikipedia.org | ?
*---+--+--+
-* Tools
-
-*---+--+
-|| Name|| Author
-*---+--+
-| {{{http://apteditor.sourceforge.net/}APT Editor (Eclipse plugin)}} | Mathieu
Avoine
-*---+--+
-| {{{http://code.google.com/p/nb-doxia-support/}nb-doxia-support (NetBeans
plugin)}} | Allan Lykke Christensen
-*---+--+
-
Related External Projects
* {{{http://www.xwiki.org/}XWiki}} which uses Doxia in its
(maven-doxia-site) branch DOXIA-540 updated (09fcd56 -> 69b2d34)
This is an automated email from the ASF dual-hosted git repository. elharo pushed a change to branch DOXIA-540 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git from 09fcd56 remove markmail links add ecd62ed Try to unbreak CI (#28) new 69b2d34 Merge branch 'master' into DOXIA-540 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-site) 01/01: Merge branch 'master' into DOXIA-540
This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch DOXIA-540 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git commit 69b2d34670fc33faeffa57768ade1bc46538c2fc Merge: 09fcd56 ecd62ed Author: Elliotte Rusty Harold AuthorDate: Sat Dec 30 08:18:24 2023 -0500 Merge branch 'master' into DOXIA-540
svn commit: r1915000 - in /maven/doxia/website/content: ./ book/ doxia-example-book/ doxia-tools/
Author: svn-site-role
Date: Sat Dec 30 13:17:54 2023
New Revision: 1915000
Log:
Site checkin for project Doxia Site
Removed:
maven/doxia/website/content/doxia-archives
maven/doxia/website/content/doxia-ide
maven/doxia/website/content/doxia-sitetools
maven/doxia/website/content/doxia-sitetools-archives
maven/doxia/website/content/doxia-tools/doxia-book-maven-plugin
maven/doxia/website/content/doxia-tools/doxia-book-renderer
maven/doxia/website/content/doxia-tools/doxia-converter
maven/doxia/website/content/doxia-tools/doxia-linkcheck
Modified:
maven/doxia/website/content/.htaccess
maven/doxia/website/content/book/index.html
maven/doxia/website/content/components.links
maven/doxia/website/content/doxia-example-book/doxia-example-book.pdf
maven/doxia/website/content/doxia-example-book/doxia-example-book.rtf
maven/doxia/website/content/doxia-tools/components.links
maven/doxia/website/content/doxia-tools/index.html
Modified: maven/doxia/website/content/.htaccess
==
--- maven/doxia/website/content/.htaccess (original)
+++ maven/doxia/website/content/.htaccess Sat Dec 30 13:17:54 2023
@@ -1,7 +1,6 @@
# Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements; and to You under the Apache License, Version
2.0.
RedirectMatch permanent ^/doxia/doxia-1.2/(.*)$
/doxia/doxia-archives/doxia-1.2/$1
RedirectMatch permanent ^/doxia/doxia-sitetools-1.2
/doxia/doxia-sitetools-archives/doxia-sitetools-1.2/$1
-Redirect Permanent /doxia/doxia-ide/index.html /doxia/doxia-ide.html
# support resources pointed from /doxia/*-archives/
Redirect Permanent /doxia/images/apache-maven-project.png
/images/apache-maven-project.png
RedirectMatch permanent ^/doxia/.*-archives/images/(.*)$ /doxia/images/$1
Modified: maven/doxia/website/content/book/index.html
==
--- maven/doxia/website/content/book/index.html (original)
+++ maven/doxia/website/content/book/index.html Sat Dec 30 13:17:54 2023
@@ -119,14 +119,13 @@ Vincent Siveton" />
Introduction
-Doxia allows you to write books like user manuals and guides in any format
supported by Doxia. Combined with the Doxia Book Maven you are able to include
the manuals directly in your generated site with links to the off-line friendly
formats like XDoc, PDF, RTF and LaTeX.
+Doxia allows you to write books like user manuals and guides in any format
supported by Doxia. You can include the manuals directly in your generated site
with links to the off-line friendly formats like XDoc, PDF, RTF and LaTeX.
The Xdoc output which has been rendered into this site can be viewed here.
The generated PDF is here and the generated
RTF here.
How It Works
-The only thing you need in addition to the content files itself is a simple
book descriptor which is used to specify the ordering of the sections and the
names for the chapters.
-See The Book
Descriptor Reference for a reference to the
descriptor.
+The only thing you need in addition to the content files is a simple book
descriptor which specifies the ordering of the sections and the names for the
chapters.
Creating a Book Descriptor
-An XML file is used to describe the layout of the book.
+An XML file describes the layout of the book.
A sample is given below:
book
xmlns=http://maven.apache.org/BOOK/1.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
Modified: maven/doxia/website/content/components.links
==
--- maven/doxia/website/content/components.links (original)
+++ maven/doxia/website/content/components.links Sat Dec 30 13:17:54 2023
@@ -3,8 +3,4 @@
# links property file for Ant's symlink task in pom.xml:
# links to components in https://maven.apache.org/doxia/components/
doxia=components/doxia
-doxia-archives=components/doxia-archives
-doxia-sitetools=components/doxia-sitetools
-doxia-sitetools-archives=components/doxia-sitetools-archives
-doxia-ide=components/doxia-ide
doxia-tools-archives=components/doxia-tools-archives
Modified: maven/doxia/website/content/doxia-example-book/doxia-example-book.pdf
==
Binary files - no diff available.
Modified: maven/doxia/website/content/doxia-example-book/doxia-example-book.rtf
==
--- maven/doxia/website/content/doxia-example-book/doxia-example-book.rtf
(original)
+++ maven/doxia/website/content/doxia-example-book/doxia-example-book.rtf Sat
Dec 30 13:17:54 2023
@@ -2,30 +2,30 @@
\deff0{\fonttbl{\f0\froman\fcharset0 Times New Roman;}{\f1\fswiss\fcharset0
Arial;}{\f2\froman\fcharset2 Symbol;}}
(maven-doxia-site) 01/01: remove markmail links
This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch DOXIA-540 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git commit 09fcd56c71398f3db53d3b2b6047b5d429877b86 Author: Elliotte Rusty Harold AuthorDate: Sat Dec 30 08:17:11 2023 -0500 remove markmail links --- pom.xml | 9 - 1 file changed, 9 deletions(-) diff --git a/pom.xml b/pom.xml index 0286bf5..2879788 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,6 @@ under the License. https://mail-archives.apache.org/mod_mbox/maven-users https://www.mail-archive.com/users@maven.apache.org/ - https://markmail.org/list/org.apache.maven.users @@ -57,7 +56,6 @@ under the License. https://mail-archives.apache.org/mod_mbox/maven-dev https://www.mail-archive.com/dev@maven.apache.org/ - https://markmail.org/list/org.apache.maven.dev @@ -68,7 +66,6 @@ under the License. https://www.mail-archive.com/commits@maven.apache.org https://old.nabble.com/Maven---Commits-f15575.html - https://markmail.org/list/org.apache.maven.commits @@ -78,7 +75,6 @@ under the License. https://mail-archives.apache.org/mod_mbox/maven-issues/ https://www.mail-archive.com/issues@maven.apache.org - https://markmail.org/list/org.apache.maven.issues @@ -86,7 +82,6 @@ under the License. https://mail-archives.apache.org/mod_mbox/maven-doxia-dev/ https://www.mail-archive.com/doxia-dev@maven.apache.org - https://markmail.org/list/org.apache.maven.doxia-dev @@ -94,7 +89,6 @@ under the License. https://mail-archives.apache.org/mod_mbox/maven-doxia-users/ https://www.mail-archive.com/doxia-users@maven.apache.org - https://markmail.org/list/org.apache.maven.doxia-users @@ -102,7 +96,6 @@ under the License. https://mail-archives.apache.org/mod_mbox/maven-doxia-commits/ https://www.mail-archive.com/doxia-commits@maven.apache.org - https://markmail.org/list/org.apache.maven.doxia-commits @@ -116,7 +109,6 @@ under the License. https://www.mail-archive.com/announce@maven.apache.org https://www.nabble.com/Maven-Announcements-f15617.html - https://markmail.org/list/org.apache.maven.announces @@ -126,7 +118,6 @@ under the License. https://mail-archives.apache.org/mod_mbox/maven-notifications/ https://www.mail-archive.com/notifications@maven.apache.org - https://markmail.org/list/org.apache.maven.notifications
(maven-doxia-site) branch DOXIA-540 created (now 09fcd56)
This is an automated email from the ASF dual-hosted git repository. elharo pushed a change to branch DOXIA-540 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git at 09fcd56 remove markmail links This branch includes the following new commits: new 09fcd56 remove markmail links 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-site) branch DOXIA-703 deleted (was 8728729)
This is an automated email from the ASF dual-hosted git repository. elharo pushed a change to branch DOXIA-703 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git was 8728729 Merge branch 'DOXIA-703' of github.com:apache/maven-doxia-site into DOXIA-703 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-doxia-site) branch master updated: Try to unbreak CI (#28)
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-doxia-site.git
The following commit(s) were added to refs/heads/master by this push:
new ecd62ed Try to unbreak CI (#28)
ecd62ed is described below
commit ecd62ed94b6e9445237e780171edff8f437a4895
Author: Elliotte Rusty Harold
AuthorDate: Sat Dec 30 13:14:44 2023 +
Try to unbreak CI (#28)
* run-on sentence\
* remove book renderer vestiges
* failonerror=False
* simplify language
---
content/apt/book/index.apt | 9 +++--
content/apt/doxia-tools/index.apt | 2 --
content/resources/.htaccess| 1 -
content/resources/components.links | 4
content/resources/doxia-tools/components.links | 4
pom.xml| 2 +-
6 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/content/apt/book/index.apt b/content/apt/book/index.apt
index 98c3c58..0fe35ae 100644
--- a/content/apt/book/index.apt
+++ b/content/apt/book/index.apt
@@ -29,8 +29,7 @@
Introduction
- Doxia allows you to write books like user manuals and guides in any format
supported by Doxia. Combined with the
- Doxia Book Maven you are able to include the manuals directly in your
generated site with links to the off-line
+ Doxia allows you to write books like user manuals and guides in any format
supported by Doxia. You can include the manuals directly in your generated site
with links to the off-line
friendly formats like XDoc, PDF, RTF and LaTeX.
The Xdoc output which has been rendered into this site can be viewed
{{{../doxia-example-book/index.html}here}}.
@@ -40,14 +39,12 @@ Introduction
* How It Works
- The only thing you need in addition to the content files itself is a simple
book descriptor which is used to specify
+ The only thing you need in addition to the content files is a simple book
descriptor which specifies
the ordering of the sections and the names for the chapters.
- See {{{../doxia-tools/doxia-book-renderer/book.html}The Book Descriptor
Reference}} for a reference to the descriptor.
-
* Creating a Book Descriptor
- An XML file is used to describe the layout of the book.
+ An XML file describes the layout of the book.
A sample is given below:
diff --git a/content/apt/doxia-tools/index.apt
b/content/apt/doxia-tools/index.apt
index 97b4a85..e07a513 100644
--- a/content/apt/doxia-tools/index.apt
+++ b/content/apt/doxia-tools/index.apt
@@ -39,5 +39,3 @@ Available Doxia Tools
*--+--++--+++
| {{{./doxia-book-maven-plugin/} Doxia Book Maven Plugin}} | 1.2
| 2010-11-09 | Create books in different output formats. |
{{{https://gitbox.apache.org/repos/asf/maven-doxia-book-maven-plugin.git}Git}}
/ {{{https://github.com/apache/maven-doxia-book-maven-plugin/}GitHub}} |
{{{https://issues.apache.org/jira/browse/DOXIATOOLS}Jira DOXIATOOLS}}
*--+--++--+++
-| {{{./doxia-book-renderer/} Doxia Book Renderer}} | 1.2
| 2010-11-09 | |
{{{https://gitbox.apache.org/repos/asf/maven-doxia-book-renderer.git}Git}} /
{{{https://github.com/apache/maven-doxia-book-renderer/}GitHub}} |
{{{https://issues.apache.org/jira/browse/DOXIATOOLS}Jira DOXIATOOLS}}
-*--+--++--+++
diff --git a/content/resources/.htaccess b/content/resources/.htaccess
index 08cb365..7ceef2c 100644
--- a/content/resources/.htaccess
+++ b/content/resources/.htaccess
@@ -1,7 +1,6 @@
# Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements; and to You under the Apache License, Version
2.0.
RedirectMatch permanent ^/doxia/doxia-1.2/(.*)$
/doxia/doxia-archives/doxia-1.2/$1
RedirectMatch permanent ^/doxia/doxia-sitetools-1.2
/doxia/doxia-sitetools-archives/doxia-sitetools-1.2/$1
-Redirect Permanent /doxia/doxia-ide/index.html /doxia/doxia-ide.html
# support resources pointed from /doxia/*-archives/
Redirect Permanent /doxia/images/apache-maven-project.png
/images/apache-maven-project.png
RedirectMatch permanent ^/doxia/.*-archives/images/(.*)$ /doxia/images/$1
diff --git a/content/resources/components.links
b/content/resources/components.links
index 993f4b9..0d4e641 100644
--- a/content/resources/components.links
+++ b/content/resources/components.links
@@ -3,8 +3,4 @@
# links property file for Ant's symlink task in pom.xml:
# links to components in https://maven.apache.org/doxia/components/
doxia=components/doxia
(maven-doxia) 02/03: Make XMLValidator configurable
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch DOXIA-716
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit c8edfefb36b7b4d3639dd3f8cf39db7e8345960a
Author: Michael Osipov
AuthorDate: Sat Dec 30 13:40:13 2023 +0100
Make XMLValidator configurable
---
.../maven/doxia/parser/AbstractXmlParser.java | 6 ++-
.../org/apache/maven/doxia/util/XmlValidator.java | 46 +-
.../apache/maven/doxia/util/XmlValidatorTest.java | 3 ++
3 files changed, 44 insertions(+), 11 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 d0d143d6..aa60cb52 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
@@ -114,7 +114,11 @@ public abstract class AbstractXmlParser extends
AbstractParser implements XmlMar
throw new ParseException("Error reading the model", e);
}
-new XmlValidator().validate(content);
+XmlValidator validator = new XmlValidator();
+validator.setDefaultHandler(new
XmlValidator.MessagesErrorHandler());
+validator.setEntityResolver(new CachedFileEntityResolver());
+
+validator.validate(content);
src = new StringReader(content);
}
diff --git
a/doxia-core/src/main/java/org/apache/maven/doxia/util/XmlValidator.java
b/doxia-core/src/main/java/org/apache/maven/doxia/util/XmlValidator.java
index 6f3b8dcf..709efc46 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/util/XmlValidator.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/util/XmlValidator.java
@@ -29,10 +29,10 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.maven.doxia.markup.XmlMarkup;
-import
org.apache.maven.doxia.parser.AbstractXmlParser.CachedFileEntityResolver;
import org.apache.maven.doxia.parser.ParseException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
@@ -50,6 +50,34 @@ public class XmlValidator {
/** lazy xmlReader to validate xml content*/
private XMLReader xmlReader;
+private boolean validate = true;
+private DefaultHandler defaultHandler;
+private EntityResolver entityResolver;
+
+public boolean isValidate() {
+return validate;
+}
+
+public void setValidate(boolean validate) {
+this.validate = validate;
+}
+
+public DefaultHandler getDefaultHandler() {
+return defaultHandler;
+}
+
+public void setDefaultHandler(DefaultHandler defaultHandler) {
+this.defaultHandler = defaultHandler;
+}
+
+public EntityResolver getEntityResolver() {
+return entityResolver;
+}
+
+public void setEntityResolver(EntityResolver entityResolver) {
+this.entityResolver = entityResolver;
+}
+
/**
* Validate an XML content with SAX.
*
@@ -69,7 +97,7 @@ public class XmlValidator {
* @throws SAXException if any
* @throws ParserConfigurationException
*/
-private XMLReader getXmlReader() throws SAXException,
ParserConfigurationException {
+public XMLReader getXmlReader() throws SAXException,
ParserConfigurationException {
if (xmlReader == null) {
SAXParserFactory parserFactory = SAXParserFactory.newInstance();
parserFactory.setNamespaceAware(true);
@@ -80,11 +108,11 @@ public class XmlValidator {
// Always force language-neutral exception messages for
MessagesErrorHandler
parser.setProperty("http://apache.org/xml/properties/locale;,
Locale.ROOT);
xmlReader = parser.getXMLReader();
-xmlReader.setFeature("http://xml.org/sax/features/validation;,
true);
-
xmlReader.setFeature("http://apache.org/xml/features/validation/dynamic;, true);
-
xmlReader.setFeature("http://apache.org/xml/features/validation/schema;, true);
-xmlReader.setErrorHandler(new MessagesErrorHandler());
-xmlReader.setEntityResolver(new CachedFileEntityResolver());
+xmlReader.setFeature("http://xml.org/sax/features/validation;,
isValidate());
+
xmlReader.setFeature("http://apache.org/xml/features/validation/dynamic;,
isValidate());
+
xmlReader.setFeature("http://apache.org/xml/features/validation/schema;,
isValidate());
+xmlReader.setErrorHandler(getDefaultHandler());
+xmlReader.setEntityResolver(getEntityResolver());
}
return xmlReader;
@@ -93,7 +121,7 @@ public class XmlValidator {
/**
* Convenience class to beautify
(maven-doxia) 01/03: Cache XMLReader
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch DOXIA-716
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit 154be56d505eef58aef74f96ece98bfdb09fc1a4
Author: Michael Osipov
AuthorDate: Sat Dec 30 13:24:51 2023 +0100
Cache XMLReader
---
.../test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git
a/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
b/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
index d844dfb1..05e82f04 100644
---
a/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
+++
b/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
@@ -200,10 +200,11 @@ public abstract class AbstractXmlValidator {
private List parseXML(String content) throws IOException,
SAXException {
String xmlContent = addNamespaces(content);
-MessagesErrorHandler errorHandler =
-(MessagesErrorHandler) getXMLReader().getErrorHandler();
+XMLReader xmlReader = getXMLReader();
-getXMLReader().parse(new InputSource(new StringReader(xmlContent)));
+MessagesErrorHandler errorHandler = (MessagesErrorHandler)
xmlReader.getErrorHandler();
+
+xmlReader.parse(new InputSource(new StringReader(xmlContent)));
return errorHandler.getMessages();
}
(maven-doxia) branch DOXIA-716 updated (90040e0d -> ce01ba04)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch DOXIA-716 in repository https://gitbox.apache.org/repos/asf/maven-doxia.git from 90040e0d [DOXIA-716] Update and unify XMLReader creation and configuration new 154be56d Cache XMLReader new c8edfefb Make XMLValidator configurable new ce01ba04 Reuse XmlValidator The 3 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 | 6 ++- .../org/apache/maven/doxia/util/XmlValidator.java | 46 +- .../apache/maven/doxia/util/XmlValidatorTest.java | 3 ++ .../maven/doxia/xsd/AbstractXmlValidator.java | 30 +- 4 files changed, 54 insertions(+), 31 deletions(-)
(maven-doxia) 03/03: Reuse XmlValidator
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch DOXIA-716
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit ce01ba043e784e1293805782ca258e40aba8c218
Author: Michael Osipov
AuthorDate: Sat Dec 30 13:45:36 2023 +0100
Reuse XmlValidator
---
.../maven/doxia/xsd/AbstractXmlValidator.java | 23 ++
1 file changed, 6 insertions(+), 17 deletions(-)
diff --git
a/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
b/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
index 05e82f04..4da6182b 100644
---
a/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
+++
b/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
@@ -19,17 +19,15 @@
package org.apache.maven.doxia.xsd;
import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
import java.io.IOException;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.Locale;
import java.util.Map;
+import org.apache.maven.doxia.util.XmlValidator;
import org.codehaus.plexus.testing.PlexusTest;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
@@ -161,20 +159,11 @@ public abstract class AbstractXmlValidator {
private XMLReader getXMLReader() {
if (xmlReader == null) {
try {
-SAXParserFactory parserFactory =
SAXParserFactory.newInstance();
-parserFactory.setNamespaceAware(true);
-SAXParser parser = parserFactory.newSAXParser();
-// If both DTD and XSD are provided, force XSD
-parser.setProperty(
-
"http://java.sun.com/xml/jaxp/properties/schemaLanguage;,
"http://www.w3.org/2001/XMLSchema;);
-// Always force language-neutral exception messages for
MessagesErrorHandler
-parser.setProperty("http://apache.org/xml/properties/locale;,
Locale.ROOT);
-xmlReader = parser.getXMLReader();
-xmlReader.setFeature("http://xml.org/sax/features/validation;,
validate);
-
xmlReader.setFeature("http://apache.org/xml/features/validation/dynamic;,
validate);
-
xmlReader.setFeature("http://apache.org/xml/features/validation/schema;,
validate);
-xmlReader.setErrorHandler(new MessagesErrorHandler());
-xmlReader.setEntityResolver(getEntityResolver());
+XmlValidator validator = new XmlValidator();
+validator.setValidate(validate);
+validator.setDefaultHandler(new MessagesErrorHandler());
+validator.setEntityResolver(getEntityResolver());
+xmlReader = validator.getXmlReader();
} catch (SAXNotRecognizedException e) {
fail("SAXNotRecognizedException: " + e.getMessage());
} catch (SAXNotSupportedException e) {
(maven-invoker) branch dependabot/maven/org.apache.maven.shared-maven-shared-components-41 deleted (was a25246e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.shared-maven-shared-components-41 in repository https://gitbox.apache.org/repos/asf/maven-invoker.git was a25246e Bump org.apache.maven.shared:maven-shared-components from 39 to 41 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-invoker) branch master updated: Bump org.apache.maven.shared:maven-shared-components from 39 to 41 (#70)
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-invoker.git The following commit(s) were added to refs/heads/master by this push: new 30a4e72 Bump org.apache.maven.shared:maven-shared-components from 39 to 41 (#70) 30a4e72 is described below commit 30a4e726dee3d05b88114c12311e472e2a414ddd Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Sat Dec 30 13:46:32 2023 +0100 Bump org.apache.maven.shared:maven-shared-components from 39 to 41 (#70) Bumps [org.apache.maven.shared:maven-shared-components](https://github.com/apache/maven-parent) from 39 to 41. - [Release notes](https://github.com/apache/maven-parent/releases) - [Commits](https://github.com/apache/maven-parent/commits) --- updated-dependencies: - dependency-name: org.apache.maven.shared:maven-shared-components dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d69da99..bf364b5 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.shared maven-shared-components -39 +41
(maven-invoker) branch dependabot/maven/org.apache.maven.shared-maven-shared-components-41 updated (a5740fa -> a25246e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.shared-maven-shared-components-41 in repository https://gitbox.apache.org/repos/asf/maven-invoker.git discard a5740fa Bump org.apache.maven.shared:maven-shared-components from 39 to 41 add 118f541 Bump org.junit:junit-bom from 5.10.0 to 5.10.1 add a25246e Bump org.apache.maven.shared:maven-shared-components from 39 to 41 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 (a5740fa) \ N -- N -- N refs/heads/dependabot/maven/org.apache.maven.shared-maven-shared-components-41 (a25246e) 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. No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(maven-invoker-plugin) branch dependabot/maven/org.codehaus.plexus-plexus-interpolation-1.27 updated (7d4edbb -> 1d3e636)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.codehaus.plexus-plexus-interpolation-1.27 in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git omit 7d4edbb Bump org.codehaus.plexus:plexus-interpolation from 1.26 to 1.27 add d3a7592 [MINVOKER-350] - Upgrade maven-plugin parent to 41 add 1d3e636 Bump org.codehaus.plexus:plexus-interpolation from 1.26 to 1.27 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 (7d4edbb) \ N -- N -- N refs/heads/dependabot/maven/org.codehaus.plexus-plexus-interpolation-1.27 (1d3e636) 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. No new revisions were added by this update. Summary of changes: pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
(maven-help-plugin) branch dependabot/maven/org.apache.maven.shared-maven-shared-utils-3.4.2 deleted (was 32cbd04)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch dependabot/maven/org.apache.maven.shared-maven-shared-utils-3.4.2 in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git was 32cbd04 Bump org.apache.maven.shared:maven-shared-utils from 3.4.1 to 3.4.2 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-doxia-site) branch DOXIA-703 updated (22174b4 -> 8728729)
This is an automated email from the ASF dual-hosted git repository. elharo pushed a change to branch DOXIA-703 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git from 22174b4 simplify language add 2778eb7 run-on sentence add dde5034 Update apt-format.apt add 9fe84d0 Merge branch 'master' into elharo-patch-1 add 9c03f14 Merge branch 'master' into elharo-patch-1 add 68e70ca remove reference to deleted page add 629707f Revert "run-on sentence" add 1743bb6 revert add 98140e8 revert add 4390b97 remove book renderer vestiges add f4632e9 doxia-linkcheck add 2d14746 failonerror=False add 6d7fea8 spotless add 89ed796 last one add 3ef1270 try latest site plugin add 71f1a8c Revert "try latest site plugin" add ad2cea5 doxia-sitetools add 0d2d04a doxia-archives add b849157 one more add 8728729 Merge branch 'DOXIA-703' of github.com:apache/maven-doxia-site into DOXIA-703 No new revisions were added by this update. Summary of changes:
(maven-invoker-plugin) branch MINVOKER-350 deleted (was d3a7592)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MINVOKER-350 in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git was d3a7592 [MINVOKER-350] - Upgrade maven-plugin parent to 41 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-invoker-plugin) branch master updated (fd33352 -> d3a7592)
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-invoker-plugin.git from fd33352 Add .checkstyle to .gitignore add d3a7592 [MINVOKER-350] - Upgrade maven-plugin parent to 41 No new revisions were added by this update. Summary of changes: pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
(maven-help-plugin) branch master updated: Bump org.apache.maven.shared:maven-shared-utils from 3.4.1 to 3.4.2
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git The following commit(s) were added to refs/heads/master by this push: new 7d0ebff Bump org.apache.maven.shared:maven-shared-utils from 3.4.1 to 3.4.2 7d0ebff is described below commit 7d0ebffd36dc7cc7b5e0e6f3dd5cda4ad52549bf Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Dec 25 15:11:46 2023 + Bump org.apache.maven.shared:maven-shared-utils from 3.4.1 to 3.4.2 Bumps [org.apache.maven.shared:maven-shared-utils](https://github.com/apache/maven-shared-utils) from 3.4.1 to 3.4.2. - [Release notes](https://github.com/apache/maven-shared-utils/releases) - [Commits](https://github.com/apache/maven-shared-utils/compare/maven-shared-utils-3.4.1...maven-shared-utils-3.4.2) --- updated-dependencies: - dependency-name: org.apache.maven.shared:maven-shared-utils dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6981613..80a5901 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ org.apache.maven.shared maven-shared-utils - 3.4.1 + 3.4.2 commons-io
svn commit: r1914996 - in /maven/doxia/website/content/doxia-example-book: doxia-example-book.pdf doxia-example-book.rtf
Author: svn-site-role
Date: Sat Dec 30 12:06:21 2023
New Revision: 1914996
Log:
Site checkin for project Doxia Site
Modified:
maven/doxia/website/content/doxia-example-book/doxia-example-book.pdf
maven/doxia/website/content/doxia-example-book/doxia-example-book.rtf
Modified: maven/doxia/website/content/doxia-example-book/doxia-example-book.pdf
==
Binary files - no diff available.
Modified: maven/doxia/website/content/doxia-example-book/doxia-example-book.rtf
==
--- maven/doxia/website/content/doxia-example-book/doxia-example-book.rtf
(original)
+++ maven/doxia/website/content/doxia-example-book/doxia-example-book.rtf Sat
Dec 30 12:06:21 2023
@@ -2,30 +2,30 @@
\deff0{\fonttbl{\f0\froman\fcharset0 Times New Roman;}{\f1\fswiss\fcharset0
Arial;}{\f2\froman\fcharset2 Symbol;}}
{\colortbl\red0\green0\blue0;\red255\green255\blue255;\red255\green0\blue0;\red0\green0\blue255;}
{\*\listtable
-{\list\listtemplateid5235885\hybrid
+{\list\listtemplateid67201828\hybrid
{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelstartat1{\leveltext\'01\u-3913
?;}{\levelnumbers;}\f2\fi0\li300\ri0\tx300}
-\listid456943686}
-{\list\listtemplateid35175215\hybrid
+\listid1020460968}
+{\list\listtemplateid1638053802\hybrid
{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelstartat1{\leveltext\'01\u-3913
?;}{\levelnumbers;}\f2\fi0\li300\ri0\tx300}
-\listid1686778521}
-{\list\listtemplateid1608653820\hybrid
+\listid1790868276}
+{\list\listtemplateid1487117875\hybrid
{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers
\'01;}\fi0\li400\ri0\tx400}
-\listid2145226307}
-{\list\listtemplateid1428792465\hybrid
+\listid515558176}
+{\list\listtemplateid28948853\hybrid
{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers
\'01;}\fi0\li400\ri0\tx400}
-\listid1614976946}
-{\list\listtemplateid344676406\hybrid
+\listid1035841721}
+{\list\listtemplateid89511259\hybrid
{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelstartat1{\leveltext\'01\u-3913
?;}{\levelnumbers;}\f2\fi0\li300\ri0\tx300}
-\listid893123711}
+\listid1920567861}
}
{\*\listoverridetable
-{\listoverride\listid456943686\listoverridecount0\ls1}
-{\listoverride\listid1686778521\listoverridecount0\ls2}
-{\listoverride\listid2145226307\listoverridecount0\ls3}
-{\listoverride\listid1614976946\listoverridecount0\ls4}
-{\listoverride\listid893123711\listoverridecount0\ls5}
+{\listoverride\listid1020460968\listoverridecount0\ls1}
+{\listoverride\listid1790868276\listoverridecount0\ls2}
+{\listoverride\listid515558176\listoverridecount0\ls3}
+{\listoverride\listid1035841721\listoverridecount0\ls4}
+{\listoverride\listid1920567861\listoverridecount0\ls5}
}
-{\info{\operator iText by lowagie.com}{\creationdate
\yr2023\mo11\dy30\hr11\min57\sec21}{\creationdate
\yr2023\mo11\dy30\hr11\min57\sec22}{\operator Doxia iText}}
+{\info{\operator iText by lowagie.com}{\creationdate
\yr2023\mo11\dy30\hr12\min5\sec57}{\creationdate
\yr2023\mo11\dy30\hr12\min5\sec57}{\operator Doxia iText}}
\paperw11907\paperh16840\margl720\margr720\margt720\margb720
{\footer }{\header }\pgwsxn11907\pghsxn16840\sectd{\footer }{\header
}\pgwsxn11907\pghsxn16840\pard\li0\ri0\f1\fs48\cf2 1. \f1\fs48\cf2
Bindings\par\par\pard\li0\ri0\f1\fs44\cf0 1.1. \f1\fs44\cf0 Bindings Overview
\par\par\f0\fs20\cf0 \par \pard\li0\ri0\f0\fs20\cf0 \par \f1\fs20\cf0 Bindings
are one of the most important pieces of XFire. They control how the incoming
and outoing XML is mapped to objects. \par\pard\li0\ri0\f0\fs20\cf0 \par
\f1\fs20\cf0 The default binding in XFire is "Aegis". Aegis means "shield", and
the point of it is to create a simple layer which makes going between objects
and XML easy. Aegis also provides the layer which allows other bindings to
integrate with XFire - like JAXB, XMLBeans and Castor.
\par\pard\li0\ri0\f0\fs20\cf0 \par \f1\fs20\cf0 Lets take a look at how you
would use a different binding with XFire. The BindingProvider class is the one
for actually taking the xml streams and reading/writing to them. When we create
a service we need to actually s
upply a BindingProvider to the service. In the simplest case of creating a
service you're probably writing code like this: \par\f1\fs20\cf0 \par\trowd
\trftsWidth3\trwWidth10400\trkeep\trqc\trgaph10\trbrdrl\brdrs\brdrw20\brdrcf0
(maven-doxia-site) 13/15: doxia-archives
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch DOXIA-703 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git commit ac4e6560efa6f08d643ff83454fdbe243793162b Author: Elliotte Rusty Harold AuthorDate: Sun Apr 23 09:04:31 2023 -0400 doxia-archives --- content/resources/components.links | 1 - 1 file changed, 1 deletion(-) diff --git a/content/resources/components.links b/content/resources/components.links index efc9603..4e841ae 100644 --- a/content/resources/components.links +++ b/content/resources/components.links @@ -3,6 +3,5 @@ # links property file for Ant's symlink task in pom.xml: # links to components in https://maven.apache.org/doxia/components/ doxia=components/doxia -doxia-archives=components/doxia-archives doxia-sitetools-archives=components/doxia-sitetools-archives doxia-tools-archives=components/doxia-tools-archives
(maven-doxia-site) 10/15: spotless
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch DOXIA-703 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git commit 471497816acaab3cfbc4df1b63c527304b8b05bd Author: Elliotte Rusty Harold AuthorDate: Sun Apr 23 08:04:37 2023 -0400 spotless --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 78dfa82..0286bf5 100644 --- a/pom.xml +++ b/pom.xml @@ -315,7 +315,7 @@ under the License. - +
(maven-doxia-site) 15/15: simplify language
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit 22174b44ebe5dfbb59f48ae3a386207706995f78
Author: Elliotte Rusty Harold
AuthorDate: Thu Jun 8 07:01:42 2023 -0400
simplify language
---
content/apt/book/index.apt | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/content/apt/book/index.apt b/content/apt/book/index.apt
index f07141f..0fe35ae 100644
--- a/content/apt/book/index.apt
+++ b/content/apt/book/index.apt
@@ -29,8 +29,7 @@
Introduction
- Doxia allows you to write books like user manuals and guides in any format
supported by Doxia. Combined with the
- Doxia Book Maven you are able to include the manuals directly in your
generated site with links to the off-line
+ Doxia allows you to write books like user manuals and guides in any format
supported by Doxia. You can include the manuals directly in your generated site
with links to the off-line
friendly formats like XDoc, PDF, RTF and LaTeX.
The Xdoc output which has been rendered into this site can be viewed
{{{../doxia-example-book/index.html}here}}.
@@ -40,12 +39,12 @@ Introduction
* How It Works
- The only thing you need in addition to the content files itself is a simple
book descriptor which is used to specify
+ The only thing you need in addition to the content files is a simple book
descriptor which specifies
the ordering of the sections and the names for the chapters.
* Creating a Book Descriptor
- An XML file is used to describe the layout of the book.
+ An XML file describes the layout of the book.
A sample is given below:
(maven-doxia-site) 07/15: remove book renderer vestiges
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit e9029332fb0e32be9b3b6d99729bdcac6dabf7dd
Author: Elliotte Rusty Harold
AuthorDate: Sun Apr 23 07:43:37 2023 -0400
remove book renderer vestiges
---
content/apt/book/index.apt | 2 --
content/apt/doxia-tools/index.apt | 2 --
content/resources/doxia-tools/components.links | 1 -
3 files changed, 5 deletions(-)
diff --git a/content/apt/book/index.apt b/content/apt/book/index.apt
index 98c3c58..f07141f 100644
--- a/content/apt/book/index.apt
+++ b/content/apt/book/index.apt
@@ -43,8 +43,6 @@ Introduction
The only thing you need in addition to the content files itself is a simple
book descriptor which is used to specify
the ordering of the sections and the names for the chapters.
- See {{{../doxia-tools/doxia-book-renderer/book.html}The Book Descriptor
Reference}} for a reference to the descriptor.
-
* Creating a Book Descriptor
An XML file is used to describe the layout of the book.
diff --git a/content/apt/doxia-tools/index.apt
b/content/apt/doxia-tools/index.apt
index 97b4a85..e07a513 100644
--- a/content/apt/doxia-tools/index.apt
+++ b/content/apt/doxia-tools/index.apt
@@ -39,5 +39,3 @@ Available Doxia Tools
*--+--++--+++
| {{{./doxia-book-maven-plugin/} Doxia Book Maven Plugin}} | 1.2
| 2010-11-09 | Create books in different output formats. |
{{{https://gitbox.apache.org/repos/asf/maven-doxia-book-maven-plugin.git}Git}}
/ {{{https://github.com/apache/maven-doxia-book-maven-plugin/}GitHub}} |
{{{https://issues.apache.org/jira/browse/DOXIATOOLS}Jira DOXIATOOLS}}
*--+--++--+++
-| {{{./doxia-book-renderer/} Doxia Book Renderer}} | 1.2
| 2010-11-09 | |
{{{https://gitbox.apache.org/repos/asf/maven-doxia-book-renderer.git}Git}} /
{{{https://github.com/apache/maven-doxia-book-renderer/}GitHub}} |
{{{https://issues.apache.org/jira/browse/DOXIATOOLS}Jira DOXIATOOLS}}
-*--+--++--+++
diff --git a/content/resources/doxia-tools/components.links
b/content/resources/doxia-tools/components.links
index e9a770f..6a2741c 100644
--- a/content/resources/doxia-tools/components.links
+++ b/content/resources/doxia-tools/components.links
@@ -5,4 +5,3 @@
doxia-converter=../components/doxia-tools/doxia-converter
doxia-linkcheck=../components/doxia-tools/doxia-linkcheck
doxia-book-maven-plugin=../components/doxia-tools/doxia-book-maven-plugin
-doxia-book-renderer=../components/doxia-tools/doxia-book-renderer
(maven-doxia-site) 11/15: last one
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch DOXIA-703 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git commit 86fdb9d2a0572e4997f79ca73b20c18e06b7f8ca Author: Elliotte Rusty Harold AuthorDate: Sun Apr 23 08:09:27 2023 -0400 last one --- content/resources/doxia-tools/components.links | 1 - 1 file changed, 1 deletion(-) diff --git a/content/resources/doxia-tools/components.links b/content/resources/doxia-tools/components.links index f051184..fe807d0 100644 --- a/content/resources/doxia-tools/components.links +++ b/content/resources/doxia-tools/components.links @@ -2,4 +2,3 @@ # links property file for Ant's symlink task in pom.xml: # links to components in https://maven.apache.org/doxia/components/ -doxia-converter=../components/doxia-tools/doxia-converter
(maven-doxia-site) 14/15: one more
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch DOXIA-703 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git commit 65b2e27d6b0f3c5ba23241bf1fa1ae4fefe5bd2b Author: Elliotte Rusty Harold AuthorDate: Sun Apr 23 09:12:24 2023 -0400 one more --- content/resources/components.links | 1 - 1 file changed, 1 deletion(-) diff --git a/content/resources/components.links b/content/resources/components.links index 4e841ae..0d4e641 100644 --- a/content/resources/components.links +++ b/content/resources/components.links @@ -3,5 +3,4 @@ # links property file for Ant's symlink task in pom.xml: # links to components in https://maven.apache.org/doxia/components/ doxia=components/doxia -doxia-sitetools-archives=components/doxia-sitetools-archives doxia-tools-archives=components/doxia-tools-archives
(maven-doxia-site) 09/15: failonerror=False
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch DOXIA-703 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git commit 1216e320af87329461dcd9907404ce1094f03a81 Author: Elliotte Rusty Harold AuthorDate: Sun Apr 23 08:01:17 2023 -0400 failonerror=False --- content/resources/doxia-tools/components.links | 1 - pom.xml| 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/content/resources/doxia-tools/components.links b/content/resources/doxia-tools/components.links index 149b767..f051184 100644 --- a/content/resources/doxia-tools/components.links +++ b/content/resources/doxia-tools/components.links @@ -3,4 +3,3 @@ # links property file for Ant's symlink task in pom.xml: # links to components in https://maven.apache.org/doxia/components/ doxia-converter=../components/doxia-tools/doxia-converter -doxia-book-maven-plugin=../components/doxia-tools/doxia-book-maven-plugin diff --git a/pom.xml b/pom.xml index bef83b2..78dfa82 100644 --- a/pom.xml +++ b/pom.xml @@ -315,7 +315,7 @@ under the License. - +
(maven-doxia-site) 05/15: revert
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit 792403f302cf47817bd62583ba9d75db5f105914
Author: Elliotte Rusty Harold
AuthorDate: Sun Apr 23 07:32:49 2023 -0400
revert
---
content/apt/references/apt-format.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/apt/references/apt-format.apt
b/content/apt/references/apt-format.apt
index a86bfdd..1f65b81 100644
--- a/content/apt/references/apt-format.apt
+++ b/content/apt/references/apt-format.apt
@@ -39,7 +39,7 @@ The APT format
* Important Notice
The information contained in this document corresponds to the original
- APT format as published by {{{https://www.xmlmind.com/}XMLmind}}.
+ APT format as published by {{{http://www.xmlmind.com/}XMLmind}}.
In version 1.1 Maven Doxia has applied several modifications to this original
format, see this separate {{{./doxia-apt.html}document}}
for a detailed description. Notable differences are highlighted below
(maven-doxia-site) 06/15: revert
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit 27f5a31ed1fe771e53b54ec63b56e66e85bf28e1
Author: Elliotte Rusty Harold
AuthorDate: Sun Apr 23 07:33:24 2023 -0400
revert
---
content/apt/references/apt-format.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/apt/references/apt-format.apt
b/content/apt/references/apt-format.apt
index 1f65b81..521321c 100644
--- a/content/apt/references/apt-format.apt
+++ b/content/apt/references/apt-format.apt
@@ -39,7 +39,7 @@ The APT format
* Important Notice
The information contained in this document corresponds to the original
- APT format as published by {{{http://www.xmlmind.com/}XMLmind}}.
+ APT format as published by {{{http://www.xmlmind.com/}Xmlmind}}.
In version 1.1 Maven Doxia has applied several modifications to this original
format, see this separate {{{./doxia-apt.html}document}}
for a detailed description. Notable differences are highlighted below
(maven-doxia-site) 02/15: Update apt-format.apt
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit f25a4f78056e6e7e8341bcac053f675a7c0d79fb
Author: Elliotte Rusty Harold
AuthorDate: Mon Feb 6 10:52:56 2023 -0500
Update apt-format.apt
---
content/apt/references/apt-format.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/apt/references/apt-format.apt
b/content/apt/references/apt-format.apt
index bfac8fd..2b72f67 100644
--- a/content/apt/references/apt-format.apt
+++ b/content/apt/references/apt-format.apt
@@ -39,7 +39,7 @@ The APT format
* Important Notice
The information contained in this document corresponds to the original
- APT format as published by {{{http://www.xmlmind.com/}Xmlmind}}.
+ APT format as published by {{{https://www.xmlmind.com/}XMLmind}}.
In version 1.1 Maven Doxia has applied several modifications to this original
format. See this separate {{{./doxia-apt.html}document}}
for a detailed description. Notable differences are highlighted below
(maven-doxia-site) 12/15: doxia-sitetools
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch DOXIA-703 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git commit f27f1edc741cf61b79582f49d1fbb1fea8b96857 Author: Elliotte Rusty Harold AuthorDate: Sun Apr 23 08:56:35 2023 -0400 doxia-sitetools --- content/resources/components.links | 1 - 1 file changed, 1 deletion(-) diff --git a/content/resources/components.links b/content/resources/components.links index 8cbdef2..efc9603 100644 --- a/content/resources/components.links +++ b/content/resources/components.links @@ -4,6 +4,5 @@ # links to components in https://maven.apache.org/doxia/components/ doxia=components/doxia doxia-archives=components/doxia-archives -doxia-sitetools=components/doxia-sitetools doxia-sitetools-archives=components/doxia-sitetools-archives doxia-tools-archives=components/doxia-tools-archives
(maven-doxia-site) 08/15: doxia-linkcheck
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch DOXIA-703 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git commit f88501fa7f7eae7f60510ab6e991f88ec0f79018 Author: Elliotte Rusty Harold AuthorDate: Sun Apr 23 07:53:19 2023 -0400 doxia-linkcheck --- content/resources/doxia-tools/components.links | 1 - 1 file changed, 1 deletion(-) diff --git a/content/resources/doxia-tools/components.links b/content/resources/doxia-tools/components.links index 6a2741c..149b767 100644 --- a/content/resources/doxia-tools/components.links +++ b/content/resources/doxia-tools/components.links @@ -3,5 +3,4 @@ # links property file for Ant's symlink task in pom.xml: # links to components in https://maven.apache.org/doxia/components/ doxia-converter=../components/doxia-tools/doxia-converter -doxia-linkcheck=../components/doxia-tools/doxia-linkcheck doxia-book-maven-plugin=../components/doxia-tools/doxia-book-maven-plugin
(maven-doxia-site) 04/15: Revert "run-on sentence"
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit b0c87d5eaeee96caee1dd3fd9d850ee4563bf9e7
Author: Elliotte Rusty Harold
AuthorDate: Sun Apr 23 07:32:00 2023 -0400
Revert "run-on sentence"
This reverts commit 2778eb76c5d1d371efa03aa4b1ecf753a50bc6b6.
---
content/apt/references/apt-format.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/apt/references/apt-format.apt
b/content/apt/references/apt-format.apt
index 2b72f67..a86bfdd 100644
--- a/content/apt/references/apt-format.apt
+++ b/content/apt/references/apt-format.apt
@@ -41,7 +41,7 @@ The APT format
The information contained in this document corresponds to the original
APT format as published by {{{https://www.xmlmind.com/}XMLmind}}.
In version 1.1 Maven Doxia has applied several modifications to this original
- format. See this separate {{{./doxia-apt.html}document}}
+ format, see this separate {{{./doxia-apt.html}document}}
for a detailed description. Notable differences are highlighted below
with a {{{./doxia-apt.html}\[Change\]}} link.
(maven-doxia-site) 01/15: run-on sentence
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit 7f58e385512af2a88236fcaf1e12a8aa4bb3ce9c
Author: Elliotte Rusty Harold
AuthorDate: Mon Nov 14 07:26:55 2022 -0500
run-on sentence
@olamy
---
content/apt/references/apt-format.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/apt/references/apt-format.apt
b/content/apt/references/apt-format.apt
index 521321c..bfac8fd 100644
--- a/content/apt/references/apt-format.apt
+++ b/content/apt/references/apt-format.apt
@@ -41,7 +41,7 @@ The APT format
The information contained in this document corresponds to the original
APT format as published by {{{http://www.xmlmind.com/}Xmlmind}}.
In version 1.1 Maven Doxia has applied several modifications to this original
- format, see this separate {{{./doxia-apt.html}document}}
+ format. See this separate {{{./doxia-apt.html}document}}
for a detailed description. Notable differences are highlighted below
with a {{{./doxia-apt.html}\[Change\]}} link.
(maven-doxia-site) branch DOXIA-703 updated (5126f58 -> 22174b4)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch DOXIA-703 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git discard 5126f58 simplify language discard 0f02e33 one more discard ff6cf46 doxia-archives discard 5adf277 doxia-sitetools discard 07087ff last one discard 9648c61 spotless discard 2973ac8 failonerror=False discard 5e2f721 doxia-linkcheck discard 6284efb remove book renderer vestiges discard 2ece00f revert discard d544efd revert discard 70b8a05 Revert "run-on sentence" discard 9d9c96b remove reference to deleted page discard b5ced88 Update apt-format.apt discard aa51988 run-on sentence add 3764390 Fix dependabot config new 7f58e38 run-on sentence new f25a4f7 Update apt-format.apt new 9eca57c remove reference to deleted page new b0c87d5 Revert "run-on sentence" new 792403f revert new 27f5a31 revert new e902933 remove book renderer vestiges new f88501f doxia-linkcheck new 1216e32 failonerror=False new 4714978 spotless new 86fdb9d last one new f27f1ed doxia-sitetools new ac4e656 doxia-archives new 65b2e27 one more new 22174b4 simplify language 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 (5126f58) \ N -- N -- N refs/heads/DOXIA-703 (22174b4) 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 15 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: .github/dependabot.yml | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-)
(maven-doxia-site) 03/15: remove reference to deleted page
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch DOXIA-703 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git commit 9eca57c15c10ab688f169a4f4fc4bdb237dc2c09 Author: Elliotte Rusty Harold AuthorDate: Sun Apr 23 07:30:29 2023 -0400 remove reference to deleted page --- content/resources/.htaccess| 1 - content/resources/components.links | 1 - 2 files changed, 2 deletions(-) diff --git a/content/resources/.htaccess b/content/resources/.htaccess index 08cb365..7ceef2c 100644 --- a/content/resources/.htaccess +++ b/content/resources/.htaccess @@ -1,7 +1,6 @@ # Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. RedirectMatch permanent ^/doxia/doxia-1.2/(.*)$ /doxia/doxia-archives/doxia-1.2/$1 RedirectMatch permanent ^/doxia/doxia-sitetools-1.2 /doxia/doxia-sitetools-archives/doxia-sitetools-1.2/$1 -Redirect Permanent /doxia/doxia-ide/index.html /doxia/doxia-ide.html # support resources pointed from /doxia/*-archives/ Redirect Permanent /doxia/images/apache-maven-project.png /images/apache-maven-project.png RedirectMatch permanent ^/doxia/.*-archives/images/(.*)$ /doxia/images/$1 diff --git a/content/resources/components.links b/content/resources/components.links index 993f4b9..8cbdef2 100644 --- a/content/resources/components.links +++ b/content/resources/components.links @@ -6,5 +6,4 @@ doxia=components/doxia doxia-archives=components/doxia-archives doxia-sitetools=components/doxia-sitetools doxia-sitetools-archives=components/doxia-sitetools-archives -doxia-ide=components/doxia-ide doxia-tools-archives=components/doxia-tools-archives
(maven-doxia-site) 01/01: [DOXIASITETOOLS-320] Document Sink wrappers and the automatic generation of anchor names for TOC entries
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch feature/auto-generate-anchors-for-toc
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit bede41c50308968e4deef6cab41213f64b1dd530
Author: Konrad Windszus
AuthorDate: Tue Nov 28 20:15:28 2023 +0100
[DOXIASITETOOLS-320] Document Sink wrappers and the automatic generation
of anchor names for TOC entries
---
content/apt/developers/sink.apt | 43 +
content/apt/macros/index.apt| 7 ++-
2 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/content/apt/developers/sink.apt b/content/apt/developers/sink.apt
index 479f4a8..8eef12b 100644
--- a/content/apt/developers/sink.apt
+++ b/content/apt/developers/sink.apt
@@ -196,6 +196,49 @@ sink.unknown( "cdata", new Object[]{new Integer(
HtmlMarkup.CDATA_TYPE ), javasc
sink.unknown( "script", new Object[]{new Integer( HtmlMarkup.TAG_TYPE_END )},
null );
+
+* {Using Sink wrappers}
+
+ One or multiple Sink wrappers can be registered with a parser to optionally
enrich or modify the output emitted to the sink.
+ Each sink wrapper is responsible for calling its subsequent sink (either
again a wrapper or the original sink).
+ The {{{SinkWrapper}}} class automatically just delegates all method calls to
its wrapper.
+ A sink wrapper is automatically created by the parser through a dedicated
factory.
+ Each JSR303 component implementing a SinkWrapperFactory is automatically
registered considering its rank.
+ Other sink wrapper factories can be registered manually via
<<>>.
+
++
+@Named
+public class MySinkWrapperFactory implements SinkWrapperFactory {
+
+@Override
+public Sink createWrapper(Sink sink) {
+return new MySinkWrapper(sink);
+}
+
+@Override
+public int getRank() {
+// the higher the rank, the earlier it is called in the processing
queue
+return 0;
+}
+}
+
++
+
+ The according SinkWrapper could look like this
+
++
+public class MySinkWrapper extends SinkWrapper {
+
+public MySinkWrapper(Sink sink) {
+super(sink);
+}
+
+@Override
+public void text(String text) {
+super.text("some prefix emitted in front of every text " + text);
+}
+
+}
++
* {References}
diff --git a/content/apt/macros/index.apt b/content/apt/macros/index.apt
index 60f0bb2..f73d421 100644
--- a/content/apt/macros/index.apt
+++ b/content/apt/macros/index.apt
@@ -169,11 +169,8 @@ public class MyClass
+
This displays a TOC for the second section in the document, including all
- subsections (depth 2) and sub-subsections (depth 3).
-
- <> that in Doxia, apt section titles are not implicit anchors
- (see {{{../references/doxia-apt.html}Enhancements to the APT format}}), so
you need
- to insert explicit anchors for links to work!
+ subsections (depth 2) and sub-subsections (depth 3). The macro takes care to
+ automatically generate anchors for each TOC entry.
In a xdoc file, it will be:
(maven-doxia-site) branch feature/auto-generate-anchors-for-toc updated (f249355 -> bede41c)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch feature/auto-generate-anchors-for-toc in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git discard f249355 [DOXIASITETOOLS-320] Document Sink wrappers and the automatic generation of anchor names for TOC entries add 3764390 Fix dependabot config new bede41c [DOXIASITETOOLS-320] Document Sink wrappers and the automatic generation of anchor names for TOC entries 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 (f249355) \ N -- N -- N refs/heads/feature/auto-generate-anchors-for-toc (bede41c) 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: .github/dependabot.yml | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-)
(maven-doxia-site) branch master updated: Fix dependabot config
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git The following commit(s) were added to refs/heads/master by this push: new 3764390 Fix dependabot config 3764390 is described below commit 3764390101cfa0ca17bdbb9657fac6650cb5d473 Author: Sylwester Lachiewicz AuthorDate: Sat Dec 30 13:04:04 2023 +0100 Fix dependabot config --- .github/dependabot.yml | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ec173a0..c54099b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -16,7 +16,11 @@ # version: 2 updates: -- package-ecosystem: maven - directory: "/" + - package-ecosystem: "maven" +directory: "/" schedule: -interval: daily + interval: "daily" + - package-ecosystem: "github-actions" +directory: "/" +schedule: + interval: "daily"
(maven-doxia-site) branch feature/auto-generate-anchors-for-toc updated (0122166 -> f249355)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch feature/auto-generate-anchors-for-toc in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git omit 0122166 Use latest maven-parent 41 release omit 8fd3425 [DOXIASITETOOLS-320] Document Sink wrappers and the automatic generation of anchor names for TOC entries add 102c027 Bump org.apache.ant:ant from 1.10.13 to 1.10.14 add cc0ba52 Use latest maven-parent 41 release add 5c5461d Adjust GHA setup new f249355 [DOXIASITETOOLS-320] Document Sink wrappers and the automatic generation of anchor names for TOC entries 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 (0122166) \ N -- N -- N refs/heads/feature/auto-generate-anchors-for-toc (f249355) 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: .github/dependabot.yml | 6 ++ .github/workflows/maven-verify.yml | 6 ++ pom.xml| 2 +- 3 files changed, 9 insertions(+), 5 deletions(-)
(maven-doxia-site) 01/01: [DOXIASITETOOLS-320] Document Sink wrappers and the automatic generation of anchor names for TOC entries
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch feature/auto-generate-anchors-for-toc
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit f249355476a809402fb6ed61243968500d404fcd
Author: Konrad Windszus
AuthorDate: Tue Nov 28 20:15:28 2023 +0100
[DOXIASITETOOLS-320] Document Sink wrappers and the automatic generation
of anchor names for TOC entries
---
content/apt/developers/sink.apt | 43 +
content/apt/macros/index.apt| 7 ++-
2 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/content/apt/developers/sink.apt b/content/apt/developers/sink.apt
index 479f4a8..8eef12b 100644
--- a/content/apt/developers/sink.apt
+++ b/content/apt/developers/sink.apt
@@ -196,6 +196,49 @@ sink.unknown( "cdata", new Object[]{new Integer(
HtmlMarkup.CDATA_TYPE ), javasc
sink.unknown( "script", new Object[]{new Integer( HtmlMarkup.TAG_TYPE_END )},
null );
+
+* {Using Sink wrappers}
+
+ One or multiple Sink wrappers can be registered with a parser to optionally
enrich or modify the output emitted to the sink.
+ Each sink wrapper is responsible for calling its subsequent sink (either
again a wrapper or the original sink).
+ The {{{SinkWrapper}}} class automatically just delegates all method calls to
its wrapper.
+ A sink wrapper is automatically created by the parser through a dedicated
factory.
+ Each JSR303 component implementing a SinkWrapperFactory is automatically
registered considering its rank.
+ Other sink wrapper factories can be registered manually via
<<>>.
+
++
+@Named
+public class MySinkWrapperFactory implements SinkWrapperFactory {
+
+@Override
+public Sink createWrapper(Sink sink) {
+return new MySinkWrapper(sink);
+}
+
+@Override
+public int getRank() {
+// the higher the rank, the earlier it is called in the processing
queue
+return 0;
+}
+}
+
++
+
+ The according SinkWrapper could look like this
+
++
+public class MySinkWrapper extends SinkWrapper {
+
+public MySinkWrapper(Sink sink) {
+super(sink);
+}
+
+@Override
+public void text(String text) {
+super.text("some prefix emitted in front of every text " + text);
+}
+
+}
++
* {References}
diff --git a/content/apt/macros/index.apt b/content/apt/macros/index.apt
index 60f0bb2..f73d421 100644
--- a/content/apt/macros/index.apt
+++ b/content/apt/macros/index.apt
@@ -169,11 +169,8 @@ public class MyClass
+
This displays a TOC for the second section in the document, including all
- subsections (depth 2) and sub-subsections (depth 3).
-
- <> that in Doxia, apt section titles are not implicit anchors
- (see {{{../references/doxia-apt.html}Enhancements to the APT format}}), so
you need
- to insert explicit anchors for links to work!
+ subsections (depth 2) and sub-subsections (depth 3). The macro takes care to
+ automatically generate anchors for each TOC entry.
In a xdoc file, it will be:
(maven-doxia-site) 04/15: Revert "run-on sentence"
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit 70b8a0547ed2e5a4d0513c9738c74dba9a4f8e93
Author: Elliotte Rusty Harold
AuthorDate: Sun Apr 23 07:32:00 2023 -0400
Revert "run-on sentence"
This reverts commit 2778eb76c5d1d371efa03aa4b1ecf753a50bc6b6.
---
content/apt/references/apt-format.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/apt/references/apt-format.apt
b/content/apt/references/apt-format.apt
index 2b72f67..a86bfdd 100644
--- a/content/apt/references/apt-format.apt
+++ b/content/apt/references/apt-format.apt
@@ -41,7 +41,7 @@ The APT format
The information contained in this document corresponds to the original
APT format as published by {{{https://www.xmlmind.com/}XMLmind}}.
In version 1.1 Maven Doxia has applied several modifications to this original
- format. See this separate {{{./doxia-apt.html}document}}
+ format, see this separate {{{./doxia-apt.html}document}}
for a detailed description. Notable differences are highlighted below
with a {{{./doxia-apt.html}\[Change\]}} link.
(maven-doxia-site) 15/15: simplify language
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit 5126f58f385ab9c21b3b96fc5e51ae08f94ad38f
Author: Elliotte Rusty Harold
AuthorDate: Thu Jun 8 07:01:42 2023 -0400
simplify language
---
content/apt/book/index.apt | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/content/apt/book/index.apt b/content/apt/book/index.apt
index f07141f..0fe35ae 100644
--- a/content/apt/book/index.apt
+++ b/content/apt/book/index.apt
@@ -29,8 +29,7 @@
Introduction
- Doxia allows you to write books like user manuals and guides in any format
supported by Doxia. Combined with the
- Doxia Book Maven you are able to include the manuals directly in your
generated site with links to the off-line
+ Doxia allows you to write books like user manuals and guides in any format
supported by Doxia. You can include the manuals directly in your generated site
with links to the off-line
friendly formats like XDoc, PDF, RTF and LaTeX.
The Xdoc output which has been rendered into this site can be viewed
{{{../doxia-example-book/index.html}here}}.
@@ -40,12 +39,12 @@ Introduction
* How It Works
- The only thing you need in addition to the content files itself is a simple
book descriptor which is used to specify
+ The only thing you need in addition to the content files is a simple book
descriptor which specifies
the ordering of the sections and the names for the chapters.
* Creating a Book Descriptor
- An XML file is used to describe the layout of the book.
+ An XML file describes the layout of the book.
A sample is given below:
(maven-doxia-site) 03/15: remove reference to deleted page
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch DOXIA-703 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git commit 9d9c96b9e49ee124a19aba80a90e935384052e0d Author: Elliotte Rusty Harold AuthorDate: Sun Apr 23 07:30:29 2023 -0400 remove reference to deleted page --- content/resources/.htaccess| 1 - content/resources/components.links | 1 - 2 files changed, 2 deletions(-) diff --git a/content/resources/.htaccess b/content/resources/.htaccess index 08cb365..7ceef2c 100644 --- a/content/resources/.htaccess +++ b/content/resources/.htaccess @@ -1,7 +1,6 @@ # Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. RedirectMatch permanent ^/doxia/doxia-1.2/(.*)$ /doxia/doxia-archives/doxia-1.2/$1 RedirectMatch permanent ^/doxia/doxia-sitetools-1.2 /doxia/doxia-sitetools-archives/doxia-sitetools-1.2/$1 -Redirect Permanent /doxia/doxia-ide/index.html /doxia/doxia-ide.html # support resources pointed from /doxia/*-archives/ Redirect Permanent /doxia/images/apache-maven-project.png /images/apache-maven-project.png RedirectMatch permanent ^/doxia/.*-archives/images/(.*)$ /doxia/images/$1 diff --git a/content/resources/components.links b/content/resources/components.links index 993f4b9..8cbdef2 100644 --- a/content/resources/components.links +++ b/content/resources/components.links @@ -6,5 +6,4 @@ doxia=components/doxia doxia-archives=components/doxia-archives doxia-sitetools=components/doxia-sitetools doxia-sitetools-archives=components/doxia-sitetools-archives -doxia-ide=components/doxia-ide doxia-tools-archives=components/doxia-tools-archives
(maven-doxia-site) 10/15: spotless
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch DOXIA-703 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git commit 9648c615e09f9221073791f6cf5242d10b2f82d5 Author: Elliotte Rusty Harold AuthorDate: Sun Apr 23 08:04:37 2023 -0400 spotless --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 78dfa82..0286bf5 100644 --- a/pom.xml +++ b/pom.xml @@ -315,7 +315,7 @@ under the License. - +
(maven-doxia-site) branch DOXIA-703 updated (f9eb22e -> 5126f58)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch DOXIA-703 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git omit f9eb22e simplify language omit 4270b8b Merge branch 'master' into DOXIA-703 omit b849157 one more omit 0d2d04a doxia-archives omit ad2cea5 doxia-sitetools omit 71f1a8c Revert "try latest site plugin" omit 3ef1270 try latest site plugin omit 89ed796 last one omit 6d7fea8 spotless omit 2d14746 failonerror=False omit f4632e9 doxia-linkcheck omit 4390b97 remove book renderer vestiges omit 98140e8 revert omit 1743bb6 revert omit 629707f Revert "run-on sentence" omit 68e70ca remove reference to deleted page omit 9c03f14 Merge branch 'master' into elharo-patch-1 omit 9fe84d0 Merge branch 'master' into elharo-patch-1 omit dde5034 Update apt-format.apt omit 2778eb7 run-on sentence add f0b6e36 upgrade parent POM add 102c027 Bump org.apache.ant:ant from 1.10.13 to 1.10.14 add cc0ba52 Use latest maven-parent 41 release add 5c5461d Adjust GHA setup new aa51988 run-on sentence new b5ced88 Update apt-format.apt new 9d9c96b remove reference to deleted page new 70b8a05 Revert "run-on sentence" new d544efd revert new 2ece00f revert new 6284efb remove book renderer vestiges new 5e2f721 doxia-linkcheck new 2973ac8 failonerror=False new 9648c61 spotless new 07087ff last one new 5adf277 doxia-sitetools new ff6cf46 doxia-archives new 0f02e33 one more new 5126f58 simplify language 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 (f9eb22e) \ N -- N -- N refs/heads/DOXIA-703 (5126f58) 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 15 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: .github/dependabot.yml | 6 ++ .github/workflows/maven-verify.yml | 6 ++ pom.xml| 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-)
(maven-doxia-site) 01/15: run-on sentence
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit aa5198871f7ab69e87b679e89bb7afadc6fb751d
Author: Elliotte Rusty Harold
AuthorDate: Mon Nov 14 07:26:55 2022 -0500
run-on sentence
@olamy
---
content/apt/references/apt-format.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/apt/references/apt-format.apt
b/content/apt/references/apt-format.apt
index 521321c..bfac8fd 100644
--- a/content/apt/references/apt-format.apt
+++ b/content/apt/references/apt-format.apt
@@ -41,7 +41,7 @@ The APT format
The information contained in this document corresponds to the original
APT format as published by {{{http://www.xmlmind.com/}Xmlmind}}.
In version 1.1 Maven Doxia has applied several modifications to this original
- format, see this separate {{{./doxia-apt.html}document}}
+ format. See this separate {{{./doxia-apt.html}document}}
for a detailed description. Notable differences are highlighted below
with a {{{./doxia-apt.html}\[Change\]}} link.
(maven-doxia-site) 09/15: failonerror=False
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch DOXIA-703 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git commit 2973ac878dfc8d1e6b7ec1026172a43f93cd873c Author: Elliotte Rusty Harold AuthorDate: Sun Apr 23 08:01:17 2023 -0400 failonerror=False --- content/resources/doxia-tools/components.links | 1 - pom.xml| 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/content/resources/doxia-tools/components.links b/content/resources/doxia-tools/components.links index 149b767..f051184 100644 --- a/content/resources/doxia-tools/components.links +++ b/content/resources/doxia-tools/components.links @@ -3,4 +3,3 @@ # links property file for Ant's symlink task in pom.xml: # links to components in https://maven.apache.org/doxia/components/ doxia-converter=../components/doxia-tools/doxia-converter -doxia-book-maven-plugin=../components/doxia-tools/doxia-book-maven-plugin diff --git a/pom.xml b/pom.xml index bef83b2..78dfa82 100644 --- a/pom.xml +++ b/pom.xml @@ -315,7 +315,7 @@ under the License. - +
(maven-doxia-site) 11/15: last one
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch DOXIA-703 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git commit 07087ffcd00d8bb0aa412a818972f73157f849b4 Author: Elliotte Rusty Harold AuthorDate: Sun Apr 23 08:09:27 2023 -0400 last one --- content/resources/doxia-tools/components.links | 1 - 1 file changed, 1 deletion(-) diff --git a/content/resources/doxia-tools/components.links b/content/resources/doxia-tools/components.links index f051184..fe807d0 100644 --- a/content/resources/doxia-tools/components.links +++ b/content/resources/doxia-tools/components.links @@ -2,4 +2,3 @@ # links property file for Ant's symlink task in pom.xml: # links to components in https://maven.apache.org/doxia/components/ -doxia-converter=../components/doxia-tools/doxia-converter
(maven-doxia-site) 06/15: revert
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit 2ece00f50c408c720c6a9a63750224415c6bca27
Author: Elliotte Rusty Harold
AuthorDate: Sun Apr 23 07:33:24 2023 -0400
revert
---
content/apt/references/apt-format.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/apt/references/apt-format.apt
b/content/apt/references/apt-format.apt
index 1f65b81..521321c 100644
--- a/content/apt/references/apt-format.apt
+++ b/content/apt/references/apt-format.apt
@@ -39,7 +39,7 @@ The APT format
* Important Notice
The information contained in this document corresponds to the original
- APT format as published by {{{http://www.xmlmind.com/}XMLmind}}.
+ APT format as published by {{{http://www.xmlmind.com/}Xmlmind}}.
In version 1.1 Maven Doxia has applied several modifications to this original
format, see this separate {{{./doxia-apt.html}document}}
for a detailed description. Notable differences are highlighted below
