Merge branch 'main' into fix/be/FSADT1-973

bcgov · Nov 16, 2023 · 92047e0 · 92047e0
2 parents 1ff1480 + 6b66abc
commit 92047e0
Show file tree

Hide file tree

Showing 11 changed files with 2,082 additions and 1,196 deletions.
diff --git a/backend/.mvn/wrapper/maven-wrapper.properties b/backend/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/common/Dockerfile b/common/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17.0.8_7-jdk-alpine
+FROM eclipse-temurin:17.0.9_9-jdk-alpine
 
 ENV LANG en_CA.UTF-8
 ENV LANGUAGE en_CA.UTF-8

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -38,7 +38,7 @@ services:
 
   backend:
     container_name: backend
-    image: maven:3.9.3-eclipse-temurin-17
+    image: maven:3.9.5-eclipse-temurin-17
     entrypoint: sh -c "cd /app && mvn -ntp spring-boot:run -Dspring-boot.run.jvmArguments='-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n'"
     environment:
       POSTGRESQL_HOST: *POSTGRES_HOST

diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -10,7 +10,7 @@ RUN npm ci && \
     npm run build
 
 # Caddy
-FROM caddy:2.7.3-alpine
+FROM caddy:2.7.5-alpine
 
 # Copy static files and config
 COPY --from=build /app/dist /srv

diff --git a/frontend/components.d.ts b/frontend/components.d.ts
@@ -3,11 +3,9 @@
 // @ts-nocheck
 // Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
-import '@vue/runtime-core'
-
 export {}
 
-declare module '@vue/runtime-core' {
+declare module 'vue' {
   export interface GlobalComponents {
     AddressGroupComponent: typeof import('./src/components/grouping/AddressGroupComponent.vue')['default']
     AutoCompleteInputComponent: typeof import('./src/components/forms/AutoCompleteInputComponent.vue')['default']

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -70,7 +70,7 @@
     "@vue/eslint-config-prettier": "^8.0.0",
     "@vue/eslint-config-typescript": "^12.0.0",
     "@vue/test-utils": "^2.4.0",
-    "@vue/tsconfig": "^0.1.3",
+    "@vue/tsconfig": "^0.4.0",
     "cypress": "^13.3.2",
     "eslint": "^8.48.0",
     "eslint-config-prettier": "^9.0.0",
@@ -90,9 +90,9 @@
     "source-map-support": "^0.5.21",
     "start-server-and-test": "^2.0.0",
     "ts-node": "^10.9.1",
-    "typescript": "~5.1.0",
-    "unplugin-icons": "^0.15.3",
-    "unplugin-vue-components": "^0.24.0",
+    "typescript": "~5.2.0",
+    "unplugin-icons": "^0.17.0",
+    "unplugin-vue-components": "^0.25.0",
     "vite": "^4.4.9",
     "vite-plugin-istanbul": "^5.0.0",
     "vitest": "^0.34.6",

diff --git a/frontend/tsconfig.app.json b/frontend/tsconfig.app.json
@@ -1,5 +1,4 @@
 {
-  "extends": "@vue/tsconfig/tsconfig.web.json",
   "include": ["env.d.ts", "src/**/*", "src/**/*.vue", "components.d.ts"],
   "exclude": ["src/tests/*"],
   "compilerOptions": {

diff --git a/frontend/tsconfig.vite-config.json b/frontend/tsconfig.vite-config.json
@@ -1,5 +1,4 @@
 {
-  "extends": "@vue/tsconfig/tsconfig.node.json",
   "include": ["vite.config.*"],
   "compilerOptions": {
     "composite": true,

diff --git a/legacy/.mvn/wrapper/maven-wrapper.properties b/legacy/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/processor/.mvn/wrapper/maven-wrapper.properties b/processor/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar