Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .github/workflows/testsite.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Test site build

on:
pull_request:

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
cache: maven
- name: Build with Maven
run: mvn --batch-mode test
- name: Archive generated site
uses: actions/upload-artifact@v4
with:
name: generated-site
path: ./target/roq/
2 changes: 2 additions & 0 deletions content/blog/2024-10-08-securing-wildfly-apps-oidc-k8s.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,7 @@ Set up access to your application by configuring port-forward in kubernetes.

. Get the name of pod for your application:
+
[source]
----
kubectl get pod

Expand Down Expand Up @@ -374,6 +375,7 @@ The example application simply outputs the name of the logged in user.

You should see the following output:

[source]
----
Secured Servlet

Expand Down
34 changes: 24 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<version>1.0.0-SNAPSHOT</version>

<properties>
<maven.compiler.release>21</maven.compiler.release>
<maven.compiler.release>17</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

Expand All @@ -15,8 +15,8 @@
<skipITs>true</skipITs>

<version.compiler-plugin>3.14.0</version.compiler-plugin>
<version.quarkus-roq>1.5.1</version.quarkus-roq>
<version.quarkus.platform>3.22.1</version.quarkus.platform>
<version.quarkus-roq>1.10.1</version.quarkus-roq>
<version.quarkus.platform>3.28.2</version.quarkus.platform>
<version.surefire-plugin>3.5.2</version.surefire-plugin>
</properties>

Expand Down Expand Up @@ -58,17 +58,10 @@
<artifactId>quarkus-roq-plugin-asciidoc-jruby</artifactId>
<version>${version.quarkus-roq}</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.roq</groupId>
<artifactId>quarkus-roq-plugin-tagging</artifactId>
<version>${version.quarkus-roq}</version>
</dependency>

<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc</artifactId>
</dependency>

<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
Expand All @@ -83,7 +76,28 @@
</dependencies>

<build>
<defaultGoal>test</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.5.0</version>
<executions>
<execution>
<id>enforce-java</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireJavaVersion>
<version>[${maven.compiler.release},)</version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
Expand Down
5 changes: 4 additions & 1 deletion src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ site.url=https://wildfly-security.github.io
quarkus.http.root-path=wildfly-elytron
quarkus.roq.tagging.lowercase=true

quarkus.qute.strict-rendering=false
quarkus.qute.strict-rendering=true
quarkus.qute.property-not-found-strategy=noop

site.collections.blog=true

quarkus.asciidoc.attributes.icons=font
quarkus.asciidoc.attributes.source-highlighter=highlight.js
8 changes: 8 additions & 0 deletions src/main/resources/web/app/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,14 @@ pre, pre span {
color: #be9100;
}

pre:has(code) {
margin: 0px;
max-height: max-content;
width: auto;
padding: 0px;
border: none;
}

