Skip to content

Commit

Permalink
Merge pull request #1 from dbmdz/split-cleanup
Browse files Browse the repository at this point in the history
Split cleanup
  • Loading branch information
daforster authored Feb 22, 2024
2 parents 5044863 + 0745c86 commit 90f5941
Show file tree
Hide file tree
Showing 1,482 changed files with 2,543 additions and 2,538 deletions.
6 changes: 0 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,3 @@ updates:
schedule:
interval: daily
time: "04:00"
- directory: "/dc-cudami-editor"
open-pull-requests-limit: 25
package-ecosystem: npm
schedule:
interval: daily
time: "04:00"
16 changes: 4 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,14 @@ jobs:
env:
cache-name: cache-maven-artifacts
with:
key: cudami-cache-java-${{ matrix.java }}-${{ github.run_id }}
key: metasvc-cache-java-${{ matrix.java }}-${{ github.run_id }}
path: |
~/.m2/repository
**/target
- name: Check Java codestyle
run: mvn com.spotify.fmt:fmt-maven-plugin:check
- name: Set up Node.js
uses: actions/setup-node@v3
with:
check-latest: true
node-version: 12
- name: Check Javascript codestyle
run: npm install && npm run format-check
working-directory: dc-cudami-editor
- name: Build with Maven
run: mvn -B -U clean verify -Pproduction
run: mvn -B -U clean verify
strategy:
matrix:
java: [17]
Expand All @@ -56,7 +48,7 @@ jobs:
env:
cache-name: cache-maven-artifacts
with:
key: cudami-cache-java-17-${{ github.run_id }}
key: metasvc-cache-java-17-${{ github.run_id }}
path: |
~/.m2/repository
**/target
Expand All @@ -74,7 +66,7 @@ jobs:
env:
cache-name: cache-maven-artifacts
with:
key: cudami-cache-java-17-${{ github.run_id }}
key: metasvc-cache-java-17-${{ github.run_id }}
path: |
~/.m2/repository
**/target
Expand Down
22 changes: 1 addition & 21 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,9 @@ variables:
DOCKER_HOST: "tcp://docker:2375"
DOCKER_TLS_CERTDIR: ""
MAVEN_CLI_OPTS: "-Dmaven.repo.local=.m2/repository --batch-mode -Pcustom-nexus"
PLAYBOOK: "cudami/repository-server.yml"

services:
- name: "$BUILD_IMAGE_DOCKER_DIND"
alias: docker

###################
### Stage build ###
###################

compile:
variables:
BUILD_PROFILE: production

####################
### Stage deploy ###
####################

deploy_dev:
parallel:
matrix:
- PLAYBOOK: [ "cudami/repository-server.yml", "cudami/admin-webapp.yml" ]

deploy_version_to_environment:
parallel:
matrix:
- PLAYBOOK: [ "cudami/repository-server.yml", "cudami/admin-webapp.yml" ]
57 changes: 56 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,62 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
## Unreleased

## 9.0.0

This version changes both the `groupId` and `artifactId` of the contained maven modules as follows:

