Skip to content

Commit e59d64f

Browse files
robcastrobcast
committed
Merge changes from master for release 2.11.1
2 parents 32a859d + eaf648f commit e59d64f

File tree

23 files changed

+724
-864
lines changed

23 files changed

+724
-864
lines changed

‎.github/workflows/docker-image.yml‎

Lines changed: 44 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,53 @@ name: Docker image build
22

33
on:
44
push:
5-
branches:
6-
- master
5+
branches:
6+
- master
77
tags:
8-
- release-*
8+
- release-*
99

1010
jobs:
1111
build:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2
15-
- name: Log in to Docker Hub
16-
uses: docker/login-action@v1
17-
with:
18-
username: ${{ secrets.DOCKER_USERNAME }}
19-
password: ${{ secrets.DOCKER_PASSWORD }}
20-
21-
- name: Push master branch snapshot to Docker Hub
22-
if: ${{ github.ref == 'refs/heads/master' }}
23-
uses: docker/build-push-action@v2
24-
with:
25-
file: build/docker/Dockerfile
26-
push: true
27-
tags: robcast/digilib:snapshot
28-
29-
- name: extract git tag
30-
if: ${{ startsWith(github.ref, 'refs/tags/') }}
31-
run: echo "GIT_TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
32-
- name: Push tagged release to Docker Hub
33-
if: ${{ startsWith(github.ref, 'refs/tags/') }}
34-
uses: docker/build-push-action@v2
35-
with:
36-
file: build/docker/Dockerfile
37-
push: true
38-
tags: |
39-
robcast/digilib:${{ env.GIT_TAG }}
40-
robcast/digilib:latest
14+
- uses: actions/checkout@v2
15+
16+
- name: Log in to Docker Hub
17+
uses: docker/login-action@v1
18+
with:
19+
username: ${{ secrets.DOCKER_USERNAME }}
20+
password: ${{ secrets.DOCKER_PASSWORD }}
21+
- name: Log in to the Github registry
22+
uses: docker/login-action@v1
23+
with:
24+
registry: ghcr.io
25+
username: ${{ github.actor }}
26+
password: ${{ secrets.GITHUB_TOKEN }}
27+
28+
- name: Build and push master branch snapshot
29+
if: ${{ github.ref == 'refs/heads/master' }}
30+
uses: docker/build-push-action@v2
31+
with:
32+
file: build/docker/Dockerfile
33+
push: true
34+
tags: |
35+
robcast/digilib:snapshot
36+
ghcr.io/robcast/digilib:snapshot
37+
38+
- name: Extract metadata (tags, labels) for Docker
39+
id: meta
40+
if: ${{ startsWith(github.ref, 'refs/tags/') }}
41+
uses: docker/metadata-action@v3
42+
with:
43+
images: |
44+
robcast/digilib
45+
ghcr.io/robcast/digilib
46+
47+
- name: Build and push tagged version
48+
if: ${{ startsWith(github.ref, 'refs/tags/') }}
49+
uses: docker/build-push-action@v2
50+
with:
51+
file: build/docker/Dockerfile
52+
push: true
53+
tags: ${{ steps.meta.outputs.tags }}
54+
labels: ${{ steps.meta.outputs.labels }}

‎.gitignore‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
/.project
2-
/*/.project
3-
/target/
4-
/*/target/
5-
/.settings/
6-
/*/.settings/
7-
/*/.classpath
8-
/.DS_Store
1+
/**/.project
2+
/**/target/
3+
/**/.settings/
4+
/**/.classpath
5+
/**/.DS_Store

‎common-cdstar/pom.xml‎

Lines changed: 38 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,44 @@
11
<?xml version="1.0"?>
22
<project
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4-
xmlns="http://maven.apache.org/POM/4.0.0"
5-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
6-
<modelVersion>4.0.0</modelVersion>
7-
<parent>
8-
<artifactId>digilib</artifactId>
9-
<groupId>digilib</groupId>
10-
<version>2.11.0</version>
11-
</parent>
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4+
xmlns="http://maven.apache.org/POM/4.0.0"
5+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
6+
<modelVersion>4.0.0</modelVersion>
7+
<parent>
8+
<artifactId>digilib</artifactId>
9+
<groupId>digilib</groupId>
10+
<version>2.11.1</version>
11+
</parent>
1212

