Merge pull request #185 from icgc-argo/release/3.2.0

Release/3.2.0
icgc-argo · Sep 2, 2021 · 49d1a0e · 49d1a0e
2 parents f211e16 + 0deeb4a
commit 49d1a0e
Show file tree

Hide file tree

Showing 14 changed files with 341 additions and 304 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.5.4</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>org.icgc.argo</groupId>
     <artifactId>workflow-management</artifactId>
-    <version>3.1.0</version>
+    <version>3.2.0</version>
     <name>workflow-management</name>
     <description>ARGO Workflow Management</description>
 
@@ -25,11 +25,6 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
-        <repository>
-            <id>springfox</id>
-            <name>springfox</name>
-            <url>http://oss.jfrog.org/artifactory/oss-snapshot-local/</url>
-        </repository>
         <repository>
             <id>jcenter</id>
             <url>https://jcenter.bintray.com/</url>
@@ -38,8 +33,7 @@
 
     <properties>
         <java.version>11</java.version>
-        <springfox.version>3.0.0-SNAPSHOT</springfox.version>
-        <reactor-rabbitmq-streams.version>0.0.7</reactor-rabbitmq-streams.version>
+        <reactor-rabbitmq-streams.version>0.0.9</reactor-rabbitmq-streams.version>
     </properties>
 
     <dependencies>
@@ -68,7 +62,7 @@
         <dependency>
             <groupId>io.nextflow</groupId>
             <artifactId>nextflow</artifactId>
-            <version>20.07.1</version>
+            <version>21.04.3</version>
         </dependency>
 
         <!-- Health Check -->
@@ -84,27 +78,10 @@
         </dependency>
 
         <!-- Spring-boot security dependencies -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-oauth2-jose</artifactId>
-            <version>5.3.3.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-oauth2-client</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.security.oauth.boot</groupId>
             <artifactId>spring-security-oauth2-autoconfigure</artifactId>
-            <version>2.0.2.RELEASE</version>
+            <version>2.5.2</version>
         </dependency>
 
         <!-- Graphql -->
@@ -155,7 +132,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-stream-kafka</artifactId>
-            <version>3.0.1.RELEASE</version>
+            <version>3.1.3</version>
         </dependency>
     </dependencies>
 
@@ -185,7 +162,7 @@
                         </goals>
                         <configuration>
                             <sourceDirectory>${project.basedir}/src/main/resources/avro/</sourceDirectory>
-                            <outputDirectory>${project.basedir}/src/main/java/</outputDirectory>
+                            <outputDirectory>${project.build.directory}/generated-sources/avro</outputDirectory>
                             <!-- Set stringType to generate Java String instead of CharSequence -->
                             <stringType>String</stringType>
                         </configuration>

diff --git a/src/main/java/org/icgc/argo/workflow_management/config/security/AuthDisabledConfig.java b/src/main/java/org/icgc/argo/workflow_management/config/security/AuthDisabledConfig.java
@@ -18,16 +18,12 @@
 
 package org.icgc.argo.workflow_management.config.security;
 
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Profile;
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
 import org.springframework.security.config.web.server.ServerHttpSecurity;
 import org.springframework.security.web.server.SecurityWebFilterChain;
 
 @EnableWebFluxSecurity
-@Slf4j
-@Profile("!secure")
 public class AuthDisabledConfig {
   @Bean
   public SecurityWebFilterChain securityFilterChain(ServerHttpSecurity http) {

diff --git a/src/main/java/org/icgc/argo/workflow_management/config/security/AuthEnabledConfig.java b/src/main/java/org/icgc/argo/workflow_management/config/security/AuthEnabledConfig.java
diff --git a/src/main/java/org/icgc/argo/workflow_management/config/security/AuthProperties.java b/src/main/java/org/icgc/argo/workflow_management/config/security/AuthProperties.java
diff --git a/...n/java/org/icgc/argo/workflow_management/gatekeeper/graphql/model/GqlSearchQueryArgs.java b/...n/java/org/icgc/argo/workflow_management/gatekeeper/graphql/model/GqlSearchQueryArgs.java
@@ -18,11 +18,11 @@
 
 package org.icgc.argo.workflow_management.gatekeeper.graphql.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.icgc.argo.workflow_management.gatekeeper.model.Run;
 
 @Data

diff --git a/src/main/java/org/icgc/argo/workflow_management/streams/DisposableManager.java b/src/main/java/org/icgc/argo/workflow_management/streams/DisposableManager.java
@@ -24,10 +24,10 @@
 import java.util.concurrent.Callable;
 import lombok.Getter;
 import lombok.SneakyThrows;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
 import reactor.core.Disposable;
 
-@Configuration
+@Component
 public class DisposableManager {
   public static final String WES_CONSUMER = "WESConsumer";
   public static final String GATEKEEPER_PRODUCER = "gatekeeperProducer";