AKS preparation (#274)

* Delete unused maven files

* Tweaks for AKS deployment

* Remove unused file

Dockerfile

@@ -1,10 +1,9 @@
-ARG APP_INSIGHTS_AGENT_VERSION=2.3.1
-FROM hmctspublic.azurecr.io/base/java:openjdk-8-distroless-1.2
+ARG APP_INSIGHTS_AGENT_VERSION=2.5.1
+FROM hmctspublic.azurecr.io/base/java:openjdk-8-distroless-1.4
 
 EXPOSE 8080
 
 COPY build/libs/fees-register-app.jar /opt/app/
 COPY lib/AI-Agent.xml /opt/app/
-COPY --chown=root ./fees-register-audit.log /opt/app
 
 CMD ["fees-register-app.jar"]

build.gradle

@@ -20,6 +20,9 @@ allprojects {
     }
     version = rootProject.file('version.txt').text.trim() + ".${buildNumber}"
 
+    sourceCompatibility = 1.8
+    targetCompatibility = 1.8
+
     repositories {
         mavenLocal()
         maven { url "https://dl.bintray.com/hmcts/hmcts-maven" }
@@ -51,8 +54,6 @@ subprojects {
     apply plugin: 'maven-publish'
     apply plugin: 'com.jfrog.bintray'
 
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
     tasks.withType(JavaCompile) {
         options.encoding = 'UTF-8'
     }
@@ -216,3 +217,6 @@ run {
     }
 }
 
+wrapper {
+    distributionType = Wrapper.DistributionType.ALL
+}

charts/fees-register-api/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: "1.0"
 description: Helm chart for the HMCTS fees-register api
 name: fees-register-api
 home: https://github.com/hmcts/ccfr-fees-register-app
-version: 0.2.0
+version: 0.2.1
 maintainers:
   - name: HMCTS Fees & Payments Dev Team
     email: [email protected]

charts/fees-register-api/requirements.yaml

@@ -1,4 +1,4 @@
 dependencies:
   - name: java
-    version: ~2.15.0
+    version: ~2.17.2
     repository: '@hmctspublic'

charts/fees-register-api/values.aat.template.yaml

@@ -1,4 +1,4 @@
+# Don't modify this file, it is only needed for the pipeline to set the image and ingressHost
 java:
-  # Don't modify below here
   image: ${IMAGE_NAME}
   ingressHost: ${SERVICE_FQDN}

charts/fees-register-api/values.preview.template.yaml

@@ -8,7 +8,6 @@ java:
     POSTGRES_PASSWORD: "{{ .Values.postgresql.postgresqlPassword}}"
     POSTGRES_CONNECTION_OPTIONS: "?sslmode=allow"
     SPRING_LIQUIBASE_ENABLED: true
-    IDAM_CLIENT_BASE_URL: https://idam-api.aat.platform.hmcts.net
     SPRING_CLOUD_PROPERTIESVOLUME_ENABLED: false
     ENABLE_FEE_LOADER: true
     postgresql:

charts/fees-register-api/values.yaml

@@ -15,8 +15,7 @@ java:
     ENABLE_FEE_LOADER: false
     IDAM_CLIENT_BASE_URL: https://idam-api.{{ .Values.global.environment }}.platform.hmcts.net
   keyVaults:
-    "fees-register":
-      resourceGroup: ccpay
+    fees-register:
       secrets:
         - api-POSTGRES-PASS
         - AppInsightsInstrumentationKey

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Fri Apr 17 08:54:08 BST 2020
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME