Skip to content

Commit 162e87d

Browse files
committed
Add a GitHub action to lint the Markdown and YAML files.
Add a basic `markdownlint` config file. Add a `yamllint` config file. Lint both Markdown and YAML files.
1 parent 120bf9d commit 162e87d

File tree

9 files changed

+151
-100
lines changed

9 files changed

+151
-100
lines changed

.github/.markdownlint.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# MD001/heading-increment/header-increment
2+
MD001: false
3+
4+
# MD004/ul-style
5+
MD004: false
6+
7+
# MD013/line-length
8+
MD013: false
9+
10+
# MD014/commands-show-output
11+
MD014: false
12+
13+
# MD026/no-trailing-punctuation
14+
MD026: false
15+
16+
# MD040/fenced-code-language
17+
MD040: false

.github/.yamllint

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
3+
extends: default
4+
5+
rules:
6+
brackets: disable
7+
document-start: disable
8+
line-length: disable
9+
truthy: disable

.github/workflows/ci.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,19 @@ jobs:
3131
java: [ 8, 11, 14, 15-ea ]
3232
os: [ ubuntu-latest ]
3333
include:
34-
- os: windows-latest
35-
java: 8
34+
- os: windows-latest
35+
java: 8
3636
name: JDK${{ matrix.java }} ${{ matrix.os }}
3737
runs-on: ${{ matrix.os }}
3838
steps:
39-
- name: Git Checkout
40-
uses: actions/checkout@v2
41-
- name: Set up Java
42-
uses: actions/setup-java@v1
43-
with:
44-
java-version: ${{ matrix.java }}
45-
- name: Build
46-
run: |
47-
ant -noinput echoproperties deploy embed test-nio test-status
48-
env:
49-
ANT_OPTS: -Dtest.openssl.exists=false -Dtest.excludePerformance=true -Dtest.exclude=**/TestHttp2Limits.java,org/apache/catalina/connector/TestRequest.java,org/apache/coyote/http11/filters/TestChunkedInputFilter.java,org/apache/catalina/startup/TestTomcat.java,org/apache/coyote/http2/TestHttp2Timeouts.java,org/apache/catalina/core/TestAsyncContextStateChanges.java,org/apache/catalina/valves/TestStuckThreadDetectionValve.java,org/apache/coyote/http11/TestHttp11Processor.java,org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java,org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java,org/apache/catalina/servlets/TestDefaultServletOptions.java,org/apache/catalina/nonblocking/TestNonBlockingAPI.java,org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java,org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java,org/apache/tomcat/websocket/TestWsWebSocketContainer.java,org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java,jakarta/servlet/http/TestHttpServletResponseSendError.java,org/apache/catalina/core/TestAsyncContextImpl.java,org/apache/catalina/servlets/TestWebdavServletOptions.java,org/apache/catalina/servlets/TestDefaultServletEncodingWithoutBom.java,org/apache/catalina/servlets/TestDefaultServletEncodingWithBom.java,org/apache/catalina/authenticator/TestFormAuthenticator.java,org/apache/naming/TestEnvEntry.java,org/apache/tomcat/util/net/TestSSLHostConfigCompat.java,org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java,org/apache/jasper/compiler/TestJspDocumentParser.java,org/apache/catalina/valves/rewrite/TestRewriteValve.java,org/apache/jasper/compiler/TestEncodingDetector.java,org/apache/catalina/core/TestApplicationContextGetRequestDispatcher.java,org/apache/jasper/compiler/TestParser.java,org/apache/coyote/http2/TestStreamQueryString.java,org/apache/coyote/http11/TestHttp11InputBuffer.java,org/apache/coyote/http11/TestHttp11InputBufferCRLF.java,org/apache/tomcat/util/net/TestSsl.java,org/apache/coyote/ajp/TestAbstractAjpProcessor.java,org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java,org/apache/coyote/http2/TestHttp2Section_6_8.java,org/apache/catalina/tribes/group/TestGroupChannelStartStop.java,org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java,org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java,org/apache/el/TestELInJsp.java,org/apache/coyote/TestIoTimeouts.java,org/apache/catalina/connector/TestMaxConnections.java,org/apache/coyote/http2/TestAsync.java,org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java,org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
39+
- name: Git Checkout
40+
uses: actions/checkout@v2
41+
- name: Set up Java
42+
uses: actions/setup-java@v1
43+
with:
44+
java-version: ${{ matrix.java }}
45+
- name: Build
46+
run: |
47+
ant -noinput echoproperties deploy embed test-nio test-status
48+
env:
49+
ANT_OPTS: -Dtest.openssl.exists=false -Dtest.excludePerformance=true -Dtest.exclude=**/TestHttp2Limits.java,org/apache/catalina/connector/TestRequest.java,org/apache/coyote/http11/filters/TestChunkedInputFilter.java,org/apache/catalina/startup/TestTomcat.java,org/apache/coyote/http2/TestHttp2Timeouts.java,org/apache/catalina/core/TestAsyncContextStateChanges.java,org/apache/catalina/valves/TestStuckThreadDetectionValve.java,org/apache/coyote/http11/TestHttp11Processor.java,org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java,org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java,org/apache/catalina/servlets/TestDefaultServletOptions.java,org/apache/catalina/nonblocking/TestNonBlockingAPI.java,org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java,org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java,org/apache/tomcat/websocket/TestWsWebSocketContainer.java,org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java,jakarta/servlet/http/TestHttpServletResponseSendError.java,org/apache/catalina/core/TestAsyncContextImpl.java,org/apache/catalina/servlets/TestWebdavServletOptions.java,org/apache/catalina/servlets/TestDefaultServletEncodingWithoutBom.java,org/apache/catalina/servlets/TestDefaultServletEncodingWithBom.java,org/apache/catalina/authenticator/TestFormAuthenticator.java,org/apache/naming/TestEnvEntry.java,org/apache/tomcat/util/net/TestSSLHostConfigCompat.java,org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java,org/apache/jasper/compiler/TestJspDocumentParser.java,org/apache/catalina/valves/rewrite/TestRewriteValve.java,org/apache/jasper/compiler/TestEncodingDetector.java,org/apache/catalina/core/TestApplicationContextGetRequestDispatcher.java,org/apache/jasper/compiler/TestParser.java,org/apache/coyote/http2/TestStreamQueryString.java,org/apache/coyote/http11/TestHttp11InputBuffer.java,org/apache/coyote/http11/TestHttp11InputBufferCRLF.java,org/apache/tomcat/util/net/TestSsl.java,org/apache/coyote/ajp/TestAbstractAjpProcessor.java,org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java,org/apache/coyote/http2/TestHttp2Section_6_8.java,org/apache/catalina/tribes/group/TestGroupChannelStartStop.java,org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java,org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java,org/apache/el/TestELInJsp.java,org/apache/coyote/TestIoTimeouts.java,org/apache/catalina/connector/TestMaxConnections.java,org/apache/coyote/http2/TestAsync.java,org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java,org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java

