You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/04/08 08:16:51 UTC
[tomcat] branch 9.0.x updated (af4562d -> 15e70d3)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from af4562d Switch test to use localhost as possible fix for CI instability
new fc535a3 Trivial clean-up commit to trigger CI build
new 50591b7 Better align 10.0.x, 9.0.x and 8.5.x
new 15e70d3 Update Java versions used by Travis. Align with 10.0.x
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:
.travis.yml | 6 +++---
java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java | 3 ++-
java/org/apache/catalina/core/StandardHost.java | 14 --------------
3 files changed, 5 insertions(+), 18 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/03: Update Java versions used by Travis. Align with
10.0.x
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 15e70d302fead11831ac55952e0edf25aea3af4f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 8 09:16:29 2021 +0100
Update Java versions used by Travis. Align with 10.0.x
---
.travis.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8033348..1156345 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,8 +34,8 @@ addons:
install:
- ARCH=`uname -p`
- echo $ARCH
- - JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz"
- - JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u232b09.tar.gz"
+ - JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz"
+ - JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz"
- if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; else JDK_URL=$JDK_X64; fi
- wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz
- mv jdk8* jdk
@@ -47,7 +47,7 @@ install:
- ant -version
- rm -rf $HOME/tmp
- export CURR_PWD=`pwd`
- - svn co -q https://svn.apache.org/repos/asf/apr/apr/branches/1.6.x/ $HOME/tmp/apr
+ - git clone -q -b 1.6.x --single-branch https://github.com/apache/apr.git $HOME/tmp/apr
- cd $HOME/tmp/apr
- ./buildconf
- ./configure --prefix=$HOME/tmp/apr-build
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/03: Better align 10.0.x, 9.0.x and 8.5.x
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 50591b715d4b6ba7e771eac597c794cee4bc1c87
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 8 09:16:00 2021 +0100
Better align 10.0.x, 9.0.x and 8.5.x
---
java/org/apache/catalina/core/StandardHost.java | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardHost.java b/java/org/apache/catalina/core/StandardHost.java
index bf8a096..b275117 100644
--- a/java/org/apache/catalina/core/StandardHost.java
+++ b/java/org/apache/catalina/core/StandardHost.java
@@ -209,19 +209,12 @@ public class StandardHost extends ContainerBase implements Host {
}
- /**
- * Return the application root for this Host. This can be an absolute
- * pathname, a relative pathname, or a URL.
- */
@Override
public String getAppBase() {
return this.appBase;
}
- /**
- * ({@inheritDoc}
- */
@Override
public File getAppBaseFile() {
@@ -248,15 +241,8 @@ public class StandardHost extends ContainerBase implements Host {
}
- /**
- * Set the application root for this Host. This can be an absolute
- * pathname, a relative pathname, or a URL.
- *
- * @param appBase The new application root
- */
@Override
public void setAppBase(String appBase) {
-
if (appBase.trim().equals("")) {
log.warn(sm.getString("standardHost.problematicAppBase", getName()));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/03: Trivial clean-up commit to trigger CI build
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit fc535a34e3e1893abb540472ba53824e74e9b7d0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 8 09:15:33 2021 +0100
Trivial clean-up commit to trigger CI build
---
java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
index 5f1bc83..41a67b4 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
@@ -113,8 +113,9 @@ public class JMXAccessorGetTask extends JMXAccessorTask {
if (result != null) {
echoResult(attribute,result);
createProperty(result);
- } else
+ } else {
error = "Attribute " + attribute + " is empty";
+ }
return error;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org