Skip to content

Commit 5766fd7

Browse files
luecklueck
committed
Merge branch 'dev'
2 parents 19ef834 + 821cd48 commit 5766fd7

File tree

89 files changed

+3592
-4809
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+3592
-4809
lines changed

‎.github/workflows/gh-pages.yml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,26 @@ jobs:
1010
concurrency:
1111
group: ${{ github.workflow }}-${{ github.ref }}
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414

15-
- name: Set up JDK 11
16-
uses: actions/setup-java@v2
15+
- name: Set up JDK 17
16+
uses: actions/setup-java@v4
1717
with:
18-
java-version: '11'
18+
java-version: '17'
1919
distribution: 'adopt'
2020
cache: maven
2121

22-
- name: run maven to get ediarum
23-
run: mvn --batch-mode --update-snapshots generate-sources
24-
25-
- name: run maven
26-
run: mvn --batch-mode --update-snapshots package
22+
- name: generate descriptor.xml file by running maven
23+
run: mvn -Drelease.url=https://github.com/SCDH/oxbytei/releases/download/${{ github.ref_name }}/ -Drevision=${{github.ref_name}} -Dchangelist="" --batch-mode --update-snapshots generate-resources
2724

2825
- name: create directory for github pages
2926
run: mkdir -p public
3027

3128
- name: copy descriptor file
32-
run: cp target/generated-resources/xml/xslt/pom.xml public/descriptor.xml
33-
34-
- name: copy index.html
35-
run: cp pages/index.html public/index.html
29+
run: cp target/descriptor.xml public/descriptor.xml
3630

3731
- name: Deploy descriptor file on Github pages
38-
uses: peaceiris/actions-gh-pages@v3
32+
uses: peaceiris/actions-gh-pages@v4
3933
with:
4034
github_token: ${{ secrets.GITHUB_TOKEN }}
4135
publish_dir: ./public

‎.github/workflows/release.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,25 @@ name: Create release
22
on:
33
push:
44
tags:
5-
- "[0-9]+.[0-9]+.[0-9]+-?**"
6-
5+
- '[0-9]+.[0-9]+.[0-9]+'
6+
- '[0-9]+.[0-9]+.[0-9]+-**'
77
jobs:
88
deploy:
99
runs-on: ubuntu-latest
1010
concurrency:
1111
group: ${{ github.workflow }}-${{ github.ref }}
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414

15-
- name: Set up JDK 11
16-
uses: actions/setup-java@v2
15+
- name: Set up JDK 17
16+
uses: actions/setup-java@v4
1717
with:
18-
java-version: '11'
18+
java-version: '17'
1919
distribution: 'adopt'
2020
cache: maven
2121

22-
- name: run maven to get ediarum
23-
run: mvn --batch-mode --update-snapshots generate-sources
24-
2522
- name: run maven
26-
run: mvn --batch-mode --update-snapshots package
23+
run: ./mvnw -Drevision=${{github.ref_name}} -Dchangelist="" --batch-mode --update-snapshots package
2724

2825
- name: create release
2926
uses: actions/create-release@v1
@@ -37,7 +34,8 @@ jobs:
3734
env:
3835
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3936

40-
- name: upload framework package to release
37+
38+
- name: add framework package as release asset
4139
uses: actions/upload-release-asset@v1
4240
env:
4341
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/test-main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ jobs:
1313
concurrency:
1414
group: ${{ github.workflow }}-${{ github.ref }}
1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v4
1717

18-
- name: Set up JDK 11
19-
uses: actions/setup-java@v2
18+
- name: Set up JDK 17
19+
uses: actions/setup-java@v4
2020
with:
21-
java-version: '11'
21+
java-version: '17'
2222
distribution: 'adopt'
2323
cache: maven
2424

25-
- name: run maven
26-
run: mvn --batch-mode --update-snapshots verify
25+
- name: run maven with default build profile
26+
run: ./mvnw --batch-mode --update-snapshots verify

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,15 @@
66
target
77
test/xspec/xspec
88
default-oxygen-frameworks
9+
.classpath
10+
.project
11+
.settings
912

