Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Versions updated due security issues #250

Merged
merged 13 commits into from
Sep 29, 2020
Merged

Versions updated due security issues #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
eb42750
Added clean and DP3T variables
iCesofT Sep 25, 2020
9df60cd
Upgraded to spring-boot 2.2.10.RELEASE
iCesofT Sep 25, 2020
4d4a995
Use spring-boot-starter-logging
iCesofT Sep 25, 2020
ed2c0ce
Added package
iCesofT Sep 25, 2020
8ff1c70
Dependency and plugin management optimised
iCesofT Sep 25, 2020
4777af9
Repositories and plugin repositories in parent pom
iCesofT Sep 25, 2020
be13a76
Remove *.log files
iCesofT Sep 25, 2020
a17547a
Upgrading libraries
iCesofT Sep 25, 2020
d2ce1db
Fix typo
iCesofT Sep 25, 2020
9e75d40
Deprecated
iCesofT Sep 25, 2020
fcee200
Proto files to src/main/proto
iCesofT Sep 25, 2020
b059a4b
fix: jacoco-plugin was duplicated
iCesofT Sep 26, 2020
80bab51
no needed
iCesofT Sep 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
# Makefile #
######################

DP3T_SDK = dpppt-backend-sdk
DP3T_SDK_WS = $(DP3T_SDK)/dpppt-backend-sdk-ws

FILE_NAME = documentation.tex

LATEX = xelatex
Expand All @@ -15,18 +18,21 @@ docker-build: updateproject docker
doc: updatedoc swagger la la2 la3
test: clean run-test
run-test:
mvn -f dpppt-backend-sdk/pom.xml test
mvn -f $(DP3T_SDK)/pom.xml test

package:
mvn -f $(DP3T_SDK)/pom.xml clean package

updateproject:
mvn -f dpppt-backend-sdk/pom.xml install -DskipTests
mvn -f $(DP3T_SDK)/pom.xml package -DskipTests

updatedoc:
mvn -f dpppt-backend-sdk/pom.xml install -Dmaven.test.skip=true
mvn springboot-swagger-3:springboot-swagger-3 -f dpppt-backend-sdk/dpppt-backend-sdk-ws/pom.xml
cp dpppt-backend-sdk/dpppt-backend-sdk-ws/generated/swagger/swagger.yaml documentation/yaml/sdk.yaml
mvn -f $(DP3T_SDK)/pom.xml package -Dmaven.test.skip=true
mvn springboot-swagger-3:springboot-swagger-3 -f $(DP3T_SDK_WS)/pom.xml
cp $(DP3T_SDK_WS)/generated/swagger/swagger.yaml documentation/yaml/sdk.yaml

swagger:
cd documentation; $(RUSTY_SWAGGER) --file ../dpppt-backend-sdk/dpppt-backend-sdk-ws/generated/swagger/swagger.yaml
cd documentation; $(RUSTY_SWAGGER) --file ../$(DP3T_SDK_WS)/generated/swagger/swagger.yaml

la:
cd documentation;$(LATEX) $(FILE_NAME)
Expand All @@ -40,12 +46,12 @@ show:
cd documentation; open $(FILE_NAME).pdf &

docker:
cp dpppt-backend-sdk/dpppt-backend-sdk-ws/target/dpppt-backend-sdk-ws.jar ws-sdk/ws/bin/dpppt-backend-sdk-ws-1.0.0.jar
cp $(DP3T_SDK_WS)/target/dpppt-backend-sdk-ws.jar ws-sdk/ws/bin/dpppt-backend-sdk-ws-1.0.0.jar
docker build -t dp3t-docker ws-sdk/
@printf '\033[33m DO NOT USE THIS IN PRODUCTION \033[0m \n'
@printf "\033[32m docker run -p 8080:8080 -v $(PWD)/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/resources/logback.xml:/home/ws/conf/dpppt-backend-sdk-ws-logback.xml -v $(PWD)/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/resources/application.properties:/home/ws/conf/dpppt-backend-sdk-ws.properties dp3t-docker \033[0m\n"


@printf "\033[32m docker run -p 8080:8080 -v $(PWD)/$(DP3T_SDK_WS)/src/main/resources/logback.xml:/home/ws/conf/dpppt-backend-sdk-ws-logback.xml -v $(PWD)/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/resources/application.properties:/home/ws/conf/dpppt-backend-sdk-ws.properties dp3t-docker \033[0m\n"

clean:
mvn -f $(DP3T_SDK)/pom.xml clean
@rm -f $(DP3T_SDK_WS)/dp3t-ws.log*
@rm -f documentation/*.log documentation/*.aux documentation/*.dvi documentation/*.ps documentation/*.blg documentation/*.bbl documentation/*.out documentation/*.bcf documentation/*.run.xml documentation/*.fdb_latexmk documentation/*.fls documentation/*.toc
3 changes: 0 additions & 3 deletions dpppt-backend-sdk/dpppt-backend-sdk-data/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
<name>DP3T Backend SDK Data</name>

<properties>
<org.testcontainers.version>1.14.2</org.testcontainers.version>
<sonar.projectKey>DP-3T_dp3t-sdk-data</sonar.projectKey>
</properties>

Expand All @@ -31,7 +30,6 @@
<dependency>
<groupId>org.dpppt</groupId>
<artifactId>dpppt-backend-sdk-model</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>

<!-- database -->
Expand Down Expand Up @@ -59,7 +57,6 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<version>${org.testcontainers.version}</version>
<scope>test</scope>
</dependency>

Expand Down
33 changes: 22 additions & 11 deletions dpppt-backend-sdk/dpppt-backend-sdk-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<dependency>
<groupId>ch.ubique.openapi</groupId>
<artifactId>doc-annotations</artifactId>
<version>1.0.1</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -63,14 +62,26 @@
</dependency>
</dependencies>

<repositories>
<repository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>ubique-oss-springboot-swagger3</id>
<name>bintray</name>
<url>https://dl.bintray.com/ubique-oss/springboot-swagger3</url>
</repository>
</repositories>
<build>
<plugins>
<plugin>
<groupId>com.github.os72</groupId>
<artifactId>protoc-jar-maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<inputDirectories>
<include>${project.basedir}/src/main/proto</include>
</inputDirectories>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
Loading