[pull] master from jbake-org:master

.github/workflows/build.yml

@@ -0,0 +1,51 @@
+name: Build
+
+on:
+    pull_request:
+
+jobs:
+    build:
+        name: Build
+        strategy:
+            fail-fast: false
+            matrix:
+                os: [ ubuntu-latest, macos-latest, windows-latest ]
+        runs-on: ${{ matrix.os }}
+
+        steps:
+            - uses: actions/checkout@v2
+
+            - name: Set up Java
+              uses: actions/setup-java@v2
+              with:
+                  java-version: 11
+                  distribution: 'zulu'
+
+            - uses: actions/cache@v2
+              with:
+                  path: ~/.gradle/caches
+                  key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle.properties') }}
+                  restore-keys: |
+                      ${{ runner.os }}-gradle-
+            - uses: actions/cache@v2
+              with:
+                  path: ~/.gradle/wrapper
+                  key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradlew') }}
+                  restore-keys: |
+                      ${{ runner.os }}-gradlew-
+            - name: Build-win
+              if: runner.os == 'Windows'
+              shell: cmd
+              run: gradlew.bat -Dfile.encoding=UTF-8 build -S
+            - name: Build-nix
+              if: runner.os != 'Windows'
+              run: ./gradlew build -S
+
+            - name: Upload Reports
+              uses: actions/upload-artifact@v1
+              if: failure()
+              with:
+                  name: reports-${{ runner.os }}
+                  path: |
+                      jbake-core/build
+                      jbake-dist/build

.github/workflows/early-access.yml

@@ -0,0 +1,57 @@
+name: EarlyAccess
+
+on:
+    push:
+        branches: [ master ]
+
+jobs:
+    earlyaccess:
+        name: EarlyAccess
+        if: github.repository == 'jbake-org/jbake'
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+              with:
+                  fetch-depth: 0
+
+            - name: Set up Java
+              uses: actions/setup-java@v2
+              with:
+                  java-version: 11
+                  distribution: 'zulu'
+
+            - uses: actions/cache@v2
+              with:
+                  path: ~/.gradle/caches
+                  key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle.properties') }}
+                  restore-keys: |
+                      ${{ runner.os }}-gradle-
+            - uses: actions/cache@v2
+              with:
+                  path: ~/.gradle/wrapper
+                  key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradlew') }}
+                  restore-keys: |
+                      ${{ runner.os }}-gradlew-
+            - name: Build
+              run: ./gradlew build -S
+
+            - name: Release
+              run: ./gradlew jreleaserRelease -S
+              env:
+                  JRELEASER_GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+                  JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+                  JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
+                  JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
+                  JRELEASER_SDKMAN_CONSUMER_KEY: ${{ secrets.SDKMAN_CONSUMER_KEY }}
+                  JRELEASER_SDKMAN_CONSUMER_TOKEN: ${{ secrets.SDKMAN_CONSUMER_TOKEN }}
+
+            - name: JReleaser output
+              if: always()
+              uses: actions/upload-artifact@v2
+              with:
+                  name: jreleaser-logs
+                  path: |
+                      jbake-dist/build/jreleaser/trace.log
+                      jbake-dist/build/jreleaser/output.properties

.travis.yml

@@ -24,10 +24,12 @@ jobs:
   - jdk: openjdk11
 
   - os: osx
-    osx_image: xcode13.2
+    osx_image: xcode13.2 # defaults to openjdk17
 
-  - jdk: openjdk11
-    os: osx
+# below config fails
+#  - os: osx
+#    osx_image: xcode9.4
+#    jdk: openjdk11
 
 #  - stage: Quality Check
 #    name: sonarqube

Dockerfile