1013
/frameworks/oxbytei
1114
/frameworks/oxbytao
1215
/frameworks/teip5alea/*.jar
16+
/frameworks/teip5alea/seed-tei-transformations
17+
/frameworks/teip5alea/alea-transformations
1318
oxbytei_externalAuthorActions
1419
oxbytao_externalAuthorActions
1520

‎.gitlab-ci.yml

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,48 @@
1-
# based on the template from
2-
# https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/lib/gitlab/ci/templates/Maven.gitlab-ci.yml
1+
image: harbor.uni-muenster.de/proxy-docker/eclipse-temurin:17-alpine
32

4-
image: maven:3.6-jdk-11
3+
stages:
4+
- test
5+
- deploy
56

67
cache:
78
paths:
89
- .m2/repository
910
- default-oxygen-frameworks
1011

1112
# For merge requests do not `deploy` but only run `verify`.
12-
.verify: &verify
13+
test:
1314
stage: test
1415
script:
15-
- 'mvn $MAVEN_CLI_OPTS verify'
16-
except:
17-
- master
18-
19-
# Verify merge requests
20-
verify:jdk11:
21-
<<: *verify
16+
- ./mvnw verify
2217

2318
# deploy using ci_settings.xml as maven settings
2419
# see https://gitlab.com/help/user/packages/maven_repository/index.md#creating-maven-packages-with-gitlab-cicd-using-maven
25-
deploy:jdk11:
20+
deploy-package:
21+
stage: deploy
2622
script:
27-
- 'mvn deploy -s ci_settings.xml'
23+
- ./mvnw -Drevision=$CI_COMMIT_TAG -Dchangelist="" clean deploy -s ci_settings.xml
2824
artifacts:
2925
paths:
3026
- target
3127
only:
32-
- master
33-
- tags
28+
# https://gitlab.com/gitlab-org/gitlab-foss/-/issues/27818
29+
variables:
30+
- $CI_COMMIT_TAG =~ /^\d+.\d+.\d+$/
3431

3532

3633
pages:
37-
image: busybox:latest
3834
stage: deploy
3935
script:
4036
- mkdir -p public
4137
- ls -la
4238
- cp -v target/*-package.zip public/
43-
- cp -v target/generated-resources/xml/xslt/pom.xml public/descriptor.xml
39+
- cp -v target/descriptor.xml public/descriptor.xml
40+
needs:
41+
- deploy-package
4442
artifacts:
4543
paths:
4644
- public
4745
only:
4846
# https://gitlab.com/gitlab-org/gitlab-foss/-/issues/27818
4947
variables:
50-
- $CI_COMMIT_TAG =~ /^v\d+.\d+.\d+$/
48+
- $CI_COMMIT_TAG =~ /^\d+.\d+.\d+$/

‎.mvn/maven.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-Drevision=3.4.0
2+
-Dchangelist=-SNAPSHOT

‎.mvn/wrapper/maven-wrapper.jar

61.1 KB
Binary file not shown.

‎.mvn/wrapper/maven-wrapper.properties

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
18+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

‎README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ the form "Show addons from:" of the dialogue box from "Help" ->
1818

1919
This framework works on top of oXbytei and oXbytao, which must also be
2020
installed.
21+
```
22+
https://scdh.zivgitlabpages.uni-muenster.de/hees-alea/oxygen-framework/descriptor.xml
23+
```
2124

2225
- [oXbytei](https://github.com/SCDH/oxbytei)
2326
- [oXbytao](https://github.com/SCDH/oxbytoa)

‎changeLog.md

Lines changed: 87 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,91 @@
11
# change log #
22

3+
### 3.4.0
4+
5+
- reflect changes in oXbytei and oXbytao
6+
- re-distribute toolbar actions
7+
- update to SEED TEI Transformations 0.14.8
8+
- update to ALEA Transformations 0.8.0
9+
10+
### 3.3.3
11+
12+
- update SEED TEI Transformations to bug fix version
13+
- fix author mode actions that insert spaces, related to #69.
14+
15+
16+
### 3.3.2
17+
18+
- update SEED TEI Transformations to bug fix version 0.11.1
19+
20+
### 3.3.0
21+
22+
- activate validation scenarios and made `ALEA` the default scenario
23+
- the `ALEA` scenario points directly to
24+
`${pdu}/resources/schema/ALEA.rng`
25+
- Breaks the separation of project and framework. However, having
26+
validation without any individual config is vital at the moment.
27+
- update to SEED TEI Transformations 0.11.0
28+
- update to ALEA Transformations 0.7.5
29+
30+
### 3.2.0
31+
32+
- improved author action for citations
33+
- bump SEED TEI Transformations to 0.10.0
34+
- added transformation scenarios for Diwan that ask for font size
35+
- this enable to get prints for team meatings
36+
37+
### 3.0.0
38+
39+
- dependencies on SEED TEI Transformations and ALEA Transformations
40+
- preview replaced with components from SEED TEI Transformations
41+
- added transformation and scenario for registries, i.e., places,
42+
persons, bibliography, importet from ALEA Transformations
43+
44+
45+
### 2.8.4
46+
47+
- generate apparatus entries for `<space>` nested in `<rdg>`
48+
49+
### 2.8.3
50+
51+
- output `@reason` for gaps and unclear text nested `<rdg>`
52+
53+
### 2.8.1 ###
54+
55+
- preview:
56+
- i18n: introduced namespace `decimal` for translating decimal
57+
numbers to i18n language, e.g. translating arabic numbers to
58+
arabic numbers in arabic script
59+
- translate surah verse numbers to i18n language
60+
- libapp2: replace `<caesura>` to space in apparatus lemma.
61+
62+
### 2.8.0 ###
63+
64+
- preview:
65+
- make libi18n.xsl generic
66+
- print surah titles instead of surah number
67+
- fixed arabic translations for "omisit" and "conieci"
68+
69+
### 2.7.3 ###
70+
71+
- preview:
72+
- apparatus: when lemma is empty, print the preceding or following
73+
word and repeat it in the reading
74+
- preview all recensions: made this work on Windows
75+
76+
### 2.7.2 ###
77+
78+
- preview:
79+
- fix line numbering and nested `<unclear>` etc. in `<rdg>`
80+
- minimal support for prose
81+
- action for editing `title` and `TEI/@xml:id` simultaneously
82+
- remove restrictions `<caesura>` action, because we hand restriction
83+
over to ODD
84+
85+
### 2.7.1 ###
86+
87+
- fix bug in shortcut action for inserting references to encyclopedia
88+
389
### 2.7.0 ###
490

591
- use `libapp2.xsl` for the apparatus
@@ -177,7 +263,7 @@
177263
## 2.3.2 ##
178264

179265
- Changed "Insert/Change Segmentation" to "Insert Segmentation",
180-
because it prevents nested segmentations
266+
because it prevents nested segmentations
181267

182268
## 2.3.1 ##
183269

0 commit comments

Comments
 (0)