1.6.14 production release

.github/workflows/maven.yml

@@ -0,0 +1,39 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Java CI with Maven
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+
+    - name: Upload artifact as release asset
+      uses: AButler/[email protected]
+      with:
+        files: "target/*.war"
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+    # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
+    - name: Update dependency graph
+      uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6

README.md

@@ -1,4 +1,16 @@
-# Virtual Collection Registry [![Build Status](https://travis-ci.org/clarin-eric/VirtualCollectionRegistry.svg?branch=milestone-1.2)](https://travis-ci.org/clarin-eric/VirtualCollectionRegistry)
+# Virtual Collection Registry
+
+Environment:
+
+* Java 17+, jakarta EE
+
+Major dependencies and frameworks:
+
+* Wicket 10.x.x
+* Spring 6.x.x
+* Hibernate 5.x.x
+* Bootstrap 5.x.x
+
 
 Instances:
 
@@ -16,7 +28,7 @@ Information regarding development and deployment as well as licencing informatio
 
 #### Tomcat
 
-Apache tomcat 8+ is the prefered servlet container. The mysl jdbc driver
+Apache tomcat 10+ is the prefered servlet container. The mysl jdbc driver
 must be provided in the tomcat libs directory.
 
 ### MySQL

docker/backup.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker exec -ti vcr-local-dev_database_1 sh -c 'mysqldump --user=${MYSQL_USER} --password=${MYSQL_PASSWORD} ${MYSQL_DATABASE}' > vcr_1.6.0.sql

docker/db_console.sh

@@ -0,0 +1,2 @@
+#/bin/bash
+docker exec -ti vcr-local-dev_database_1 sh -c 'mysql --user=${MYSQL_USER} --password=${MYSQL_PASSWORD} ${MYSQL_DATABASE}'

docker/vcr-local-dev/docker-compose.yml

@@ -29,6 +29,8 @@ services:
     volumes:
       - maria_db_data:/var/lib/mysql
       - ./database:/docker-entrypoint-initdb.d
+    ports:
+      - 3306:3306
 
 volumes:
   maria_db_data:

docker/vcr_1.6.0.sql

