Skip to content

Commit

Permalink
REL - v1.26 (arlington)
Browse files Browse the repository at this point in the history
  • Loading branch information
MaximPlusov committed Sep 4, 2024
1 parent 64b4ce7 commit e0ee7d2
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/push-dockerhub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Publish Docker image

on:
push:
branches: [ master ]
branches: [ arlington-master ]

jobs:
push_to_registry:
Expand All @@ -23,13 +23,13 @@ jobs:
id: meta
uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
with:
images: verapdf/rest
images: verapdf/arlington

- name: Build and push Docker image
uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
with:
context: .
file: ./Dockerfile
push: true
tags: verapdf/rest:latest,verapdf/rest:v1.26.1
tags: verapdf/arlington:latest,verapdf/arlington:v1.26.1
labels: ${{ steps.meta.outputs.labels }}
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ FROM debian:bullseye-slim
# Set for additional arguments passed to the java run command, no default
ARG JAVA_OPTS
ENV JAVA_OPTS=$JAVA_OPTS
# Specify the veraPDF REST version if you want to (to be used in build automation), default is 1.27.1
# Specify the veraPDF REST version if you want to (to be used in build automation), default is 1.26.1
ARG VERAPDF_REST_VERSION
ENV VERAPDF_REST_VERSION=${VERAPDF_REST_VERSION:-1.27.1}
ENV VERAPDF_REST_VERSION=${VERAPDF_REST_VERSION:-1.26.1}

COPY --from=app-builder /usr/local/bin/dumb-init /usr/local/bin/dumb-init
RUN chmod +x /usr/local/bin/dumb-init
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile_dev
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ FROM debian:bullseye-slim
# Set for additional arguments passed to the java run command, no default
ARG JAVA_OPTS
ENV JAVA_OPTS=$JAVA_OPTS
# Specify the veraPDF REST version if you want to (to be used in build automation), default is 1.27.1
# Specify the veraPDF REST version if you want to (to be used in build automation), default is 1.26.1
ARG VERAPDF_REST_VERSION
ENV VERAPDF_REST_VERSION=${VERAPDF_REST_VERSION:-1.27.1}
ENV VERAPDF_REST_VERSION=${VERAPDF_REST_VERSION:-1.26.1}

COPY --from=dev-builder /usr/local/bin/dumb-init /usr/local/bin/dumb-init
RUN chmod +x /usr/local/bin/dumb-init
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ branch for dev version, and then build the Maven project:

To start up the server:

java -jar target/verapdf-rest-1.27.1.jar server server.yml
java -jar target/verapdf-rest-1.26.1.jar server server.yml

Go to [localhost:8080/api/info](http://localhost:8080/api/info) to see if the server is running, you should
see something like:
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>org.verapdf</groupId>
<artifactId>verapdf-parent</artifactId>
<version>1.27.1</version>
<version>1.26.1</version>
</parent>

<artifactId>verapdf-rest-arlington</artifactId>
<version>1.27.1</version>
<version>1.26.1</version>

<name>veraPDF RESTful web services</name>
<description>JAX-RS web services and client for veraPDF library</description>
Expand Down Expand Up @@ -44,7 +44,7 @@
<properties>
<dropwizard.version>2.1.7</dropwizard.version>
<fasterxml.version>2.10.0</fasterxml.version>
<verapdf.validation.version>[1.27.0,1.28.0-RC)</verapdf.validation.version>
<verapdf.validation.version>[1.26.0,1.27.0)</verapdf.validation.version>
</properties>

<build>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/verapdf/rest/resources/ApiResource.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
*/
@Path("/api")
@Tag(name = "veraPDF")
@OpenAPIDefinition(info = @Info(title = "veraPDF API", description = "A REST service API for veraPDF", version = "V1.27.1", license = @License(name = "Apache 2.0", url = "https://www.apache.org/licenses/LICENSE-2.0")), servers = {
@OpenAPIDefinition(info = @Info(title = "veraPDF API", description = "A REST service API for veraPDF", version = "V1.26.1", license = @License(name = "Apache 2.0", url = "https://www.apache.org/licenses/LICENSE-2.0")), servers = {
@Server(url = "https://demo.verapdf.org", description = "default"),
@Server(url = "https://dev.verapdf-rest.duallab.com", description = "dev"),
@Server(url = "http://localhost:8080", description = "local") })
Expand Down

0 comments on commit e0ee7d2

Please sign in to comment.