.github/workflows/lint.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Lint
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
lint:
7+
name: 🧹 Markdown and YAML
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v2
11+
- name: yaml-lint
12+
uses: ibiqlik/action-yamllint@v1
13+
with:
14+
config_file: .github/.yamllint
15+
- name: Use Node.js
16+
uses: actions/setup-node@v1
17+
with:
18+
node-version: '12.x'
19+
- run: npm install -g [email protected]
20+
- run: markdownlint '**/*.md' --ignore node_modules --config .github/.markdownlint.yml

.travis.yml

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -16,77 +16,77 @@
1616
dist: bionic
1717
language: java
1818
jobs:
19-
include:
20-
- arch: s390x
21-
jdk: openjdk11
22-
- arch: arm64
23-
jdk: oraclejdk8
24-
- arch: ppc64le
25-
jdk: oraclejdk8
19+
include:
20+
- arch: s390x
21+
jdk: openjdk11
22+
- arch: arm64
23+
jdk: oraclejdk8
24+
- arch: ppc64le
25+
jdk: oraclejdk8
2626

2727
addons:
28-
apt:
29-
packages:
30-
- ant
31-
- build-essential
32-
- automake
33-
- autoconf
34-
- tar
35-
- libssl-dev
36-
- subversion
37-
- git
38-
- libtool-bin
28+
apt:
29+
packages:
30+
- ant
31+
- build-essential
32+
- automake
33+
- autoconf
34+
- tar
35+
- libssl-dev
36+
- subversion
37+
- git
38+
- libtool-bin
3939

