Skip to content

Commit

Permalink
Merge pull request #123 from jamezp/doc-update
Browse files Browse the repository at this point in the history
Update documentation page and add gRPC documentation
  • Loading branch information
jamezp committed May 29, 2023
2 parents ad95545 + 7dbec30 commit 1fbdb92
Show file tree
Hide file tree
Showing 8 changed files with 1,551 additions and 4 deletions.
58 changes: 58 additions & 0 deletions .github/workflows/jekyll.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: Deploy Jekyll site to Pages

on:
# Runs on pushes targeting the default branch
push:
branches: ["main"]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
# Build job
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.1'
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
cache-version: 0 # Increment this number if you need to re-download cached gems
- name: Setup Pages
id: pages
uses: actions/configure-pages@v3
- name: Build with Jekyll
# Outputs to the './_site' directory by default
run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
env:
JEKYLL_ENV: production
- name: Upload artifact
# Automatically uploads an artifact from the './_site' directory by default
uses: actions/upload-pages-artifact@v1

# Deployment job
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
7 changes: 5 additions & 2 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,13 @@ exclude:
- "README.md"

gems:
- jekyll-asciidoc
- jekyll-paginate
- jekyll-feed
plugins:
- jekyll-paginate

asciidoctor:
base_dir: :docdir
safe: unsafe