code, pre, pre span {
background-color: inherit;
padding: 0;
Expand Down
12 changes: 8 additions & 4 deletions templates/layouts/blog.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
<a href="{post.data.external_link ?: post.url}">{post.title}</a>
</div>
<div class="grid__item width-8-12 width-12-12-m byline-wrapper">
<img class="headshot" src="https://www.gravatar.com/avatar/{author.emailhash}">
{#if author.containsKey('emailHash')}
<img class="headshot" src="https://www.gravatar.com/avatar/{author.emailHash}">
{/if}
<p class="byline">By <a href="{author.bio}">{author.name}</a>
<br/>
<small>{post.date.format('LLLL dd, YYYY')} |
Expand All @@ -34,17 +36,19 @@
</p>
</div>
<div class="grid__item width-4-12 width-12-12-m">
{#include partials/share-page.html title=post.title url=post.data.link or post.url /}
{#include partials/share-page.html title=post.title url=post.data.link.or(post.url) /}
</div>
<div class="grid__item width-12-12">
{#if post.data.synopsis}
<p>{post.data.synopsis.stripHtml()}</p>
{/if}
</div>
<div class="grid__item width-12-12">
<a href="{post.data.external_link ?: post.url}">
{#if post.data.external_link contains 'youtube'}Watch Video &rsaquo;{#else}Read More &rsaquo;{/if}
{#let url=post.data.external_link.or(post.url.path)}
<a href="{url}">
{#if url.contains('youtube')}Watch Video &rsaquo;{#else}Read More &rsaquo;{/if}
</a>
{/let}
</div>
</div>
{/let}
Expand Down
4 changes: 4 additions & 0 deletions templates/layouts/default.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
---
twitter_username: WildFlyAS
---

<!DOCTYPE html>
<html>
<head>
Expand Down
2 changes: 1 addition & 1 deletion templates/layouts/guides.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
layout: default
---

{#include partials/grid-icons.html datafile=site.data.guides /}
{#include partials/grid-icons.html /}
4 changes: 2 additions & 2 deletions templates/layouts/post.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ <h1>{page.title}</h1>
<div class="grid-wrapper">
<div class="grid__item width-8-12 width-12-12-m byline-wrapper">
{#let author = cdi:authors.get(page.data.author)}
{#if author.emailhash}
<img class="headshot" src="https://www.gravatar.com/avatar/{author.emailhash}">
{#if author.containsKey('emailHash')}
<img class="headshot" src="https://www.gravatar.com/avatar/{author.emailHash}">
{/if}
<p class="byline">
By <a href="{author.bio}">{author.name}</a> | {page.date.format('LLLL d, YYY')}
Expand Down
15 changes: 11 additions & 4 deletions templates/layouts/tag.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
---
layout: default
tagging: blog
paginate: true
#paginate:
# collection: blog
# size: 10
# link: blog/tag/:page
---
{@io.quarkiverse.roq.frontmatter.runtime.model.NormalPage page}
<div class="blog-page grid-wrapper">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @jasondlee , in the page preview on your account, the tags stopped working, if you click on the tag (all blogs contain some tags) then the 404 gets returned.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pffft. I'll look into that...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jasondlee did you manage to take a look so maybe we can get this merged?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking now...

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Skyllarr @darranl Give it a go now.

Expand All @@ -18,7 +21,9 @@
<a href="{post.data.external_link ?: post.url}">{post.title}</a>
</div>
<div class="grid__item width-8-12 width-12-12-m byline-wrapper">
{#if author.containsKey('emailhash')}
<img class="headshot" src="https://www.gravatar.com/avatar/{author.emailhash}">
{/if}
<p class="byline">By <a href="{author.bio}">{author.name}</a>
<br/>
<small>{post.date.format('LLLL dd, YYYY')} |
Expand All @@ -31,17 +36,19 @@
</p>
</div>
<div class="grid__item width-4-12 width-12-12-m">
{#include partials/share-page.html title=post.title url=post.data.link or post.url /}
{#include partials/share-page.html title=post.title url=post.data.link.or(post.url) /}
</div>
<div class="grid__item width-12-12">
{#if post.data.synopsis}
<p>{post.data.synopsis.stripHtml()}</p>
{/if}
</div>
<div class="grid__item width-12-12">
<a href="{post.data.external_link ?: post.url}">
{#if post.data.external_link contains 'youtube' %}Watch Video &rsaquo;{#else}Read More &rsaquo;{/if}
{#let url=post.data.external_link.or(post.url.path)}
<a href="{url}">
{#if url.contains('youtube')}Watch Video &rsaquo;{#else}Read More &rsaquo;{/if}
</a>
{/let}
</div>
</div>
{/let}
Expand Down
1 change: 0 additions & 1 deletion templates/partials/grid-icons.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@ <h3></h3>
{/if}
{/for}
</div>
{/let}
12 changes: 6 additions & 6 deletions templates/partials/share-page.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<div class="share-page">
<a class="share-linkedin" href="https://www.linkedin.com/shareArticle?mini=true&url={include.url}&title={include.title}" rel="nofollow" target="_blank" title="Share on LinkedIn">
<div class="share-page">
<a class="share-linkedin" href="https://www.linkedin.com/shareArticle?mini=true&url={url}&title={title}" rel="nofollow" target="_blank" title="Share on LinkedIn">
<i class="fab fa-linkedin"></i>
</a>
<a class="share-twitter" href="https://twitter.com/intent/tweet?text={include.title}&url={include.url}&via={site.twitter_username}&related={site.twitter_username}" rel="nofollow" target="_blank" title="Share on Twitter">
<a class="share-twitter" href="https://twitter.com/intent/tweet?text={title}&url={url}&via={page.data.twitter_username}&related={page.data.twitter_username}" rel="nofollow" target="_blank" title="Share on Twitter">
<i class="fab fa-twitter-square"></i>
</a>
<a class="share-facebook" href="https://facebook.com/sharer.php?u={include.url}" rel="nofollow" target="_blank" title="Share on Facebook">
<a class="share-facebook" href="https://facebook.com/sharer.php?u={url}" rel="nofollow" target="_blank" title="Share on Facebook">
<i class="fab fa-facebook-square"></i>
</a>
<a class="share-reddit" href="http://www.reddit.com/submit?url={include.url}" onclick="window.open(this.href, 'pop-up', 'left=20,top=20,width=900,height=500,toolbar=1,resizable=0'); return false;" title="Share on Reddit" >
<a class="share-reddit" href="http://www.reddit.com/submit?url={url}" onclick="window.open(this.href, 'pop-up', 'left=20,top=20,width=900,height=500,toolbar=1,resizable=0'); return false;" title="Share on Reddit" >
<i class="fab fa-reddit-square"></i>
</a>
<a class="share-email" href="mailto:?subject={include.title}&amp;body={include.title} {include.url}" title="Share via Email" >
<a class="share-email" href="mailto:?subject={title}&amp;body={title} {url}" title="Share via Email" >
<i class="fas fa-envelope-square"></i>
</a>
</div>