4040
install:
41-
- ARCH=`uname -p`
42-
- echo $ARCH
43-
- JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u252b09.tar.gz"
44-
- JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u252b09.tar.gz"
45-
- JDK_s390x="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz"
46-
- JDK_ppc64le="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u252b09.tar.gz"
47-
- if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; elif test "$ARCH" = "ppc64le"; then JDK_URL=$JDK_ppc64le; elif test "$ARCH" = "s390x"; then JDK_URL=$JDK_s390x; else JDK_URL=$JDK_X64; fi
48-
- wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz
49-
- if test "$ARCH" = "s390x"; then mv jdk-11* jdk; else mv jdk8* jdk; fi
50-
- export JAVA_HOME=`pwd`/jdk
51-
- wget -q https://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.8-bin.tar.gz && tar xzf apache-ant-*-bin.tar.gz
52-
- export ANT_HOME=`pwd`/apache-ant-1.10.8
53-
- export PATH="$JAVA_HOME/bin:$ANT_HOME/bin:$PATH"
54-
- java -version
55-
- ant -version
56-
- rm -rf $HOME/tmp
57-
- export CURR_PWD=`pwd`
58-
- svn co -q https://svn.apache.org/repos/asf/apr/apr/branches/1.6.x/ $HOME/tmp/apr
59-
- cd $HOME/tmp/apr
60-
- ./buildconf
61-
- ./configure --prefix=$HOME/tmp/apr-build
62-
- make
63-
- make install
64-
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/tmp/apr-build/lib"
65-
- git clone -q https://github.com/apache/tomcat-native.git $HOME/tmp/tomcat-native
66-
- cd $HOME/tmp/tomcat-native/native
67-
- sh buildconf --with-apr=$HOME/tmp/apr
68-
- ./configure --with-apr=$HOME/tmp/apr --with-java-home=$JAVA_HOME --with-ssl=yes --prefix=$HOME/tmp/tomcat-native-build
69-
- make
70-
- make install
71-
- cd $CURR_PWD
72-
- yes | cp build.properties.default build.properties
73-
- echo >> build.properties
74-
- echo "test.threads=16" >> build.properties
75-
- echo "test.relaxTiming=true" >> build.properties
76-
- echo "test.excludePerformance=true" >> build.properties
77-
- echo "test.openssl.path=/dev/null/openssl" >> build.properties
78-
- echo "test.apr.loc=$HOME/tmp/tomcat-native-build/lib" >> build.properties
41+
- ARCH=`uname -p`
42+
- echo $ARCH
43+
- JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u252b09.tar.gz"
44+
- JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u252b09.tar.gz"
45+
- JDK_s390x="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz"
46+
- JDK_ppc64le="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u252b09.tar.gz"
47+
- if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; elif test "$ARCH" = "ppc64le"; then JDK_URL=$JDK_ppc64le; elif test "$ARCH" = "s390x"; then JDK_URL=$JDK_s390x; else JDK_URL=$JDK_X64; fi
48+
- wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz
49+
- if test "$ARCH" = "s390x"; then mv jdk-11* jdk; else mv jdk8* jdk; fi
50+
- export JAVA_HOME=`pwd`/jdk
51+
- wget -q https://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.8-bin.tar.gz && tar xzf apache-ant-*-bin.tar.gz
52+
- export ANT_HOME=`pwd`/apache-ant-1.10.8
53+
- export PATH="$JAVA_HOME/bin:$ANT_HOME/bin:$PATH"
54+
- java -version
55+
- ant -version
56+
- rm -rf $HOME/tmp
57+
- export CURR_PWD=`pwd`
58+
- svn co -q https://svn.apache.org/repos/asf/apr/apr/branches/1.6.x/ $HOME/tmp/apr
59+
- cd $HOME/tmp/apr
60+
- ./buildconf
61+
- ./configure --prefix=$HOME/tmp/apr-build
62+
- make
63+
- make install
64+
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/tmp/apr-build/lib"
65+
- git clone -q https://github.com/apache/tomcat-native.git $HOME/tmp/tomcat-native
66+
- cd $HOME/tmp/tomcat-native/native
67+
- sh buildconf --with-apr=$HOME/tmp/apr
68+
- ./configure --with-apr=$HOME/tmp/apr --with-java-home=$JAVA_HOME --with-ssl=yes --prefix=$HOME/tmp/tomcat-native-build
69+
- make
70+
- make install
71+
- cd $CURR_PWD
72+
- yes | cp build.properties.default build.properties
73+
- echo >> build.properties
74+
- echo "test.threads=16" >> build.properties
75+
- echo "test.relaxTiming=true" >> build.properties
76+
- echo "test.excludePerformance=true" >> build.properties
77+
- echo "test.openssl.path=/dev/null/openssl" >> build.properties
78+
- echo "test.apr.loc=$HOME/tmp/tomcat-native-build/lib" >> build.properties
7979

