Skip to content

Commit

Permalink
java 17 compatible version upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
vivekmittal07 committed Apr 24, 2023
1 parent 58c8e1c commit 5a2dce5
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

# Image for building and running tests against the source code of
# the FHIR Access Proxy.
FROM maven:3.8.5-openjdk-11 as build
FROM maven:3.8.7-eclipse-temurin-17-focal as build

RUN apt-get update && apt-get install -y nodejs npm
RUN npm cache clean -f && npm install -g n && n stable
Expand All @@ -38,7 +38,7 @@ RUN mvn --batch-mode package -Pstandalone-app -Dlicense.skip=true


# Image for FHIR Access Proxy binary with configuration knobs as environment vars.
FROM eclipse-temurin:11-jdk-focal as main
FROM eclipse-temurin:17-jdk-focal as main

COPY --from=build /app/exec/target/exec-0.1.1.jar /
COPY resources/hapi_page_url_allowed_queries.json resources/hapi_page_url_allowed_queries.json
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spotless.version>2.32.0</spotless.version>
<root.basedir>${project.basedir}</root.basedir>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<!-- Check this for why we are not using a higher version for now:
https://www.slf4j.org/codes.html#StaticLoggerBinder
The root cause is that we are using an older version of Spring. -->
<slf4j.version>1.7.36</slf4j.version>
<logback.version>1.2.11</logback.version>
<slf4j.version>2.0.7</slf4j.version>
<logback.version>1.4.6</logback.version>
<license-maven-plugin.version>4.1</license-maven-plugin.version>
</properties>

Expand Down Expand Up @@ -255,7 +255,7 @@

<!-- apply a specific flavor of google-java-format and reflow long strings -->
<googleJavaFormat>
<version>1.8</version>
<version>1.15.0</version>
<style>GOOGLE</style>
<reflowLongStrings>true</reflowLongStrings>
</googleJavaFormat>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@

public interface AccessDecision {

/** @return true iff access was granted. */
/**
* @return true iff access was granted.
*/
boolean canAccess();

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* Copyright 2021-2023 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.google.fhir.gateway.interfaces;

import java.util.HashMap;
Expand Down

0 comments on commit 5a2dce5

Please sign in to comment.