Release v1.4.0 (#319)

Release v1.4.0 Co-authored-by: Emil Edholm <[email protected]> Co-authored-by: null <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Johan Horvius <[email protected]>
Filmstund · Aug 21, 2019 · e98b31e · e98b31e
2 parents 0a06666 + 5b7f0fc
commit e98b31e
Show file tree

Hide file tree

Showing 277 changed files with 30,914 additions and 10,622 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,4 +1,7 @@
-version: 2
+version: 2.1
+
+orbs:
+  packtracker: packtracker/[email protected]
 
 defaults: &defaults
   working_directory: ~/itbio
@@ -36,15 +39,9 @@ jobs:
           key: v1-node_modules-{{ checksum "frontend/yarn.lock" }}
           paths:
             - frontend/node_modules
-      - run: |
-          cd frontend
-          yarn lint
       - run: |
           cd frontend
           yarn test
-      - run: |
-          cd frontend
-          yarn packtracker
   build-docker:
     <<: *defaults
     machine: true
@@ -72,6 +69,10 @@ jobs:
 
 workflows:
   version: 2
+  packtracker:
+    jobs:
+      - packtracker/report:
+          project_root: "./frontend"
   build:
     jobs:
       - test-backend

diff --git a/Makefile b/Makefile
@@ -4,9 +4,9 @@ TAG          := $$(git rev-parse --short=8 HEAD)
 FRONTEND_IMG := ${NAME}-frontend:${TAG}
 BACKEND_IMG  := ${NAME}-backend:${TAG}
 DIRECTORY    := $$(pwd)
- 
+
 frontend:
-	cd ${DIRECTORY}/frontend; docker build -t ${FRONTEND_IMG} .
+	cd ${DIRECTORY}/frontend; docker build -t ${FRONTEND_IMG} --build-arg TAG=$$(git rev-parse HEAD) .
 	docker tag ${FRONTEND_IMG} ${NAME}-frontend:latest
 
 backend:
@@ -18,7 +18,7 @@ docker: frontend backend
 push:
 	docker push ${NAME}-frontend
 	docker push ${NAME}-backend
- 
+
 login:
 	@docker login -u ${DOCKER_USER} -p ${DOCKER_PASS}
 

diff --git a/backend/build.gradle b/backend/build.gradle
@@ -2,9 +2,9 @@ import java.time.ZonedDateTime
 
 buildscript {
   ext {
-    kotlinVersion = '1.2.71'
-    springBootVersion = '2.0.5.RELEASE'
-    junitJupiterVersion = '5.3.1'
+    kotlinVersion = '1.3.40'
+    springBootVersion = '2.1.7.RELEASE'
+    junitJupiterVersion = '5.5.1'
   }
 
   repositories {
@@ -19,10 +19,10 @@ buildscript {
 }
 
 plugins {
-  id("org.ajoberstar.grgit") version '3.0.0-rc.2'
-  id("net.researchgate.release") version '2.7.0'
-  id('com.google.cloud.tools.jib') version '0.9.11'
-  id "com.github.ben-manes.versions" version '0.20.0'
+  id("org.ajoberstar.grgit") version '3.1.1'
+  id("net.researchgate.release") version '2.8.1'
+  id('com.google.cloud.tools.jib') version '1.5.0'
+  id "com.github.ben-manes.versions" version '0.22.0'
 }
 
 apply plugin: "kotlin"
@@ -45,6 +45,8 @@ repositories {
 
 dependencies {
   compile("com.graphql-java:graphql-spring-boot-starter:5.0.2")
+//  UI for GraphQL queries available at /graphiql
+//  compile("com.graphql-java:graphiql-spring-boot-starter:5.0.2")
   compile("com.graphql-java:graphql-java-tools:5.2.4")
   compile("com.graphql-java:graphql-java:9.4")
   compile("org.springframework.boot:spring-boot-starter-web-services:$springBootVersion")
@@ -53,8 +55,8 @@ dependencies {
   compile("org.springframework.boot:spring-boot-starter-cache:$springBootVersion")
   compile("org.springframework.boot:spring-boot-starter-security:$springBootVersion")
   compile("org.springframework.boot:spring-boot-starter-mustache:$springBootVersion")
-  compile("org.springframework.security:spring-security-jwt:1.0.9.RELEASE")
-  compile("org.springframework.security.oauth:spring-security-oauth2:2.3.3.RELEASE")
+  compile("org.springframework.security:spring-security-jwt:1.0.10.RELEASE")
+  compile("org.springframework.security.oauth:spring-security-oauth2:2.3.6.RELEASE")
   compile("org.springframework.boot:spring-boot-devtools:$springBootVersion")
 
 
@@ -63,19 +65,19 @@ dependencies {
   compile("org.springframework.data:spring-data-commons")
 
   compile("com.github.ben-manes.caffeine:caffeine:2.+")
-  compile("com.fasterxml.jackson.module:jackson-module-kotlin:2.9.7")
-  compile("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.7")
-  compile("com.googlecode.libphonenumber:libphonenumber:8.9.15")
-  compile("com.google.guava:guava:26.0-jre")
-  compile("net.sf.biweekly:biweekly:0.6.2")
+  compile("com.fasterxml.jackson.module:jackson-module-kotlin:2.9.9")
+  compile("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9")
+  compile("com.googlecode.libphonenumber:libphonenumber:8.10.17")
+  compile("com.google.guava:guava:28.0-jre")
+  compile("net.sf.biweekly:biweekly:0.6.3")
 
   /* The following are needed under java 11 */
-  runtime("org.apache.commons:commons-lang3:3.8.1")
+  runtime("org.apache.commons:commons-lang3:3.9")
   runtime("javax.xml.bind:jaxb-api:2.3.0")
   runtime("com.sun.xml.bind:jaxb-impl:2.3.0")
   runtime("com.sun.xml.bind:jaxb-core:2.3.0")
-  runtime("javax.activation:activation:1.1.1")
-  compile("org.apache.httpcomponents:httpclient:4.5.4")
+  runtime("javax.activation:activation:1.1")
+  compile("org.apache.httpcomponents:httpclient:4.5.9")
 
   compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}")
   compile("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
@@ -84,7 +86,7 @@ dependencies {
   testCompile("org.springframework.boot:spring-boot-starter-test:$springBootVersion")
   testCompile("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}")
   testRuntime("org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}")
-  testCompile("org.mockito:mockito-core:2.23.0")
+  testCompile("org.mockito:mockito-core:2.28.2")
 }
 
 

diff --git a/backend/gradle/wrapper/gradle-wrapper.jar b/backend/gradle/wrapper/gradle-wrapper.jar
diff --git a/backend/gradle/wrapper/gradle-wrapper.properties b/backend/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/backend/gradlew b/backend/gradlew
@@ -28,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

diff --git a/backend/gradlew.bat b/backend/gradlew.bat
@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

diff --git a/backend/mongo-migrations b/backend/mongo-migrations
@@ -1,6 +1,11 @@
 ### Pending migrations ###
 N/A
 
+### Migrations already done in deployed application ###
+db.movie.update({}, {$rename:{"sfId":"filmstadenId"}}, false, true);
+db.movie.update({}, {$rename:{"sfSlug":"filmstadenSlug"}}, false, true);
+db.user.update({}, {$rename:{"sfMembershipId":"filmstadenMembershipId"}}, false, true);
+
 ### Migrations already done in deployed application ###
 # Change fields to @DBRef on all showings
 db.showing.find({}).forEach(s => {