Merge pull request #24 from evolvedbinary/fix/license

Fix/license
BCDH · Nov 20, 2023 · 61299e5 · 61299e5
2 parents 82081f7 + 5f802ef
commit 61299e5
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,14 +1,24 @@
 name: Build
 on: [push, pull_request]
+
 jobs:
   build:
-    runs-on: macos-latest
+    name: Build and Test
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        jdk: [8,11,17]
+    runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 8
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
           distribution: 'temurin'
-      - name: Build with Maven
-        run: mvn clean test
+          java-version: ${{ matrix.jdk }}
+      - name: Compile
+        run: mvn clean compile
+      - name: Test
+        run: mvn verify
diff --git a/pom.xml b/pom.xml
@@ -234,6 +234,7 @@
                         <organization>${project.organization.name}</organization>
                     </properties>
                     <excludes>
+                        <exclude>.github/**</exclude>
                         <exclude>**/pom.xml</exclude>
                         <exclude>**/README.md</exclude>
                         <exclude>**/LICENSE</exclude>

diff --git a/src/main/java/org/humanistika/oxygen/tei/completer/GUI/newSuggestionForm.form b/src/main/java/org/humanistika/oxygen/tei/completer/GUI/newSuggestionForm.form
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-
+<!--
+    TEI-Completer UI form
+    @author: Adam Retter
+    @version: 1.0
+    14 Nov 2023
+-->
 <Form version="1.5" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
   <Properties>
     <Property name="defaultCloseOperation" type="int" value="2"/>

diff --git a/src/main/java/org/humanistika/oxygen/tei/completer/GUI/newSuggestionForm.java b/src/main/java/org/humanistika/oxygen/tei/completer/GUI/newSuggestionForm.java
@@ -1,15 +1,30 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/GUIForms/JDialog.java to edit this template
+/**
+ * TEI Completer
+ * An Oxygen XML Editor plugin for customizable attribute and value completion for TEI P5 documents
+ * Copyright (C) 2016 Belgrade Center for Digital Humanities
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 package org.humanistika.oxygen.tei.completer.GUI;
 
 import org.humanistika.oxygen.tei.completer.SuggestedAutocomplete;
 import org.humanistika.oxygen.tei.completer.TeiCompleter;
 import org.humanistika.oxygen.tei.completer.configuration.beans.AutoComplete;
-import org.jetbrains.annotations.Nullable;
 import ro.sync.contentcompletion.xml.CIValue;
 
+import javax.annotation.Nullable;
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;

diff --git a/src/main/java/org/humanistika/oxygen/tei/completer/SuggestedAutocomplete.java b/src/main/java/org/humanistika/oxygen/tei/completer/SuggestedAutocomplete.java
@@ -1,9 +1,26 @@
+/**
+ * TEI Completer
+ * An Oxygen XML Editor plugin for customizable attribute and value completion for TEI P5 documents
+ * Copyright (C) 2016 Belgrade Center for Digital Humanities
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 package org.humanistika.oxygen.tei.completer;
 
-
-import org.jetbrains.annotations.Nullable;
-
 import java.util.List;
+import javax.annotation.Nullable;
 
 public class SuggestedAutocomplete {