diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index 0c38772..7354795 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -1,3 +1,24 @@ +# +# This file is part of veraPDF Validation Model API, a module of the veraPDF project. +# Copyright (c) 2015-2025, veraPDF Consortium +# All rights reserved. +# +# veraPDF Validation Model API is free software: you can redistribute it and/or modify +# it under the terms of either: +# +# The GNU General public license GPLv3+. +# You should have received a copy of the GNU General Public License +# along with veraPDF Validation Model API as the LICENSE.GPL file in the root of the source +# tree. If not, see http://www.gnu.org/licenses/ or +# https://www.gnu.org/licenses/gpl-3.0.en.html. +# +# The Mozilla Public License MPLv2+. +# You should have received a copy of the Mozilla Public License along with +# veraPDF Validation Model API as the LICENSE.MPL file in the root of the source tree. +# If a copy of the MPL was not distributed with this file, you can obtain one at +# http://mozilla.org/MPL/2.0/. +# + name: PR QA on: @@ -9,17 +30,17 @@ jobs: name: Checkout and Build runs-on: ubuntu-latest - continue-on-error: true - strategy: fail-fast: false matrix: - java-version: [ 11, 16, 17, 21 ] + java-version: [ 11, 17, 21 ] steps: - uses: actions/checkout@v4 - name: JDK setup uses: actions/setup-java@v4 + continue-on-error: true + with: java-version: ${{ matrix.java-version }} distribution: 'temurin' diff --git a/.github/workflows/update-arlington-workflow.yml b/.github/workflows/update-arlington-workflow.yml index d60400d..40f1507 100644 --- a/.github/workflows/update-arlington-workflow.yml +++ b/.github/workflows/update-arlington-workflow.yml @@ -1,3 +1,24 @@ +# +# This file is part of veraPDF Validation Model API, a module of the veraPDF project. +# Copyright (c) 2015-2025, veraPDF Consortium +# All rights reserved. +# +# veraPDF Validation Model API is free software: you can redistribute it and/or modify +# it under the terms of either: +# +# The GNU General public license GPLv3+. +# You should have received a copy of the GNU General Public License +# along with veraPDF Validation Model API as the LICENSE.GPL file in the root of the source +# tree. If not, see http://www.gnu.org/licenses/ or +# https://www.gnu.org/licenses/gpl-3.0.en.html. +# +# The Mozilla Public License MPLv2+. +# You should have received a copy of the Mozilla Public License along with +# veraPDF Validation Model API as the LICENSE.MPL file in the root of the source tree. +# If a copy of the MPL was not distributed with this file, you can obtain one at +# http://mozilla.org/MPL/2.0/. +# + name: Update arlington branch on: @@ -7,6 +28,7 @@ on: jobs: checkout-and-build: + if: github.repository == 'veraPDF/veraPDF-model' runs-on: ubuntu-latest continue-on-error: true @@ -14,7 +36,7 @@ jobs: strategy: fail-fast: false matrix: - java-version: [11, 16, 17, 21] + java-version: [11, 17, 21] steps: - name: Checkout code @@ -24,6 +46,8 @@ jobs: ref: integration - name: JDK setup uses: actions/setup-java@v4 + continue-on-error: true + with: java-version: ${{ matrix.java-version }} distribution: 'temurin' @@ -32,12 +56,12 @@ jobs: run: | git fetch origin arlington:arlington git checkout -b test-branch arlington - - name: Configure user nameF + - name: Configure user name run: | git config user.name "Git User" git config user.email "user@test.com" - name: Add commit to the test branch - run: git cherry-pick -m 1 ${{ github.sha }} + run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }} --empty=drop - name: Build project with Maven if: success() run: mvn --batch-mode --update-snapshots verify @@ -63,7 +87,7 @@ jobs: git config user.name "Git User" git config user.email "user@temp.com" - name: Add commit to new branch - run: git cherry-pick -m 1 ${{ github.sha }} + run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }} --empty=drop - name: Merge branch into arlington if: success() run: | @@ -79,6 +103,7 @@ jobs: needs: [checkout-and-build, merge] if: | always() && + github.repository == 'veraPDF/veraPDF-model' && (contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') || contains(needs.*.result, 'cancelled')) diff --git a/README.md b/README.md index e52c6fb..332c94c 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ veraPDF-model ============= The veraPDF Validation model described using a Domain Specific Language developed in [XText](https://eclipse.org/Xtext/). -[![Build Status](https://jenkins.openpreservation.org/job/veraPDF/job/1.26/job/model/badge/icon)](https://jenkins.openpreservation.org/job/veraPDF/job/1.26/job/model/ "OPF Jenkins") +[![Build Status](https://jenkins.openpreservation.org/job/veraPDF/job/1.28/job/model/badge/icon)](https://jenkins.openpreservation.org/job/veraPDF/job/1.28/job/model/ "OPF Jenkins") [![Maven Central](https://img.shields.io/maven-central/v/org.verapdf/pdf-model.svg)](https://repo1.maven.org/maven2/org/verapdf/pdf-model/ "Maven central") [![Codacy Badge](https://app.codacy.com/project/badge/Grade/0b6a3e7f350c47d4a1ea1c5b500bbf68)](https://app.codacy.com/gh/veraPDF/veraPDF-model/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade "Codacy grade") @@ -22,7 +22,7 @@ Pre-requisites -------------- In order to generate the model classes you'll need: - * Java 9 - 21, which can be downloaded [from Oracle](https://www.oracle.com/technetwork/java/javase/downloads/index.html), or for Linux users [OpenJDK](https://openjdk.java.net/install/index.html). + * Java 11, 17 or 21, which can be downloaded [from Oracle](https://www.oracle.com/technetwork/java/javase/downloads/index.html), or for Linux users [OpenJDK](https://openjdk.java.net/install/index.html). * [Maven v3+](https://maven.apache.org/) If you want to edit and regenerate the model you'll need: diff --git a/license/template/license.txt b/license/template/license.txt index 03f6d2b..4e2cdeb 100644 --- a/license/template/license.txt +++ b/license/template/license.txt @@ -1,5 +1,5 @@ This file is part of ${project.name}, a module of the veraPDF project. -Copyright (c) ${project.inceptionYear}, ${owner} <${email}> +Copyright (c) ${project.inceptionYear}-${current.year}, ${owner} <${email}> All rights reserved. ${project.name} is free software: you can redistribute it and/or modify diff --git a/pom.xml b/pom.xml index 5833ffd..95ba46d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@