diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index d0b1d93..dcb0974 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -7,16 +7,18 @@ on: jobs: build: name: Checkout and Build - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: + fail-fast: false matrix: - java-version: [11, 16, 17] + java-version: [11, 17] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: JDK setup - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 + continue-on-error: true with: java-version: ${{ matrix.java-version }} distribution: 'temurin' diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b1e33dd..0000000 --- a/.travis.yml +++ /dev/null @@ -1,11 +0,0 @@ -language: java -sudo: required -dist: bionic - -jdk: - - openjdk11 - - openjdk17 - -install: - - cd org.verapdf.releng - - mvn clean install -DskipTests diff --git a/README.md b/README.md index 23142ce..4730ab7 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This project provides domain specific language support for the [veraPDF PDF/A an CI Status --------- -[![Build Status](https://jenkins.openpreservation.org/job/veraPDF/job/1.26/job/model-syntax/badge/icon)](https://jenkins.openpreservation.org/job/veraPDF/job/1.26/job/model-syntax/ "OPF Jenkins") +[![Build Status](https://jenkins.openpreservation.org/job/veraPDF/job/1.28/job/model-syntax/badge/icon)](https://jenkins.openpreservation.org/job/veraPDF/job/1.28/job/model-syntax/ "OPF Jenkins") [![Maven Central](https://img.shields.io/maven-central/v/org.verapdf/org.verapdf.svg)](https://repo1.maven.org/maven2/org/verapdf/org.verapdf/ "Maven central") [![Codacy Badge](https://app.codacy.com/project/badge/Grade/a03dbd92b1724cd0a7636ea0245adc16)](https://app.codacy.com/gh/veraPDF/veraPDF-model-syntax/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade "Codacy coverage") @@ -20,7 +20,7 @@ Pre-requisites In order to make use of the DSL support you'll require - * Java 9 - 17, 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 or 17, 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). * The [Eclipse IDE](https://eclipse.org/) with the [Xtext plug-in](https://eclipse.org/Xtext/download.html). If you haven't installed Eclipse then we recommend downloading the [Xtext Eclipse distribution](https://eclipse.org/Xtext/download.html). Installation of DSL Support in Eclipse 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/org.verapdf.releng/pom.xml b/org.verapdf.releng/pom.xml index b17e645..bb01fdd 100644 --- a/org.verapdf.releng/pom.xml +++ b/org.verapdf.releng/pom.xml @@ -1,4 +1,26 @@ + 4.0.0 @@ -6,12 +28,12 @@ verapdf-parent org.verapdf - 1.26.2 + 1.28.1 org.verapdf parent - 1.26.0 + 1.28.0 pom veraPDF Model Syntax diff --git a/org.verapdf.sdk/build.properties b/org.verapdf.sdk/build.properties index 43c54c1..b65207e 100644 --- a/org.verapdf.sdk/build.properties +++ b/org.verapdf.sdk/build.properties @@ -1 +1,22 @@ +# +# This file is part of VERA PDF Feature, a module of the veraPDF project. +# Copyright (c) 2015-2025, veraPDF Consortium +# All rights reserved. +# +# VERA PDF Feature 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 VERA PDF Feature 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 +# VERA PDF Feature 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/. +# + bin.includes =feature.xml diff --git a/org.verapdf.sdk/feature.xml b/org.verapdf.sdk/feature.xml index 6665954..16bc029 100644 --- a/org.verapdf.sdk/feature.xml +++ b/org.verapdf.sdk/feature.xml @@ -1,7 +1,29 @@ + + version="1.28.0"> + 4.0.0 @@ -7,7 +29,7 @@ ../org.verapdf.releng/pom.xml org.verapdf parent - 1.26.0 + 1.28.0 org.verapdf.sdk diff --git a/org.verapdf.tests/META-INF/MANIFEST.MF b/org.verapdf.tests/META-INF/MANIFEST.MF index 730e8d1..2274ece 100644 --- a/org.verapdf.tests/META-INF/MANIFEST.MF +++ b/org.verapdf.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.verapdf.tests Bundle-Vendor: veraPDF Consortium -Bundle-Version: 1.26.0 +Bundle-Version: 1.28.0 Bundle-SymbolicName: org.verapdf.tests; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.verapdf, diff --git a/org.verapdf.tests/build.properties b/org.verapdf.tests/build.properties index 874c0b8..76e8843 100644 --- a/org.verapdf.tests/build.properties +++ b/org.verapdf.tests/build.properties @@ -1,3 +1,24 @@ +# +# This file is part of VERA PDF Tests, a module of the veraPDF project. +# Copyright (c) 2015-2025, veraPDF Consortium +# All rights reserved. +# +# VERA PDF Tests 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 VERA PDF Tests 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 +# VERA PDF Tests 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/. +# + source.. = src/,\ src-gen/,\ xtend-gen/ diff --git a/org.verapdf.tests/pom.xml b/org.verapdf.tests/pom.xml index 2f9c40e..80b6063 100644 --- a/org.verapdf.tests/pom.xml +++ b/org.verapdf.tests/pom.xml @@ -1,4 +1,26 @@ + 4.0.0 @@ -7,7 +29,7 @@ ../org.verapdf.releng/pom.xml org.verapdf parent - 1.26.0 + 1.28.0 org.verapdf.tests diff --git a/org.verapdf.ui/META-INF/MANIFEST.MF b/org.verapdf.ui/META-INF/MANIFEST.MF index 3478261..66e3548 100644 --- a/org.verapdf.ui/META-INF/MANIFEST.MF +++ b/org.verapdf.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.verapdf.ui Bundle-Vendor: veraPDF Consortium -Bundle-Version: 1.26.0 +Bundle-Version: 1.28.0 Bundle-SymbolicName: org.verapdf.ui; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.verapdf;visibility:=reexport, diff --git a/org.verapdf.ui/build.properties b/org.verapdf.ui/build.properties index 31255ed..86c3897 100644 --- a/org.verapdf.ui/build.properties +++ b/org.verapdf.ui/build.properties @@ -1,3 +1,24 @@ +# +# This file is part of VERA PDF UI, a module of the veraPDF project. +# Copyright (c) 2015-2025, veraPDF Consortium +# All rights reserved. +# +# VERA PDF UI 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 VERA PDF UI 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 +# VERA PDF UI 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/. +# + source.. = src/,\ src-gen/,\ xtend-gen/ diff --git a/org.verapdf.ui/plugin.xml b/org.verapdf.ui/plugin.xml index 41c612d..699a252 100644 --- a/org.verapdf.ui/plugin.xml +++ b/org.verapdf.ui/plugin.xml @@ -1,4 +1,26 @@ + diff --git a/org.verapdf.ui/pom.xml b/org.verapdf.ui/pom.xml index ec8219c..2fc69a3 100644 --- a/org.verapdf.ui/pom.xml +++ b/org.verapdf.ui/pom.xml @@ -1,4 +1,26 @@ + 4.0.0 @@ -7,7 +29,7 @@ ../org.verapdf.releng/pom.xml org.verapdf parent - 1.26.0 + 1.28.0 org.verapdf.ui diff --git a/org.verapdf.ui/src/org/verapdf/ui/ModelUiModule.java b/org.verapdf.ui/src/org/verapdf/ui/ModelUiModule.java index 4428cb3..b48e4ef 100644 --- a/org.verapdf.ui/src/org/verapdf/ui/ModelUiModule.java +++ b/org.verapdf.ui/src/org/verapdf/ui/ModelUiModule.java @@ -1,3 +1,23 @@ +/** + * This file is part of VERA PDF UI, a module of the veraPDF project. + * Copyright (c) 2015-2025, veraPDF Consortium + * All rights reserved. + * + * VERA PDF UI 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 VERA PDF UI 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 + * VERA PDF UI 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/. + */ /* * generated by Xtext */ diff --git a/org.verapdf.ui/src/org/verapdf/ui/syntaxcoloring/AntlrTokenToAttributeIdMapper.java b/org.verapdf.ui/src/org/verapdf/ui/syntaxcoloring/AntlrTokenToAttributeIdMapper.java index d14225f..3892e4b 100644 --- a/org.verapdf.ui/src/org/verapdf/ui/syntaxcoloring/AntlrTokenToAttributeIdMapper.java +++ b/org.verapdf.ui/src/org/verapdf/ui/syntaxcoloring/AntlrTokenToAttributeIdMapper.java @@ -1,3 +1,23 @@ +/** + * This file is part of VERA PDF UI, a module of the veraPDF project. + * Copyright (c) 2015-2025, veraPDF Consortium + * All rights reserved. + * + * VERA PDF UI 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 VERA PDF UI 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 + * VERA PDF UI 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/. + */ package org.verapdf.ui.syntaxcoloring; import org.eclipse.xtext.ui.editor.syntaxcoloring.DefaultAntlrTokenToAttributeIdMapper; diff --git a/org.verapdf.updatesite/pom.xml b/org.verapdf.updatesite/pom.xml index 1c72423..f7ac26f 100644 --- a/org.verapdf.updatesite/pom.xml +++ b/org.verapdf.updatesite/pom.xml @@ -8,7 +8,7 @@ ../org.verapdf.releng/pom.xml org.verapdf parent - 1.26.0 + 1.28.0 org.verapdf.updatesite diff --git a/org.verapdf/META-INF/MANIFEST.MF b/org.verapdf/META-INF/MANIFEST.MF index ef8c90e..a698716 100644 --- a/org.verapdf/META-INF/MANIFEST.MF +++ b/org.verapdf/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.verapdf Bundle-Vendor: veraPDF Consortium -Bundle-Version: 1.26.0 +Bundle-Version: 1.28.0 Bundle-SymbolicName: org.verapdf; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext;bundle-version="[2.26.0,2.27.0)";visibility:=reexport, diff --git a/org.verapdf/build.properties b/org.verapdf/build.properties index 07a4268..f4da34a 100644 --- a/org.verapdf/build.properties +++ b/org.verapdf/build.properties @@ -1,3 +1,24 @@ +# +# This file is part of veraPDF Validation Model DSL, a module of the veraPDF project. +# Copyright (c) 2015-2025, veraPDF Consortium +# All rights reserved. +# +# veraPDF Validation Model DSL 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 DSL 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 DSL 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/. +# + source.. = src/,\ src-gen/,\ xtend-gen/ diff --git a/org.verapdf/plugin.xml b/org.verapdf/plugin.xml index 64a5e8b..f6bb648 100644 --- a/org.verapdf/plugin.xml +++ b/org.verapdf/plugin.xml @@ -1,4 +1,26 @@ + diff --git a/org.verapdf/pom.xml b/org.verapdf/pom.xml index d90d831..526ec0f 100644 --- a/org.verapdf/pom.xml +++ b/org.verapdf/pom.xml @@ -1,3 +1,25 @@ + 4.0.0 @@ -6,7 +28,7 @@ ../org.verapdf.releng/pom.xml org.verapdf parent - 1.26.0 + 1.28.0 org.verapdf diff --git a/org.verapdf/src/org/verapdf/Model.xtext b/org.verapdf/src/org/verapdf/Model.xtext index 756dbbf..3b84372 100644 --- a/org.verapdf/src/org/verapdf/Model.xtext +++ b/org.verapdf/src/org/verapdf/Model.xtext @@ -21,7 +21,7 @@ Attribute: Property: (comment += COMMENT)* - 'property' name = ID ':' type = ('String' | 'Integer' | 'Decimal' | 'Boolean')';' + 'property' name = ID ':' type = ('String' | 'Integer' | 'Decimal' | 'Boolean' | 'Set' | 'List' | 'List>')';' ; Link: diff --git a/org.verapdf/src/org/verapdf/ModelRuntimeModule.java b/org.verapdf/src/org/verapdf/ModelRuntimeModule.java index 9f42631..6c1c829 100644 --- a/org.verapdf/src/org/verapdf/ModelRuntimeModule.java +++ b/org.verapdf/src/org/verapdf/ModelRuntimeModule.java @@ -1,3 +1,23 @@ +/** + * This file is part of veraPDF Validation Model DSL, a module of the veraPDF project. + * Copyright (c) 2015-2025, veraPDF Consortium + * All rights reserved. + * + * veraPDF Validation Model DSL 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 DSL 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 DSL 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/. + */ /* * generated by Xtext */ diff --git a/org.verapdf/src/org/verapdf/ModelStandaloneSetup.java b/org.verapdf/src/org/verapdf/ModelStandaloneSetup.java index b10fb75..8e81ae0 100644 --- a/org.verapdf/src/org/verapdf/ModelStandaloneSetup.java +++ b/org.verapdf/src/org/verapdf/ModelStandaloneSetup.java @@ -1,3 +1,23 @@ +/** + * This file is part of veraPDF Validation Model DSL, a module of the veraPDF project. + * Copyright (c) 2015-2025, veraPDF Consortium + * All rights reserved. + * + * veraPDF Validation Model DSL 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 DSL 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 DSL 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/. + */ /* * generated by Xtext */ diff --git a/org.verapdf/src/org/verapdf/generator/ModelGenerator.xtend b/org.verapdf/src/org/verapdf/generator/ModelGenerator.xtend index d4a7537..2d7d8a4 100644 --- a/org.verapdf/src/org/verapdf/generator/ModelGenerator.xtend +++ b/org.verapdf/src/org/verapdf/generator/ModelGenerator.xtend @@ -121,6 +121,9 @@ class ModelGenerator implements IGenerator { case "Decimal" : return "Double" case "String" : return "String" case "Boolean" : return "Boolean" + case "Set" : return "Set" + case "List" : return "List" + case "List>" : return "List>" } }