<table>
<thead>
<tr>
<th>OLD</th>
<th>NEW</th>
</tr>
</thead>
<tbody>
<tr>
<td>de.digitalcollections.cudami:dc-cudami-client</td>
<td>io.github.dbmdz.metadata:metasvc-client</td>
</tr>
<tr>
<td>de.digitalcollections.cudami:dc-cudami-lobid-client</td>
<td>io.github.dbmdz.metadata:metasvc-lobid-client</td>
</tr>
<tr>
<td>de.digitalcollections.cudami:dc-cudami-model</td>
<td>io.github.dbmdz.metadata:metasvc-model</td>
</tr>
<tr>
<td>de.digitalcollections.cudami:dc-cudami-server-webapp</td>
<td>io.github.dbmdz.metadata:metasvc-server-webapp</td>
</tr>
<tr>
<td>de.digitalcollections.cudami:dc-cudami-server-business</td>
<td>io.github.dbmdz.metadata:metasvc-server-business</td>
</tr>
<tr>
<td>de.digitalcollections.cudami:dc-cudami-server-backend-api</td>
<td>io.github.dbmdz.metadata:metasvc-server-backend-api</td>
</tr>
<tr>
<td>de.digitalcollections.cudami:dc-cudami-server-backend-inmemory</td>
<td>io.github.dbmdz.metadata:metasvc-server-backend-inmemory</td>
</tr>
<tr>
<td>de.digitalcollections.cudami:dc-cudami-server-backend-jdbi</td>
<td>io.github.dbmdz.metadata:metasvc-server-backend-jdbi</td>
</tr>
<tr>
<td>de.digitalcollections.cudami:dc-cudami-server-backend-file</td>
<td>io.github.dbmdz.metadata:metasvc-server-backend-file</td>
</tr>
<tr>
<td>de.digitalcollections.cudami:dc-cudami-server-backend-lobid</td>
<td>io.github.dbmdz.metadata:metasvc-server-backend-lobid</td>
</tr>
</tbody>
</table>

### Changed

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

25 changes: 0 additions & 25 deletions dc-cudami-server/pom.xml

This file was deleted.

File renamed without changes.
12 changes: 6 additions & 6 deletions dc-cudami-client/pom.xml → metasvc-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>de.digitalcollections.cudami</groupId>
<artifactId>dc-cudami</artifactId>
<groupId>io.github.dbmdz.metadata</groupId>
<artifactId>metasvc</artifactId>
<version>9.0.0-SNAPSHOT</version>
</parent>

<name>DigitalCollections: cudami Repository Client</name>
<artifactId>dc-cudami-client</artifactId>
<name>Metadata-Service: Repository Client</name>
<artifactId>metasvc-client</artifactId>
<packaging>jar</packaging>

<dependencies>
Expand All @@ -23,8 +23,8 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>de.digitalcollections.cudami</groupId>
<artifactId>dc-cudami-model</artifactId>
<groupId>io.github.dbmdz.metadata</groupId>
<artifactId>metasvc-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand Down
12 changes: 6 additions & 6 deletions dc-cudami-lobid-client/pom.xml → metasvc-lobid-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>de.digitalcollections.cudami</groupId>
<artifactId>dc-cudami</artifactId>
<groupId>io.github.dbmdz.metadata</groupId>
<artifactId>metasvc</artifactId>
<version>9.0.0-SNAPSHOT</version>
</parent>

<name>DigitalCollections: cudami lobid.org Client</name>
<artifactId>dc-cudami-lobid-client</artifactId>
<name>Metadata-Service: lobid.org Client</name>
<artifactId>metasvc-lobid-client</artifactId>
<packaging>jar</packaging>

<properties>
Expand All @@ -28,8 +28,8 @@
<artifactId>spotbugs-annotations</artifactId>
</dependency>
<dependency>
<groupId>de.digitalcollections.cudami</groupId>
<artifactId>dc-cudami-model</artifactId>
<groupId>io.github.dbmdz.metadata</groupId>
<artifactId>metasvc-model</artifactId>
</dependency>
<dependency>
<groupId>de.digitalcollections.lobid</groupId>
Expand Down
8 changes: 4 additions & 4 deletions dc-cudami-model/pom.xml → metasvc-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>de.digitalcollections.cudami</groupId>
<artifactId>dc-cudami</artifactId>
<groupId>io.github.dbmdz.metadata</groupId>
<artifactId>metasvc</artifactId>
<version>9.0.0-SNAPSHOT</version>
</parent>

<name>DigitalCollections: cudami Model</name>
<artifactId>dc-cudami-model</artifactId>
<name>Metadata-Service: Model</name>
<artifactId>metasvc-model</artifactId>
<packaging>jar</packaging>

<dependencies>
Expand Down
Loading

0 comments on commit 90f5941

Please sign in to comment.