This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-exec.git
The following commit(s) were added to refs/heads/master by this push:
new 0d04fab7 Update docs for current code
0d04fab7 is described below
commit 0d04fab7aecfceb1b4cbe5cf93f993137278f2a0
Author: Gary Gregory <[email protected]>
AuthorDate: Sat Dec 30 10:11:45 2023 -0500
Update docs for current code
---
src/site/apt/commandline.apt | 3 ---
src/site/apt/index.apt | 14 ++++++--------
src/site/apt/technical.apt | 3 ---
src/site/apt/tutorial.apt | 11 ++++-------
src/site/site.xml | 3 ++-
src/site/xdoc/testmatrix.xml | 4 +++-
6 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/src/site/apt/commandline.apt b/src/site/apt/commandline.apt
index 8136ec32..58aca065 100644
--- a/src/site/apt/commandline.apt
+++ b/src/site/apt/commandline.apt
@@ -19,9 +19,6 @@
--------
Apache Commons Exec - Building the command line
--------
- --------
-20 August 2010
- --------
Building the command line
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index c0dc0815..c33edafc 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -19,9 +19,6 @@
--------
Apache Commons Exec
--------
- --------
-12 November 2008
- --------
Apache Commons Exec
@@ -50,14 +47,15 @@ Apache Commons Exec
still having a consistent API for all platforms.
* Releases
+
+ * Version 1.4.0 requires Java 8 or above.
- Version v1.3 (current), is JDK 1.5 compatible -
- {{{https://commons.apache.org/exec/download_exec.cgi}Download now!}}.
+ * Version 1.3 is JDK 1.5 compatible.
- Version v1.2, is JDK 1.3 compatible.
+ * Version 1.2 is JDK 1.3 compatible.
- Version v1.1, is JDK 1.3 compatible.
+ * Version 1.1 is JDK 1.3 compatible.
- For previous releases, see the
{{{https://archive.apache.org/dist/commons/exec/}Apache Archive}}.
+ * See the {{{https://archive.apache.org/dist/commons/exec/}Apache Archive}}.
\ No newline at end of file
diff --git a/src/site/apt/technical.apt b/src/site/apt/technical.apt
index a9093cbe..8b23019e 100644
--- a/src/site/apt/technical.apt
+++ b/src/site/apt/technical.apt
@@ -19,9 +19,6 @@
--------
Apache Commons Exec Technical Details
--------
- --------
-16 August 2010
- --------
Apache Commons Exec
diff --git a/src/site/apt/tutorial.apt b/src/site/apt/tutorial.apt
index 3437492f..98e2881a 100644
--- a/src/site/apt/tutorial.apt
+++ b/src/site/apt/tutorial.apt
@@ -19,9 +19,6 @@
--------
Apache Commons Exec Tutorial
--------
- --------
-15 September 2010
- --------
Apache Commons Exec
@@ -78,7 +75,7 @@ String line = "AcroRd32.exe /p /h " + file.getAbsolutePath();
CommandLine cmdLine = CommandLine.parse(line);
DefaultExecutor executor = DefaultExecutor.builder().get();
executor.setExitValue(1);
-ExecuteWatchdog watchdog = new ExecuteWatchdog(60000);
+ExecuteWatchdog watchdog =
ExecuteWatchdog.builder().setTimeout(Duration.ofSeconds(60)).get();
executor.setWatchdog(watchdog);
int exitValue = executor.execute(cmdLine);
+----------------------------------------------------------------------------
@@ -104,7 +101,7 @@ String line = "AcroRd32.exe /p /h \"" +
file.getAbsolutePath() + "\"";
CommandLine cmdLine = CommandLine.parse(line);
DefaultExecutor executor = DefaultExecutor.builder().get();
executor.setExitValue(1);
-ExecuteWatchdog watchdog = new ExecuteWatchdog(60000);
+ExecuteWatchdog watchdog =
ExecuteWatchdog.builder().setTimeout(Duration.ofSeconds(60)).get();
executor.setWatchdog(watchdog);
int exitValue = executor.execute(cmdLine);
+----------------------------------------------------------------------------
@@ -129,7 +126,7 @@ cmdLine.addArgument("${file}");
cmdLine.setSubstitutionMap(map);
DefaultExecutor executor = DefaultExecutor.builder().get();
executor.setExitValue(1);
-ExecuteWatchdog watchdog = new ExecuteWatchdog(60000);
+ExecuteWatchdog watchdog =
ExecuteWatchdog.builder().setTimeout(Duration.ofSeconds(60)).get();
executor.setWatchdog(watchdog);
int exitValue = executor.execute(cmdLine);
+----------------------------------------------------------------------------
@@ -161,7 +158,7 @@ cmdLine.setSubstitutionMap(map);
DefaultExecuteResultHandler resultHandler = new DefaultExecuteResultHandler();
-ExecuteWatchdog watchdog = new ExecuteWatchdog(60*1000);
+ExecuteWatchdog watchdog =
ExecuteWatchdog.builder().setTimeout(Duration.ofSeconds(60)).get();
Executor executor = DefaultExecutor.builder().get();
executor.setExitValue(1);
executor.setWatchdog(watchdog);
diff --git a/src/site/site.xml b/src/site/site.xml
index 4e2a7bfe..9ae1d8c3 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -40,7 +40,8 @@
<item name="Issue Tracking" href="/issue-tracking.html"/>
<item name="Team" href="/team-list.html"/>
<item name="Source Repository" href="/scm.html"/>
- <item name="Javadoc (latest)" href="/apidocs/index.html"/>
+ <item name="Javadoc" href="/apidocs/index.html"/>
+ <item name="Javadoc Archive"
href="https://javadoc.io/doc/org.apache.commons/commons-exec"/>
</menu>
</body>
diff --git a/src/site/xdoc/testmatrix.xml b/src/site/xdoc/testmatrix.xml
index ea0ac2e1..5f74616c 100644
--- a/src/site/xdoc/testmatrix.xml
+++ b/src/site/xdoc/testmatrix.xml
@@ -24,7 +24,9 @@ limitations under the License.
<section name="Test Matrix">
<p>The following tables contains the test results of running the
comons-exec regression tests
on different OS/JVMs.</p>
- <p>This page has not been updated for version 1.10.</p>
+ <p>The <a
href="https://github.com/apache/commons-exec/actions";>GitHub</a> builds tests
Java 8, 11, 17, and 21;
+ see <a
href="https://github.com/apache/commons-exec/blob/master/.github/workflows/maven.yml";>maven.yml</a>.</p>
+ <p>The rest of this page has not been updated for version 1.10 and
above.</p>
<subsection name="Linux">
<table>
<tr>