8080

8181
script:
82-
- ant -q clean
83-
- travis_wait 60 "./.travis/antTest.sh"
82+
- ant -q clean
83+
- travis_wait 60 "./.travis/antTest.sh"
8484

8585
after_failure:
86-
- tail -n 5000 ant-test.log
87-
- tail -n 5000 test-failures.log
88-
- ls -laR $HOME/tomcat-build-libs
86+
- tail -n 5000 ant-test.log
87+
- tail -n 5000 test-failures.log
88+
- ls -laR $HOME/tomcat-build-libs
8989

9090
notifications:
91-
email:
92-
91+
email:
92+

README.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
## Welcome to Apache Tomcat!
1+
# Welcome to Apache Tomcat!
22

3-
### What Is It?
3+
## What Is It?
44

55
The Apache Tomcat® software is an open source implementation of the Java
66
Servlet, JavaServer Pages, Java Expression Language and Java WebSocket
@@ -24,37 +24,39 @@ these users and their stories are listed on the
2424
Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
2525
project logo are trademarks of the Apache Software Foundation.
2626

27-
### Get It
27+
## Get It
2828

2929
For every major Tomcat version there is one download page containing
3030
links to the latest binary and source code downloads, but also
3131
links for browsing the download directories and archives:
32+
3233
- [Tomcat 9](https://tomcat.apache.org/download-90.cgi)
3334
- [Tomcat 8](https://tomcat.apache.org/download-80.cgi)
3435
- [Tomcat 7](https://tomcat.apache.org/download-70.cgi)
3536

3637
To facilitate choosing the right major Tomcat version one, we have provided a
3738
[version overview page](https://tomcat.apache.org/whichversion.html).
3839

39-
### Documentation
40+
## Documentation
4041

4142
The documentation available as of the date of this release is
4243
included in the docs webapp which ships with tomcat. You can access that webapp
4344
by starting tomcat and visiting <http://localhost:8080/docs/> in your browser.
4445
The most up-to-date documentation for each version can be found at:
46+
4547
- [Tomcat 9](https://tomcat.apache.org/tomcat-9.0-doc/)
4648
- [Tomcat 8](https://tomcat.apache.org/tomcat-8.5-doc/)
4749
- [Tomcat 7](https://tomcat.apache.org/tomcat-7.0-doc/)
4850

49-
### Installation
51+
## Installation
5052

5153
Please see [RUNNING.txt](RUNNING.txt) for more info.
5254

53-
### Licensing
55+
## Licensing
5456

5557
Please see [LICENSE](LICENSE) for more info.
5658

57-
### Support and Mailing List Information
59+
## Support and Mailing List Information
5860

5961
* Free community support is available through the
6062
[tomcat-users](https://tomcat.apache.org/lists.html#tomcat-users) email list and
@@ -74,6 +76,6 @@ list.
7476
instructions for reporting a bug
7577
[here](https://tomcat.apache.org/bugreport.html).
7678

77-
### Contributing
79+
## Contributing
7880

7981
Please see [CONTRIBUTING](CONTRIBUTING.md) for more info.

modules/stuffed/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Configuration is located in `conf/server.xml`, `conf/web.xml`, `conf/logging.pro
3030
### Maven build
3131

3232
Update Tomcat version number in the `pom.xml`, customize Tomcat components in the dependencies to keep the ones needed (only the main `tomcat-catalina` is mandatory). Custom Tomcat components sources can be added to the usual Maven build path and will be included in the package that is built.
33+
3334
```
3435
mvn clean; mvn package
3536
```
@@ -39,11 +40,13 @@ mvn clean; mvn package
3940
```
4041
docker build -t apache/tomcat-stuffed:1.0 -f ./Dockerfile .
4142
```
43+
4244
Docker build arguments include `namespace` (default is `tomcat`) and `port` which should match the Tomcat port in `server.xml` (default is `8080`). Other ports that need to be exposed can be added in the `Dockerfile` as needed. Webapps should be added to the `webapps` folder where they will be auto deployed by the host if using the defaults. Otherwise, the `Dockerfile` command line can be edited like below to include the necesary resources and command line arguments to run a single or multiple hardcoded web applications.
4345

4446
## Running
4547

4648
Add a webapp as folder mywebapp (for this example, or specify another path), or a path from which a configured Host will auto deploy
49+
4750
```
4851
--path: Specify a path the wepapp will use
4952
--war: Add the spcified path (directory or war) as a webapp (if no path has been specified, it will be the root webapp)
@@ -74,6 +77,7 @@ An example `tomcat.yaml` is included which uses the Docker image. It uses the he
7477
### Cluster
7578

7679
If using the Kubernetes cloud clustering membership provider, the pod needs to have the permission to view other pods. For exemple with Openshift, this is done with:
80+
7781
```
7882
oc policy add-role-to-user view system:serviceaccount:$(oc project -q):default -n $(oc project -q)
7983
```

modules/stuffed/tomcat.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,20 @@ spec:
3232
run: tomcat
3333
spec:
3434
containers:
35-
- name: tomcat
36-
image: apache/tomcat-stuffed:1.0
37-
ports:
38-
- containerPort: 8080
39-
- containerPort: 8778
40-
name: jolokia
41-
- containerPort: 9404
42-
name: prometheus
43-
readinessProbe:
44-
httpGet:
45-
path: /health
46-
port: 8080
47-
initialDelaySeconds: 3
48-
periodSeconds: 3
49-
resources: {}
35+
- name: tomcat
36+
image: apache/tomcat-stuffed:1.0
37+
ports:
38+
- containerPort: 8080
39+
- containerPort: 8778
40+
name: jolokia
41+
- containerPort: 9404
42+
name: prometheus
43+
readinessProbe:
44+
httpGet:
45+
path: /health
46+
port: 8080
47+
initialDelaySeconds: 3
48+
periodSeconds: 3
49+
resources: {}
5050
strategy: {}
5151
status: {}

res/graal/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,3 @@ This directory also contains resource directives, so that resource files normall
3737
also get compiled into the executable image.
3838
These are currently stored in a file called `tomcat-resource.json` in the `META-INF/native-image/groupId/artifactId`
3939
location.
40-

0 commit comments

Comments
 (0)