Merge pull request #343 from overture-stack/develop

2.2.1

Author: andricDu

Dockerfile.prod

@@ -1,16 +1,9 @@
-FROM maven:3.6-jdk-8
-
+FROM java:8
 WORKDIR /usr/src/app
-
 ADD . .
-
-RUN mvn package -Dmaven.test.skip=true
+RUN ./mvnw package -Dmaven.test.skip=true
 
 FROM java:8-alpine
-
-COPY --from=0 /usr/src/app/target/ego-*-SNAPSHOT-exec.jar /usr/bin/ego.jar
-COPY --from=0 /usr/src/app/src/main/resources/flyway/sql /usr/src/flyway-migration-sql
-
+COPY --from=0 /usr/src/app/target/ego-*-exec.jar /usr/bin/ego.jar
 ENTRYPOINT ["java", "-jar", "/usr/bin/ego.jar"]
-
 EXPOSE 8081/tcp

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>bio.overture</groupId>
     <artifactId>ego</artifactId>
-    <version>2.1.0</version>
+    <version>2.2.1</version>
 
     <name>ego</name>
     <description>OAuth 2.0 Authorization service that supports multiple OpenID Connect Providers</description>
@@ -29,6 +29,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.security.oauth</groupId>
             <artifactId>spring-security-oauth2</artifactId>
@@ -240,6 +244,13 @@
             <artifactId>spring-boot-devtools</artifactId>
             <optional>true</optional>
         </dependency>
+
+        <dependency>
+            <groupId>javax.interceptor</groupId>
+            <artifactId>javax.interceptor-api</artifactId>
+            <version>1.2</version>
+        </dependency>
+
     </dependencies>
 
     <build>

src/main/java/bio/overture/ego/config/SecureServerConfig.java

@@ -142,6 +142,7 @@ protected void configure(HttpSecurity http) throws Exception {
               "/configuration/**",
               "/v2/api**",
               "/webjars/**",
+              "/actuator/**",
               "/oauth/token/verify",
               "/oauth/token/public_key")
           .permitAll()

src/main/java/bio/overture/ego/model/dto/CreateUserRequest.java

@@ -41,5 +41,5 @@ public class CreateUserRequest {
 
   private String lastName;
 
-  @NotNull private LanguageType preferredLanguage;
+  private LanguageType preferredLanguage;
 }