@@ -0,0 +1,272 @@
+-- MySQL dump 10.16  Distrib 10.3.10-MariaDB, for debian-linux-gnu (aarch64)
+--
+-- Host: localhost    Database: vcr
+-- ------------------------------------------------------
+-- Server version	10.3.10-MariaDB-1:10.3.10+maria~bionic
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `api_key`
+--
+
+DROP TABLE IF EXISTS `api_key`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `api_key` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `user_id` bigint(20) NOT NULL,
+  `value` varchar(255) NOT NULL,
+  `created_at` datetime NOT NULL,
+  `last_used_at` datetime DEFAULT NULL,
+  `revoked_at` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `api_key`
+--
+
+LOCK TABLES `api_key` WRITE;
+/*!40000 ALTER TABLE `api_key` DISABLE KEYS */;
+/*!40000 ALTER TABLE `api_key` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `config`
+--
+
+DROP TABLE IF EXISTS `config`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `config` (
+  `key` varchar(255) NOT NULL,
+  `value` varchar(255) NOT NULL,
+  PRIMARY KEY (`key`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `config`
+--
+
+LOCK TABLES `config` WRITE;
+/*!40000 ALTER TABLE `config` DISABLE KEYS */;
+INSERT INTO `config` VALUES ('db_version','1.6.0'),('db_version_check','1.5.0');
+/*!40000 ALTER TABLE `config` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `creator`
+--
+
+DROP TABLE IF EXISTS `creator`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `creator` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `address` varchar(255) DEFAULT NULL,
+  `email` varchar(255) DEFAULT NULL,
+  `organisation` varchar(255) DEFAULT NULL,
+  `family_name` varchar(255) DEFAULT NULL,
+  `role` varchar(255) DEFAULT NULL,
+  `telephone` varchar(255) DEFAULT NULL,
+  `website` varchar(255) DEFAULT NULL,
+  `vc_id` bigint(20) NOT NULL,
+  `display_order` bigint(20) DEFAULT NULL,
+  `given_name` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `FK3D4E802C8E3FCDB` (`vc_id`),
+  CONSTRAINT `FK3D4E802C8E3FCDB` FOREIGN KEY (`vc_id`) REFERENCES `virtualcollection` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=131 DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `creator`
+--
+
+LOCK TABLES `creator` WRITE;
+/*!40000 ALTER TABLE `creator` DISABLE KEYS */;
+/*!40000 ALTER TABLE `creator` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `keyword`
+--
+
+DROP TABLE IF EXISTS `keyword`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `keyword` (
+  `vc_id` bigint(20) NOT NULL,
+  `keywords` varchar(255) DEFAULT NULL,
+  KEY `FKCF751DE98E3FCDB` (`vc_id`),
+  CONSTRAINT `FKCF751DE98E3FCDB` FOREIGN KEY (`vc_id`) REFERENCES `virtualcollection` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `keyword`
+--
+
+LOCK TABLES `keyword` WRITE;
+/*!40000 ALTER TABLE `keyword` DISABLE KEYS */;
+/*!40000 ALTER TABLE `keyword` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `pid`
+--
+
+DROP TABLE IF EXISTS `pid`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `pid` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `identifier` varchar(255) NOT NULL,
+  `type` int(11) DEFAULT NULL,
+  `is_primary` tinyint(1) DEFAULT NULL,
+  `vc_id` bigint(20) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `identifier` (`identifier`),
+  KEY `FK1B18B8E3FCDB` (`vc_id`),
+  CONSTRAINT `FK1B18B8E3FCDB` FOREIGN KEY (`vc_id`) REFERENCES `virtualcollection` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=46 DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `pid`
+--
+
+LOCK TABLES `pid` WRITE;
+/*!40000 ALTER TABLE `pid` DISABLE KEYS */;
+/*!40000 ALTER TABLE `pid` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `resource`
+--
+
+DROP TABLE IF EXISTS `resource`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `resource` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `description` longtext DEFAULT NULL,
+  `label` varchar(255) DEFAULT NULL,
+  `ref` varchar(255) NOT NULL,
+  `type` int(11) NOT NULL,
+  `vc_id` bigint(20) NOT NULL,
+  `resources_ORDER` int(11) NOT NULL,
+  `checked` varchar(255) DEFAULT NULL,
+  `mimetype` varchar(255) DEFAULT NULL,
+  `display_order` bigint(20) DEFAULT NULL,
+  `origin` varchar(255) DEFAULT NULL,
+  `original_query` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `FKEBABC40E8E3FCDB` (`vc_id`),
+  CONSTRAINT `FKEBABC40E8E3FCDB` FOREIGN KEY (`vc_id`) REFERENCES `virtualcollection` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=488 DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `resource`
+--
+
+LOCK TABLES `resource` WRITE;
+/*!40000 ALTER TABLE `resource` DISABLE KEYS */;
+/*!40000 ALTER TABLE `resource` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `vcr_user`
+--
+
+DROP TABLE IF EXISTS `vcr_user`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `vcr_user` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `display_name` varchar(255) DEFAULT NULL,
+  `name` varchar(255) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=28 DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `vcr_user`
+--
+
+LOCK TABLES `vcr_user` WRITE;
+/*!40000 ALTER TABLE `vcr_user` DISABLE KEYS */;
+/*!40000 ALTER TABLE `vcr_user` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `virtualcollection`
+--
+
+DROP TABLE IF EXISTS `virtualcollection`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `virtualcollection` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `creation_date` date DEFAULT NULL,
+  `created` datetime NOT NULL,
+  `modified` datetime NOT NULL,
+  `description` longtext DEFAULT NULL,
+  `generatedby_description` longtext DEFAULT NULL,
+  `generatedby_query_profile` varchar(255) DEFAULT NULL,
+  `generatedby_query_value` longtext DEFAULT NULL,
+  `generatedby_uri` varchar(255) DEFAULT NULL,
+  `name` varchar(255) NOT NULL,
+  `purpose` int(11) DEFAULT NULL,
+  `reproducibility` int(11) DEFAULT NULL,
+  `reproducibility_notice` longtext DEFAULT NULL,
+  `state` int(11) NOT NULL,
+  `type` int(11) NOT NULL,
+  `owner_id` bigint(20) NOT NULL,
+  `problem` int(11) DEFAULT NULL,
+  `problem_details` text DEFAULT NULL,
+  `origin` varchar(255) DEFAULT NULL,
+  `published` datetime DEFAULT NULL,
+  `parent` bigint(20) DEFAULT NULL,
+  `child` bigint(20) DEFAULT NULL,
+  `latest` bigint(20) DEFAULT NULL,
+  `forked_from` bigint(20) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `FK6437BBE9C7855CED` (`owner_id`),
+  CONSTRAINT `FK6437BBE9C7855CED` FOREIGN KEY (`owner_id`) REFERENCES `vcr_user` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1122 DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `virtualcollection`
+--
+
+LOCK TABLES `virtualcollection` WRITE;
+/*!40000 ALTER TABLE `virtualcollection` DISABLE KEYS */;
+/*!40000 ALTER TABLE `virtualcollection` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2024-09-05 10:51:07