@@ -14,7 +14,7 @@ RUN set -o errexit -o nounset \
     && cp -r jbake-dist/build/install/jbake/* $JBAKE_HOME \
     && rm -r ~/.gradle /usr/src/jbake
 
-FROM adoptopenjdk/openjdk11:alpine-jre
+FROM eclipse-temurin:11-jre-alpine
 
 ENV JBAKE_USER=jbake
 ENV JBAKE_HOME=/opt/jbake

build.gradle

@@ -4,6 +4,7 @@ plugins {
     id "io.github.gradle-nexus.publish-plugin"  version "$nexusPublishPluginVersion"
     id 'com.github.ben-manes.versions'          version "$versionsPluginVersion"
     id 'org.ajoberstar.grgit'                   version "$grgitVersion"
+    id 'org.jreleaser'                          version "$jreleaserVersion" apply false
     id "eclipse"
     id "idea"
 }

gradle.properties

@@ -1,13 +1,13 @@
 group                       = org.jbake
-version                     = 2.7.0-rc.5
+version                     = 2.7.0-SNAPSHOT
 description                 = JBake is a Java based open source static site/blog generator for developers.
 
 website                     = http://jbake.org
 issues                      = https://github.com/jbake-org/jbake/issues
 vcs                         = https://github.com/jbake-org/jbake/
 
 # runtime dependencies
-asciidoctorjVersion         = 2.5.2
+asciidoctorjVersion         = 2.5.7
 asciidoctorjDiagramVersion  = 2.2.1
 args4jVersion               = 2.33
 commonsIoVersion            = 2.11.0
@@ -24,7 +24,7 @@ jade4jVersion               = 1.3.2
 jsoupVersion                = 1.14.3
 jgitVersion                 = 6.0.0.202111291000-r
 logbackVersion              = 1.2.10
-orientDbVersion             = 3.0.41
+orientDbVersion             = 3.1.20
 pebbleVersion               = 3.1.5
 slf4jVersion                = 1.7.32
 snakeYamlVersion            = 1.30
@@ -45,9 +45,9 @@ jacocoVersion               = 0.8.7
 grgitVersion                = 4.1.1
 nexusPublishPluginVersion   = 1.1.0
 versionsPluginVersion       = 0.40.0
-sdkmanVersion               = 3.0.0
-githubReleaseVersion        = 2.2.12
 optionalBaseVersion         = 7.0.0
+jreleaserVersion            = 0.10.0
+mavenPluginDevVersion       = 0.3.1
 
 # jbake-maven-plugin dependencies
 mavenVersion                = 3.8.4

gradle/release.gradle

@@ -0,0 +1,60 @@
+apply plugin: 'org.jreleaser'
+
+// cannot reference project. properties inside jreleaser config block
+// as that collides with the "project" DSL element of the config extension
+ext.releaseIsDryrun = (project.rootProject.findProperty('dryrun') ?: false).toBoolean()
+ext.projectWebsite = project.website
+
+jreleaser {
+    dryrun = releaseIsDryrun
+    gitRootSearch = true
+
+    project {
+        website = projectWebsite
+        authors = ['Jonathan Bullock']
+        license = 'MIT'
+        extraProperties.put('inceptionYear', '2012')
+    }
+
+    release {
+        github {
+            overwrite = true
+            branch = 'master'
+            changelog {
+                formatted = 'always'
+                format = '- {{commitShortHash}} {{commitTitle}}'
+                contributors {
+                    format = '- {{contributorName}}{{#contributorUsernameAsLink}} ({{.}}){{/contributorUsernameAsLink}}'
+                }
+                hide {
+                    contributors = ['GitHub']
+                }
+            }
+        }
+    }
+
+    signing {
+        active = 'always'
+        armored = true
+    }
+
+    checksum {
+        individual = true
+    }
+
+    distributions {
+        jbake {
+            sdkman {
+                active = 'release'
+            }
+            artifact {
+                path = 'build/distributions/{{distributionName}}-{{projectVersion}}-bin.zip'
+                transform = '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}-bin.zip'
+            }
+            artifact {
+                path = 'build/distributions/{{distributionName}}-{{projectVersion}}.tar'
+                transform = '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.tar'
+            }
+        }
+    }
+}

gradle/signing.gradle

@@ -11,10 +11,5 @@ if ( !project.hasProperty('skipSigning') ) {
                 sign publishing.publications.mavenJava
             }
         }
-        else {
-            signing {
-                sign configurations.archives
-            }
-        }
     }
 }

jbake-core/build.gradle

@@ -58,11 +58,9 @@ dependencies {
 }
 
 processResources {
-    from("src/main/resources") {
-        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-        include 'default.properties'
+    filesMatching("default.properties") {
         expand jbakeVersion: project.version,
-               timestamp: grgit.head().dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss'['VV']'")),
-               gitHash: grgit.head().abbreviatedId
+            timestamp: grgit.head().dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss'['VV']'")),
+            gitHash: grgit.head().abbreviatedId
     }
 }

jbake-core/src/main/java/org/jbake/app/ContentStore.java

@@ -32,10 +32,8 @@
 import com.orientechnologies.orient.core.metadata.schema.OClass;
 import com.orientechnologies.orient.core.metadata.schema.OSchema;
 import com.orientechnologies.orient.core.metadata.schema.OType;
-import com.orientechnologies.orient.core.record.impl.ODocument;
+import com.orientechnologies.orient.core.record.OElement;
 import com.orientechnologies.orient.core.sql.executor.OResultSet;
-import com.orientechnologies.orient.core.sql.query.OSQLSynchQuery;
-import org.jbake.launcher.SystemExit;
 import org.jbake.model.DocumentModel;
 import org.jbake.model.DocumentTypes;
 import org.jbake.model.ModelAttributes;
@@ -408,9 +406,9 @@ public boolean isActive() {
     }
 
     public void addDocument(DocumentModel document) {
-        ODocument doc = new ODocument(Schema.DOCUMENTS);
-        doc.fromMap(document);
-        doc.save();
+        OElement element = db.newElement(Schema.DOCUMENTS);
+        document.forEach((k, v) -> element.setProperty(k, v, OType.ANY));
+        element.save();
     }
 
     protected abstract class Schema {

jbake-core/src/main/java/org/jbake/app/DBUtil.java

@@ -6,6 +6,8 @@
 import org.jbake.app.configuration.JBakeConfiguration;
 import org.jbake.model.DocumentModel;
 
+import java.util.ArrayList;
+
 public class DBUtil {
     private static ContentStore contentStore;
 
@@ -56,6 +58,9 @@ public static String[] toStringArray(Object entry) {
         } else if (entry instanceof OTrackedList) {
             OTrackedList<String> list = (OTrackedList<String>) entry;
             return list.toArray(new String[list.size()]);
+        } else if (entry instanceof ArrayList) {
+            ArrayList<String> list = (ArrayList<String>) entry;
+            return list.toArray(new String[list.size()]);
         }
         return new String[0];
     }