# Pagination
paginate: 15
Expand Down
10 changes: 10 additions & 0 deletions _data/grpc/releases.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- group: 1.x
supported: true
detail:
- version: 1.0.0.Alpha1
date: 2023-05-20
license: ASL v2
source: https://github.com/resteasy/resteasy-grpc/archive/refs/tags/1.0.0.Alpha1.zip
release_notes: https://github.com/resteasy/resteasy-grpc/releases/tag/1.0.0.Alpha1
documentation:
link: /docs/grpc
72 changes: 71 additions & 1 deletion _data/releases.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
- group: 6.2.x
supported: true
detail:
- version: 6.2.4.Final
date: 2023-05-15
Expand All @@ -8,6 +9,10 @@
release_notes: https://github.com/resteasy/resteasy/releases/tag/6.2.4.Final
download_link: https://github.com/resteasy/resteasy/releases/download/6.2.4.Final/resteasy-6.2.4.Final-all.zip
download_text: resteasy-6.2.4.Final-all.zip
jakarta_rest_spec:
version: 3.1
link: https://jakarta.ee/specifications/restful-ws/3.1/jakarta-restful-ws-spec-3.1.html
java_doc: https://jakarta.ee/specifications/restful-ws/3.1/apidocs
documentation:
examples: https://github.com/resteasy/resteasy-examples/
single_page: https://docs.jboss.org/resteasy/docs/6.2.4.Final/userguide/html_single/index.html
Expand All @@ -22,6 +27,10 @@
release_notes: https://github.com/resteasy/resteasy/releases/tag/6.2.3.Final
download_link: https://github.com/resteasy/resteasy/releases/download/6.2.3.Final/resteasy-6.2.3.Final-all.zip
download_text: resteasy-6.2.3.Final-all.zip
jakarta_rest_spec:
version: 3.1
link: https://jakarta.ee/specifications/restful-ws/3.1/jakarta-restful-ws-spec-3.1.html
java_doc: https://jakarta.ee/specifications/restful-ws/3.1/apidocs
documentation:
examples: https://github.com/resteasy/resteasy-examples/
single_page: https://docs.jboss.org/resteasy/docs/6.2.3.Final/userguide/html_single/index.html
Expand All @@ -36,6 +45,10 @@
release_notes: https://github.com/resteasy/resteasy/releases/tag/6.2.2.Final
download_link: https://github.com/resteasy/resteasy/releases/download/6.2.2.Final/resteasy-6.2.2.Final-all.zip
download_text: resteasy-6.2.2.Final-all.zip
jakarta_rest_spec:
version: 3.1
link: https://jakarta.ee/specifications/restful-ws/3.1/jakarta-restful-ws-spec-3.1.html
java_doc: https://jakarta.ee/specifications/restful-ws/3.1/apidocs
documentation:
examples: https://github.com/resteasy/resteasy-examples/
single_page: https://docs.jboss.org/resteasy/docs/6.2.2.Final/userguide/html_single/index.html
Expand All @@ -50,6 +63,10 @@
release_notes: https://github.com/resteasy/resteasy/releases/tag/6.2.1.Final
download_link: https://github.com/resteasy/resteasy/releases/download/6.2.1.Final/resteasy-6.2.1.Final-all.zip
download_text: resteasy-6.2.1.Final-all.zip
jakarta_rest_spec:
version: 3.1
link: https://jakarta.ee/specifications/restful-ws/3.1/jakarta-restful-ws-spec-3.1.html
java_doc: https://jakarta.ee/specifications/restful-ws/3.1/apidocs
documentation:
examples: https://github.com/resteasy/resteasy-examples/
single_page: https://docs.jboss.org/resteasy/docs/6.2.1.Final/userguide/html_single/index.html
Expand All @@ -64,6 +81,10 @@
release_notes: https://github.com/resteasy/resteasy/releases/tag/6.2.0.Final
download_link: https://github.com/resteasy/resteasy/releases/download/6.2.0.Final/resteasy-6.2.0.Final-all.zip
download_text: resteasy-6.2.0.Final-all.zip
jakarta_rest_spec:
version: 3.1
link: https://jakarta.ee/specifications/restful-ws/3.1/jakarta-restful-ws-spec-3.1.html
java_doc: https://jakarta.ee/specifications/restful-ws/3.1/apidocs
documentation:
examples: https://github.com/resteasy/resteasy-examples/
single_page: https://docs.jboss.org/resteasy/docs/6.2.0.Final/userguide/html_single/index.html
Expand All @@ -80,6 +101,10 @@
release_notes: https://github.com/resteasy/resteasy/releases/tag/6.1.0.Final
download_link: https://github.com/resteasy/resteasy/releases/download/6.1.0.Final/resteasy-6.1.0.Final-all.zip
download_text: resteasy-6.1.0.Final-all.zip
jakarta_rest_spec:
version: 3.1
link: https://jakarta.ee/specifications/restful-ws/3.1/jakarta-restful-ws-spec-3.1.html
java_doc: https://jakarta.ee/specifications/restful-ws/3.1/apidocs
documentation:
examples: https://github.com/resteasy/resteasy-examples/
single_page: https://docs.jboss.org/resteasy/docs/6.1.0.Final/userguide/html_single/index.html
Expand All @@ -96,6 +121,10 @@
release_notes: https://github.com/resteasy/resteasy/releases/tag/6.0.3.Final
download_link: https://github.com/resteasy/resteasy/releases/download/6.0.3.Final/resteasy-6.0.3.Final-all.zip
download_text: resteasy-6.0.3.Final-all.zip
jakarta_rest_spec:
version: 3.0
link: https://jakarta.ee/specifications/restful-ws/3.0/jakarta-restful-ws-spec-3.0.html
java_doc: https://jakarta.ee/specifications/restful-ws/3.0/apidocs
documentation:
single_page: https://docs.jboss.org/resteasy/docs/6.0.3.Final/userguide/html_single/index.html
link: https://docs.jboss.org/resteasy/docs/6.0.3.Final/userguide/html/index.html
Expand All @@ -109,6 +138,10 @@
release_notes: https://github.com/resteasy/resteasy/releases/tag/6.0.1.Final
download_link: https://github.com/resteasy/resteasy/releases/download/6.0.1.Final/resteasy-6.0.1.Final-all.zip
download_text: resteasy-6.0.1.Final-all.zip
jakarta_rest_spec:
version: 3.0
link: https://jakarta.ee/specifications/restful-ws/3.0/jakarta-restful-ws-spec-3.0.html
java_doc: https://jakarta.ee/specifications/restful-ws/3.0/apidocs
documentation:
single_page: https://docs.jboss.org/resteasy/docs/6.0.1.Final/userguide/html_single/index.html
link: https://docs.jboss.org/resteasy/docs/6.0.1.Final/userguide/html/index.html
Expand All @@ -122,21 +155,30 @@
release_notes: https://issues.redhat.com/secure/ReleaseNote.jspa?projectId=12310560&version=12378531
download_link: https://github.com/resteasy/resteasy/releases/download/6.0.0.Final/resteasy-6.0.0.Final-all.zip
download_text: resteasy-6.0.0.Final-all.zip
jakarta_rest_spec:
version: 3.0
link: https://jakarta.ee/specifications/restful-ws/3.0/jakarta-restful-ws-spec-3.0.html
java_doc: https://jakarta.ee/specifications/restful-ws/3.0/apidocs
documentation:
single_page: https://docs.jboss.org/resteasy/docs/6.0.0.Final/userguide/html_single/index.html
link: https://docs.jboss.org/resteasy/docs/6.0.0.Final/userguide/html/index.html
pdf: https://docs.jboss.org/resteasy/docs/6.0.0.Final/userguide/pdf/resteasy-reference-guide-en-US.pdf
java_doc: https://docs.jboss.org/resteasy/docs/6.0.0.Final/javadocs/index.html
- group: 5.0.x
supported: true
detail:
- version: 5.0.7.Final
date: 2023-03-01
date: 2023-05-15
license: ASL v2
source: https://github.com/resteasy/resteasy/releases/download/5.0.7.Final/resteasy-jaxrs-5.0.7.Final-src.zip
size: 31.8 MB
release_notes: https://github.com/resteasy/resteasy/releases/tag/5.0.7.Final
download_link: https://github.com/resteasy/resteasy/releases/download/5.0.7.Final/resteasy-jaxrs-5.0.7.Final-all.zip
download_text: resteasy-jaxrs-5.0.7.Final-all.zip
jakarta_rest_spec:
version: 2.1
link: https://jakarta.ee/specifications/restful-ws/2.1/restful-ws-spec-2.1.html
java_doc: https://jakarta.ee/specifications/restful-ws/2.1/apidocs
documentation:
examples: https://github.com/resteasy/resteasy-examples/releases/tag/4.2.0.Final
single_page: https://docs.jboss.org/resteasy/docs/5.0.7.Final/userguide/html_single/index.html
Expand All @@ -151,6 +193,10 @@
release_notes: https://github.com/resteasy/resteasy/releases/tag/5.0.6.Final
download_link: https://github.com/resteasy/resteasy/releases/download/5.0.6.Final/resteasy-jaxrs-5.0.6.Final-all.zip
download_text: resteasy-jaxrs-5.0.6.Final-all.zip
jakarta_rest_spec:
version: 2.1
link: https://jakarta.ee/specifications/restful-ws/2.1/restful-ws-spec-2.1.html
java_doc: https://jakarta.ee/specifications/restful-ws/2.1/apidocs
documentation:
examples: https://github.com/resteasy/resteasy-examples/releases/tag/4.2.0.Final
single_page: https://docs.jboss.org/resteasy/docs/5.0.6.Final/userguide/html_single/index.html
Expand All @@ -165,6 +211,10 @@
release_notes: https://github.com/resteasy/resteasy/releases/tag/5.0.5.Final
download_link: https://github.com/resteasy/resteasy/releases/download/5.0.5.Final/resteasy-jaxrs-5.0.5.Final-all.zip
download_text: resteasy-jaxrs-5.0.5.Final-all.zip
jakarta_rest_spec:
version: 2.1
link: https://jakarta.ee/specifications/restful-ws/2.1/restful-ws-spec-2.1.html
java_doc: https://jakarta.ee/specifications/restful-ws/2.1/apidocs
documentation:
examples: https://github.com/resteasy/resteasy-examples/releases/tag/4.2.0.Final
single_page: https://docs.jboss.org/resteasy/docs/5.0.5.Final/userguide/html_single/index.html
Expand All @@ -179,6 +229,10 @@
release_notes: https://github.com/resteasy/resteasy/releases/tag/5.0.4.Final
download_link: https://github.com/resteasy/resteasy/releases/download/5.0.4.Final/resteasy-jaxrs-5.0.4.Final-all.zip
download_text: resteasy-jaxrs-5.0.4.Final-all.zip
jakarta_rest_spec:
version: 2.1
link: https://jakarta.ee/specifications/restful-ws/2.1/restful-ws-spec-2.1.html
java_doc: https://jakarta.ee/specifications/restful-ws/2.1/apidocs
documentation:
examples: https://github.com/resteasy/resteasy-examples/releases/tag/4.2.0.Final
single_page: https://docs.jboss.org/resteasy/docs/5.0.4.Final/userguide/html_single/index.html
Expand All @@ -193,6 +247,10 @@
release_notes: https://github.com/resteasy/resteasy/releases/tag/5.0.3.Final
download_link: https://github.com/resteasy/resteasy/releases/download/5.0.3.Final/resteasy-jaxrs-5.0.3.Final-all.zip
download_text: resteasy-jaxrs-5.0.3.Final-all.zip
jakarta_rest_spec:
version: 2.1
link: https://jakarta.ee/specifications/restful-ws/2.1/restful-ws-spec-2.1.html
java_doc: https://jakarta.ee/specifications/restful-ws/2.1/apidocs
documentation:
examples: https://github.com/resteasy/resteasy-examples/releases/tag/4.2.0.Final
single_page: https://docs.jboss.org/resteasy/docs/5.0.3.Final/userguide/html_single/index.html
Expand All @@ -207,6 +265,10 @@
release_notes: https://issues.redhat.com/secure/ReleaseNote.jspa?projectId=12310560&version=12378530
download_link: https://github.com/resteasy/resteasy/releases/download/5.0.2.Final/resteasy-jaxrs-5.0.2.Final-all.zip
download_text: resteasy-jaxrs-5.0.2.Final-all.zip
jakarta_rest_spec:
version: 2.1
link: https://jakarta.ee/specifications/restful-ws/2.1/restful-ws-spec-2.1.html
java_doc: https://jakarta.ee/specifications/restful-ws/2.1/apidocs
documentation:
examples: https://github.com/resteasy/resteasy-examples/releases/tag/4.2.0.Final
single_page: https://docs.jboss.org/resteasy/docs/5.0.2.Final/userguide/html_single/index.html
Expand All @@ -221,6 +283,10 @@
release_notes: https://issues.redhat.com/secure/ReleaseNote.jspa?projectId=12310560&version=12377149
download_link: https://github.com/resteasy/resteasy/releases/download/5.0.1.Final/resteasy-jaxrs-5.0.1.Final-all.zip
download_text: resteasy-jaxrs-5.0.1.Final-all.zip
jakarta_rest_spec:
version: 2.1
link: https://jakarta.ee/specifications/restful-ws/2.1/restful-ws-spec-2.1.html
java_doc: https://jakarta.ee/specifications/restful-ws/2.1/apidocs
documentation:
examples: https://github.com/resteasy/resteasy-examples/releases/tag/4.2.0.Final
single_page: https://docs.jboss.org/resteasy/docs/5.0.1.Final/userguide/html_single/index.html
Expand All @@ -235,6 +301,10 @@
release_notes: https://issues.redhat.com/issues/?jql=project%20%3D%20RESTEASY%20AND%20fixVersion%20in%20(5.0.0.Alpha1%2C%205.0.0.Beta1%2C%205.0.0.Beta2%2C%205.0.0.Beta3%2C%205.0.0.Final)%20ORDER%20BY%20fixVersion%20DESC%2C%20type%20DESC
download_link: https://github.com/resteasy/resteasy/releases/download/5.0.0.Final/resteasy-jaxrs-5.0.0.Final-all.zip
download_text: resteasy-jaxrs-5.0.0.Final-all.zip
jakarta_rest_spec:
version: 2.1
link: https://jakarta.ee/specifications/restful-ws/2.1/restful-ws-spec-2.1.html
java_doc: https://jakarta.ee/specifications/restful-ws/2.1/apidocs
documentation:
examples: https://github.com/resteasy/resteasy-examples/releases/tag/4.2.0.Final
single_page: https://docs.jboss.org/resteasy/docs/5.0.0.Final/userguide/html_single/index.html
Expand Down
13 changes: 13 additions & 0 deletions css/project.css
Original file line number Diff line number Diff line change
Expand Up @@ -2098,5 +2098,18 @@ div.share-page {
width: 16px;
}

.release-container {
margin-top: 3px;
}

.release {
border-top: 1px solid black;
margin-top: 15px;
padding: 10px;
}
.release li {
list-style-type: circle;
}



60 changes: 60 additions & 0 deletions docs.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
---
layout: default
title: Documentation
selflink: docs
permalink: /docs/
---
<h3>RESTEasy Documentation (Latest)</h3>


<div class="release-container" id="documentation">
{% for release in site.data.releases %}
{% if release.supported %}
{% assign detail = release.detail[0] %}
<div class="release">
<div class="release-body">
<h4 class="release-title">RESTEasy {{ detail.version }} <small>({{ detail.date }})</small></h4>
{% if detail.jakarta_rest_spec %}
<div class="spec">
<strong>Implements</strong> <a href="{{ detail.jakarta_rest_spec.link }}" target="_blank">Jakarta REST {{ detail.jakarta_rest_spec.version }}</a>
<span><a href="{{ detail.jakarta_rest_spec.java_doc }}" target="_blank">(JavaDoc)</a> </span>
</div>
{% endif %}
<ul>
{% if detail.documentation.link %}
<li><a href="{{ detail.documentation.link }}" target="_blank">Documentation</a></li>
{% endif %}
{% if detail.download_link %}
<li><a href="{{ detail.download_link }}" target="_blank">Download</a></li>
{% endif %}
{% if detail.release_notes %}
<li><a href="{{ detail.release_notes }}" target="_blank">Release Notes</a></li>
{% endif %}
</ul>
</div>
<div>
<a href="{{ site.baseurl }}{% link docs/all-docs.md %}#{{ detail.version | replace:'.','' }}">Older Releases</a>
</div>
</div>
{% endif %}
{% endfor %}
{% for release in site.data.grpc.releases %}
{% if release.supported %}
{% assign detail = release.detail[0] %}
<div class="release">
<div class="release-body">
<h4 class="release-title">RESTEasy gRPC {{ detail.version }} <small>({{ detail.date }})</small></h4>
<ul>
<li><a href="{{ site.baseurl }}{{ detail.documentation.link }}">Documentation</a></li>
{% if detail.download_link %}
<li><a href="{{ detail.download_link }}">Download</a></li>
{% endif %}
{% if detail.release_notes %}
<li><a href="{{ detail.release_notes }}">Release Notes</a></li>
{% endif %}
</ul>
</div>
</div>
{% endif %}
{% endfor %}
</div>
2 changes: 1 addition & 1 deletion docs.md → docs/all-docs.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
layout: doc-listing
title: Documentation
permalink: /docs/
permalink: /docs/all/
---
Loading

0 comments on commit 1fbdb92

Please sign in to comment.