Skip to content

Commit

Permalink
Merge pull request #150 from lgblaumeiser/prepare_release
Browse files Browse the repository at this point in the history
Prepare release
  • Loading branch information
lgblaumeiser authored Mar 31, 2019
2 parents 1f0a684 + fbecc6b commit 5219d76
Show file tree
Hide file tree
Showing 7 changed files with 73 additions and 61 deletions.
8 changes: 2 additions & 6 deletions codebase/ptm_backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.2.RELEASE</version>
<version>2.1.3.RELEASE</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

Expand All @@ -44,10 +44,6 @@
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional>
</dependency>
<!-- <dependency> -->
<!-- <groupId>org.springframework.boot</groupId> -->
<!-- <artifactId>spring-boot-starter-data-mongodb</artifactId> -->
<!-- </dependency> -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
Expand Down Expand Up @@ -113,7 +109,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.2</version>
<version>0.8.3</version>
<executions>
<execution>
<id>default-prepare-agent</id>
Expand Down
104 changes: 60 additions & 44 deletions codebase/ptm_backend/src/main/resources/license_info.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@ Please read license texts on this page: https://spdx.org/licenses/

Dependencies of "de.lgblaumeiser:datamanager"

* com.fasterxml.jackson.core:jackson-databind.2.9.7
* com.fasterxml.jackson.core:jackson-databind.2.9.8
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind

* com.fasterxml.jackson.core:jackson-annotations:2.9.7
* com.fasterxml.jackson.core:jackson-annotations:2.9.8
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations

* com.fasterxml.jackson.core:jackson-core:2.9.7
* com.fasterxml.jackson.core:jackson-core:2.9.8
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core

* com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.7
* com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310

Expand All @@ -66,15 +66,15 @@ Test Dependencies:

Dependencies of "de.lgblaumeiser:ptm_backend"

* org.springframework.boot:spring-boot-starter:2.1,1.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter

* org.springframework.boot:spring-boot-starter-web:2.1.1.RELEASE
* org.springframework.boot:spring-boot-starter-web:2.1.3.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web

* org.springframework.boot:spring-boot-starter-logging:2.1.1.RELEASE
* org.springframework.boot:spring-boot-starter:2.1.3.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter

* org.springframework.boot:spring-boot-starter-logging:2.1.3.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-logging

Expand Down Expand Up @@ -106,35 +106,35 @@ Dependencies of "de.lgblaumeiser:ptm_backend"
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.yaml/snakeyaml

* org.springframework.boot:spring-boot-starter-json:2.1.1.RELEASE
* org.springframework.boot:spring-boot-starter-json:2.1.3.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-json

* com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.7
* com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.8
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jdk8

* com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.7
* com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.8
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-module-parameter-names

* org.springframework.boot:spring-boot-starter-tomcat:2.1.1.RELEASE
* org.springframework.boot:spring-boot-starter-tomcat:2.1.3.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-tomcat

* org.apache.tomcat.embed:tomcat-embed-core:9.0.13
* org.apache.tomcat.embed:tomcat-embed-core:9.0.16
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.apache.tomcat.embed/tomcat-embed-core

* org.apache.tomcat.embed:tomcat-embed-el:9.0.13
* org.apache.tomcat.embed:tomcat-embed-el:9.0.16
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.apache.tomcat.embed/tomcat-embed-el

* org.apache.tomcat.embed:tomcat-embed-websocket:9.0.13
* org.apache.tomcat.embed:tomcat-embed-websocket:9.0.16
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.apache.tomcat.embed/tomcat-embed-websocket

* org.hibernate.validator:hibernate-validator:6.0.13
* org.hibernate.validator:hibernate-validator:6.0.14.Final
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.hibernate.validator/hibernate-validator

Expand All @@ -150,31 +150,27 @@ Dependencies of "de.lgblaumeiser:ptm_backend"
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/com.fasterxml/classmate

* org.springframework:spring-web:5.1.3.RELEASE
* org.springframework:spring-web:5.1.5.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework/spring-web

* org.springframework:spring-beans:5.1.3.RELEASE
* org.springframework:spring-beans:5.1.5.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework/spring-beans

* org.springframework:spring-webmvc:5.1.3.RELEASE
* org.springframework:spring-webmvc:5.1.5.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework/spring-webmvc

* org.springframework:spring-aop:5.1.3.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework/spring-aop

* org.springframework:spring-context:5.1.3.RELEASE
* org.springframework:spring-context:5.1.5.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework/spring-context

* org.springframework:spring-expression:5.1.3.RELEASE
* org.springframework:spring-expression:5.1.5.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework/spring-expression

* org.springframework.boot:spring-boot-starter-thymeleaf:2.1.1.RELEASE
* org.springframework.boot:spring-boot-starter-thymeleaf:2.1.3.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-thymeleaf

Expand All @@ -198,43 +194,63 @@ Dependencies of "de.lgblaumeiser:ptm_backend"
SPDX-License-Identifier: MIT
Reference: https://mvnrepository.com/artifact/org.slf4j/slf4j-api

* org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.2.RELEASE
* org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.3.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.thymeleaf.extras/thymeleaf-extras-java8time