13-
<artifactId>digilib-common-cdstar</artifactId>
14-
<name>digilib-common</name>
15-
<description>The Digital Image Library - CDSTAR storage support</description>
16-
<url>https://github.com/robcast/digilib</url>
17-
<packaging>jar</packaging>
13+
<artifactId>digilib-common-cdstar</artifactId>
14+
<name>digilib-common</name>
15+
<description>The Digital Image Library - CDSTAR storage support</description>
16+
<url>https://github.com/robcast/digilib</url>
17+
<packaging>jar</packaging>
1818

19-
<profiles>
20-
</profiles>
19+
<profiles>
20+
</profiles>
2121

22-
<dependencies>
23-
<dependency>
24-
<groupId>digilib</groupId>
25-
<artifactId>digilib-common</artifactId>
26-
<version>${digilib.version}</version>
27-
</dependency>
28-
<dependency>
29-
<groupId>org.apache.httpcomponents</groupId>
30-
<artifactId>httpclient</artifactId>
31-
<version>4.5.13</version>
32-
</dependency>
33-
<dependency>
34-
<groupId>org.glassfish</groupId>
35-
<artifactId>javax.json</artifactId>
36-
<version>1.1.4</version><!-- use 1.1 instead of global 1.0 -->
37-
</dependency>
38-
</dependencies>
22+
<dependencies>
23+
<dependency>
24+
<groupId>digilib</groupId>
25+
<artifactId>digilib-common</artifactId>
26+
<version>${digilib.version}</version>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.apache.httpcomponents</groupId>
30+
<artifactId>httpclient</artifactId>
31+
<version>4.5.13</version>
32+
</dependency>
33+
<dependency>
34+
<groupId>javax.json</groupId>
35+
<artifactId>javax.json-api</artifactId>
36+
<version>1.1</version><!--$NO-MVN-MAN-VER$--><!-- use 1.1 instead of global 1.0 -->
37+
</dependency>
38+
<dependency>
39+
<groupId>org.glassfish</groupId>
40+
<artifactId>javax.json</artifactId>
41+
<version>1.1.4</version><!-- use 1.1 instead of global 1.0 -->
42+
</dependency>
43+
</dependencies>
3944
</project>

‎common/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>digilib</artifactId>
77
<groupId>digilib</groupId>
8-
<version>2.11.0</version>
8+
<version>2.11.1</version>
99
</parent>
1010

1111
<artifactId>digilib-common</artifactId>
@@ -36,7 +36,7 @@
3636
<dependency>
3737
<groupId>com.github.jai-imageio</groupId>
3838
<artifactId>jai-imageio-jpeg2000</artifactId>
39-
<version>1.3.0</version>
39+
<version>1.4.0</version>
4040
</dependency>
4141
</dependencies>
4242
</profile>

‎common/src/main/java/digilib/conf/DigilibConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public class DigilibConfiguration extends ParameterMap {
6464
* @return the version
6565
*/
6666
public static String getClassVersion() {
67-
return "2.11.0";
67+
return "2.11.1";
6868
}
6969

7070
/* non-static getVersion for Java inheritance */

‎doc/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>digilib</groupId>
55
<artifactId>digilib</artifactId>
6-
<version>2.11.0</version>
6+
<version>2.11.1</version>
77
</parent>
88
<artifactId>digilib-doc</artifactId>
99
<packaging>pom</packaging>

‎frontend-greyskin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>digilib</groupId>
77
<artifactId>digilib</artifactId>
8-
<version>2.11.0</version>
8+
<version>2.11.1</version>
99
</parent>
1010
<artifactId>digilib-frontend-greyskin</artifactId>
1111
<packaging>war</packaging>

‎frontend-jquery-example/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>digilib</groupId>
77
<artifactId>digilib</artifactId>
8-
<version>2.11.0</version>
8+
<version>2.11.1</version>
99
</parent>
1010
<artifactId>digilib-frontend-jquery-example</artifactId>
1111
<packaging>war</packaging>

0 commit comments

Comments
 (0)