This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git
The following commit(s) were added to refs/heads/main by this push:
new c02c92a re-enable jbake and meecrowave-doc generator
c02c92a is described below
commit c02c92a4014ad15f0a3ea0801f19a13fcbc400fd
Author: Mark Struberg <[email protected]>
AuthorDate: Thu May 7 13:46:13 2026 +0200
re-enable jbake and meecrowave-doc generator
---
integration-tests/pom.xml | 2 +-
meecrowave-doc/pom.xml | 25 +++++-------
.../main/java/org/apache/meecrowave/doc/JBake.java | 8 +---
.../java/org/apache/meecrowave/doc/PDFify.java | 44 +++++++++++-----------
.../doc/generator/OAuth2Configuration.java | 3 +-
pom.xml | 2 -
6 files changed, 37 insertions(+), 47 deletions(-)
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 0335c76..d1450f6 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>meecrowave</artifactId>
<groupId>org.apache.meecrowave</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/meecrowave-doc/pom.xml b/meecrowave-doc/pom.xml
index 0001da4..36f3c83 100644
--- a/meecrowave-doc/pom.xml
+++ b/meecrowave-doc/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>meecrowave</artifactId>
<groupId>org.apache.meecrowave</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -38,19 +38,19 @@
<jbake.pdf>true</jbake.pdf>
<jbake.updatedownloads>false</jbake.updatedownloads> <!-- grabs too much
things on the net to be true by default -->
<meecrowave.build.name>${project.groupId}.documentation</meecrowave.build.name>
- <groovy.version>4.0.20</groovy.version>
+ <groovy.version>4.0.32</groovy.version>
</properties>
<dependencies>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
- <version>9.2.13.0</version>
+ <version>9.4.14.0</version>
</dependency>
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj</artifactId>
- <version>2.2.0</version>
+ <version>2.5.13</version>
<exclusions>
<exclusion>
<groupId>org.jruby</groupId>
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj-pdf</artifactId>
- <version>1.5.0-alpha.16</version>
+ <version>2.3.23</version>
<exclusions>
<exclusion>
<groupId>org.jruby</groupId>
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>ziplock</artifactId>
- <version>7.0.4</version>
+ <version>10.1.5</version>
<exclusions>
<exclusion>
<groupId>org.apache.tomee</groupId>
@@ -119,7 +119,7 @@
</dependency>
<dependency>
<groupId>org.apache.meecrowave</groupId>
- <artifactId>meecrowave-oauth2</artifactId>
+ <artifactId>meecrowave-oauth2-minimal</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -130,23 +130,18 @@
<dependency>
<groupId>org.jbake</groupId>
<artifactId>jbake-core</artifactId>
- <version>2.7.0-rc.7</version>
+ <version>2.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
- <version>2.10.1</version>
+ <version>2.14.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.14.0</version>
- </dependency>
- <dependency>
- <groupId>com.orientechnologies</groupId>
- <artifactId>orientdb-core</artifactId>
- <version>3.1.16</version>
+ <version>3.20.0</version>
</dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
diff --git a/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/JBake.java
b/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/JBake.java
index f3343f7..779f1aa 100755
--- a/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/JBake.java
+++ b/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/JBake.java
@@ -58,7 +58,6 @@ import org.jbake.app.Oven;
import org.jbake.app.configuration.ConfigUtil;
import org.jbake.app.configuration.DefaultJBakeConfiguration;
-import com.orientechnologies.orient.core.Orient;
import org.jbake.app.configuration.JBakeConfigurationFactory;
public class JBake {
@@ -114,11 +113,10 @@ public class JBake {
final Runnable build = () -> {
System.out.println("Building Meecrowave website in " +
destination);
- final Orient orient = Orient.instance();
try {
final Oven oven = new Oven(new
JBakeConfigurationFactory().createDefaultJbakeConfiguration(source,
destination, new CompositeConfiguration() {{
final CompositeConfiguration config = new
CompositeConfiguration();
- config.addConfiguration(new MapConfiguration(new
HashMap<String, Object>() {{
+ config.addConfiguration(new MapConfiguration(new
HashMap<>() {{
put("asciidoctor.attributes", new ArrayList<String>()
{{
add("source-highlighter=highlightjs");
add("highlightjs-theme=idea");
@@ -141,9 +139,7 @@ public class JBake {
System.out.println(" > done :)");
} catch (final Exception e) {
- e.printStackTrace();
- } finally {
- orient.shutdown();
+ throw new RuntimeException(e);
}
};
diff --git a/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/PDFify.java
b/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/PDFify.java
index eb62a51..b50339c 100755
--- a/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/PDFify.java
+++ b/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/PDFify.java
@@ -17,7 +17,6 @@
package org.apache.meecrowave.doc;
import org.asciidoctor.Asciidoctor;
-import org.asciidoctor.AttributesBuilder;
import java.io.File;
import java.io.IOException;
@@ -26,12 +25,10 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes;
-import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import static org.asciidoctor.OptionsBuilder.options;
import static org.asciidoctor.SafeMode.UNSAFE;
public class PDFify {
@@ -49,26 +46,29 @@ public class PDFify {
final String fileName = file.getFileName().toString();
if (fileName.endsWith(".adoc")) {
pool.submit(() -> {
- final String path =
sourceBase.relativize(file).toString();
- final File target = new File(targetBase,
path.substring(0, path.length() - "adoc".length()) + "pdf");
- final File asFile = file.toFile();
- final Map<String, Object> attributes =
asciidoctor.readDocumentHeader(asFile).getAttributes();
- // if we generate the PDF link we need to create the
PDF excepted if it is expected to be manual
- if (attributes.containsKey("jbake-meecrowavepdf") &&
!attributes.containsKey("jbake-meecrowavepdf-manual")) {
- target.getParentFile().mkdirs();
- asciidoctor.convertFile(
- asFile,
- options()
- //.baseDir(asFile.getParentFile())
- .safe(UNSAFE)
- .backend("pdf")
-
.attributes(AttributesBuilder.attributes()
-
.attribute("source-highlighter", "coderay")
-
.attribute("context_rootpath", "http://openwebbeans.apache.org/meecrowave";))
- .toFile(target).get());
- System.out.println("Generated " + target);
+ try {
+ final String path =
sourceBase.relativize(file).toString();
+ final File target = new File(targetBase,
path.substring(0, path.length() - "adoc".length()) + "pdf");
+ final File asFile = file.toFile();
+ final String content = new
String(Files.readAllBytes(file));
+ final boolean needsPdf =
content.contains("jbake-meecrowavepdf") &&
!content.contains("jbake-meecrowavepdf-manual");
+ // if we generate the PDF link we need to create
the PDF excepted if it is expected to be manual
+ if (needsPdf) {
+ target.getParentFile().mkdirs();
+ final org.asciidoctor.Options options =
org.asciidoctor.Options.builder()
+ .safe(UNSAFE)
+ .backend("pdf")
+ .option("source-highlighter",
"coderay")
+ .option("context_rootpath",
"http://openwebbeans.apache.org/meecrowave";)
+ .toFile(target)
+ .build();
+ asciidoctor.convertFile(asFile, options);
+ System.out.println("Generated " + target);
+ }
+ } catch (final Exception e) {
+ throw new RuntimeException(e);
}
- });
+ });
}
return super.visitFile(file, attrs);
}
diff --git
a/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/OAuth2Configuration.java
b/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/OAuth2Configuration.java
index 004f60b..264a349 100644
---
a/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/OAuth2Configuration.java
+++
b/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/OAuth2Configuration.java
@@ -21,6 +21,7 @@ package org.apache.meecrowave.doc.generator;
import org.apache.meecrowave.oauth2.configuration.OAuth2Options;
import org.apache.meecrowave.runner.cli.CliOption;
+import java.lang.reflect.Field;
import java.util.Comparator;
import java.util.stream.Stream;
@@ -30,7 +31,7 @@ public class OAuth2Configuration extends BaseGenerator {
@Override
protected String generate() {
return super.tableConfig() + "|===\n|Name|Description\n" +
- Stream.of(OAuth2Options.class.getDeclaredFields())
+ Stream.of((Field[]) OAuth2Options.class.getDeclaredFields())
.filter(f -> f.isAnnotationPresent(CliOption.class))
.map(f -> f.getAnnotation(CliOption.class))
.sorted(Comparator.comparing(CliOption::name))
diff --git a/pom.xml b/pom.xml
index 11a3400..b6f9840 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,9 +107,7 @@
<module>meecrowave-junit</module>
<module>meecrowave-arquillian</module>
<module>meecrowave-jpa</module>
-<!-- seems jbake is broken on java17 onwards. at least on macos
<module>meecrowave-doc</module>
--->
<module>meecrowave-jta</module>
<!--X TODO re-enable