* org.springframework.boot:spring-boot-devtools:2.1.1.RELEASE
* org.springframework.boot:spring-boot-devtools:2.1.3.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-devtools

* org.springframework.boot:spring-boot:2.1.1.RELEASE
* org.springframework.boot:spring-boot:2.1.3.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot

* org.springframework.boot:spring-boot-autoconfigure:2.1.1.RELEASE
* org.springframework.boot:spring-boot-autoconfigure:2.1.3.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-autoconfigure

* org.springframework:spring-core:5.1.3.RELEASE
* org.springframework.boot:spring-boot-starter-security:2.1.3.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-security

* org.springframework:spring-aop:5.1.5.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework/spring-aop

* org.springframework:spring-security-config:5.1.4.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework.security/spring-security-config

* org.springframework:spring-security-core:5.1.4.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework.security/spring-security-core

* org.springframework:spring-security-web:5.1.4.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework.security/spring-security-web

* org.springframework:spring-core:5.1.5.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework/spring-core

* org.springframework:spring-jcl:5.1.3.RELEASE
* org.springframework:spring-jcl:5.1.5.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework/spring-jcl

* com.fasterxml.jackson.core:jackson-databind.2.9.6
* com.fasterxml.jackson.core:jackson-databind.2.9.8
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind

* com.fasterxml.jackson.core:jackson-annotations:2.9.7
* com.fasterxml.jackson.core:jackson-annotations:2.9.8
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations

* com.fasterxml.jackson.core:jackson-core:2.9.7
* com.fasterxml.jackson.core:jackson-core:2.9.8
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core

* com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.7
* com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310

Expand All @@ -244,15 +260,15 @@ Dependencies of "de.lgblaumeiser:ptm_backend"

Test Dependencies

* org.springframework.boot:spring-boot-starter-test:2.1.1.RELEASE
* org.springframework.boot:spring-boot-starter-test:2.1.3.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-test

* org.springframework.boot:spring-boot-test:2.1.1.RELEASE
* org.springframework.boot:spring-boot-test:2.1.3.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-test

* org.springframework.boot:spring-boot-test-autoconfigure:2.1.1.RELEASE
* org.springframework.boot:spring-boot-test-autoconfigure:2.1.3.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-test-autoconfigure

Expand Down Expand Up @@ -284,11 +300,11 @@ Test Dependencies
SPDX-License-Identifier: MIT
Reference: https://mvnrepository.com/artifact/org.mockito/mockito-core

* net.bytebuddy:byte-buddy:1.9.5
* net.bytebuddy:byte-buddy:1.9.10
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/net.bytebuddy/byte-buddy-agent

* net.bytebuddy:byte-buddy-agent:1.9.5
* net.bytebuddy:byte-buddy-agent:1.9.10
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/net.bytebuddy/byte-buddy-agent

Expand All @@ -312,7 +328,7 @@ Test Dependencies
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/com.vaadin.external.google/android-json

* org.springframework:spring-test:5.1.3.RELEASE
* org.springframework:spring-test:5.1.5.RELEASE
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.springframework/spring-test

Expand Down
2 changes: 1 addition & 1 deletion codebase/ptm_cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.6</version>
<version>4.5.8</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
14 changes: 7 additions & 7 deletions codebase/ptm_cli/src/main/resources/license_info.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,39 +32,39 @@ Please read license texts on this page: https://spdx.org/licenses/

Dependencies of "de.lgblaumeiser:ptm_cli"

* com.fasterxml.jackson.core:jackson-databind.2.9.7
* com.fasterxml.jackson.core:jackson-databind.2.9.8
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind

* com.fasterxml.jackson.core:jackson-annotations:2.9.7
* com.fasterxml.jackson.core:jackson-annotations:2.9.8
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations

* com.fasterxml.jackson.core:jackson-core:2.9.7
* com.fasterxml.jackson.core:jackson-core:2.9.8
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core

* com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.7
* com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310

* commons-io:commons-io:2.6
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/commons-io/commons-io

* commons-codec:commons-codec:1.10
* commons-codec:commons-codec:1.11
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/commons-codec/commons-codec

* commons-logging:commons-logging:1.2
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/commons-logging/commons-logging

* org.apache.httpcomponents:httpclient:4.5.6
* org.apache.httpcomponents:httpclient:4.5.8
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient

* org.apache.httpcomponents:httpcore:4.4.10
* org.apache.httpcomponents:httpcore:4.4.11
SPDX-License-Identifier: Apache-2.0
Reference: https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore

Expand Down
2 changes: 1 addition & 1 deletion pom-jacocomerge.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.1</version>
<version>0.8.3</version>
<executions>
<execution>
<id>merge-results</id>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.2</version>
<version>0.8.3</version>
<executions>
<execution>
<goals>
Expand Down
2 changes: 1 addition & 1 deletion resources/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# SPDX-License-Identifier: MIT

FROM openjdk:11-jre
FROM openjdk:8-jre
VOLUME /var/ptm
COPY ptm_backend-1.5.jar app.jar
ENTRYPOINT ["java","-Dptm.filestore=/var/ptm", "-jar","/app.jar"]

0 comments on commit 5219d76

Please sign in to comment.