diff --git a/pom.xml b/pom.xml index 9371ea1..cfe4e89 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ com.redhat.exhort exhort-java-api - 0.0.4 + 0.0.5 diff --git a/repository/com/redhat/exhort/exhort-java-api/0.0.4/exhort-java-api-0.0.4.jar b/repository/com/redhat/exhort/exhort-java-api/0.0.4/exhort-java-api-0.0.4.jar deleted file mode 100644 index 4f1e9e0..0000000 Binary files a/repository/com/redhat/exhort/exhort-java-api/0.0.4/exhort-java-api-0.0.4.jar and /dev/null differ diff --git a/repository/com/redhat/exhort/exhort-java-api/0.0.5/exhort-java-api-0.0.5.jar b/repository/com/redhat/exhort/exhort-java-api/0.0.5/exhort-java-api-0.0.5.jar new file mode 100644 index 0000000..a01830e Binary files /dev/null and b/repository/com/redhat/exhort/exhort-java-api/0.0.5/exhort-java-api-0.0.5.jar differ diff --git a/repository/com/redhat/exhort/exhort-java-api/0.0.4/exhort-java-api-0.0.4.pom b/repository/com/redhat/exhort/exhort-java-api/0.0.5/exhort-java-api-0.0.5.pom similarity index 98% rename from repository/com/redhat/exhort/exhort-java-api/0.0.4/exhort-java-api-0.0.4.pom rename to repository/com/redhat/exhort/exhort-java-api/0.0.5/exhort-java-api-0.0.5.pom index 07cbbe7..c46c61b 100644 --- a/repository/com/redhat/exhort/exhort-java-api/0.0.4/exhort-java-api-0.0.4.pom +++ b/repository/com/redhat/exhort/exhort-java-api/0.0.5/exhort-java-api-0.0.5.pom @@ -4,7 +4,7 @@ 4.0.0 com.redhat.exhort exhort-java-api - 0.0.4 + 0.0.5 Exhort Java API Exhort Java API https://github.com/RHEcosystemAppEng/exhort-java-api#readme @@ -28,7 +28,7 @@ scm:git:git@github.com:RHEcosystemAppEng/exhort-java-api.git scm:git:git@github.com:RHEcosystemAppEng/exhort-java-api.git - v0.0.4 + v0.0.5 https://github.com/RHEcosystemAppEng/exhort-java-api diff --git a/src/main/java/redhat/jenkins/plugins/rhda/step/CRDAStep.java b/src/main/java/redhat/jenkins/plugins/rhda/step/CRDAStep.java index 520c9a6..eeef223 100644 --- a/src/main/java/redhat/jenkins/plugins/rhda/step/CRDAStep.java +++ b/src/main/java/redhat/jenkins/plugins/rhda/step/CRDAStep.java @@ -49,6 +49,7 @@ import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; +import java.util.stream.Collectors; public final class CRDAStep extends Step { private String file; @@ -99,7 +100,6 @@ protected Execution(CRDAStep step, StepContext context) { try { EnvVars envVars = context.get(EnvVars.class); jenkinsPath = envVars.get("PATH"); - // setting system properties to pass to java-api if(envVars.get("EXHORT_MVN_PATH") != null ){ System.setProperty("EXHORT_MVN_PATH", envVars.get("EXHORT_MVN_PATH")); @@ -128,6 +128,12 @@ protected Execution(CRDAStep step, StepContext context) { else{ System.clearProperty("EXHORT_URL"); } + if(envVars.get("EXHORT_DEV_MODE") != null ){ + System.setProperty("EXHORT_DEV_MODE", envVars.get("EXHORT_DEV_MODE")); + } + else{ + System.clearProperty("EXHORT_DEV_MODE"); + } if(envVars.get("EXHORT_SNYK_TOKEN") != null ){ System.setProperty("EXHORT_SNYK_TOKEN", envVars.get("EXHORT_SNYK_TOKEN")); @@ -177,6 +183,24 @@ protected Execution(CRDAStep step, StepContext context) { else{ System.clearProperty("EXHORT_OSS_INDEX_TOKEN"); } + if(envVars.get("EXHORT_PIP_SHOW") != null ){ + System.setProperty("EXHORT_PIP_SHOW", envVars.get("EXHORT_PIP_SHOW")); + } + else{ + System.clearProperty("EXHORT_PIP_SHOW"); + } + if(envVars.get("EXHORT_PIP_FREEZE") != null ){ + System.setProperty("EXHORT_PIP_FREEZE", envVars.get("EXHORT_PIP_FREEZE")); + } + else{ + System.clearProperty("EXHORT_PIP_FREEZE"); + } + if(envVars.get("EXHORT_DEBUG") != null ){ + System.setProperty("EXHORT_DEBUG", envVars.get("EXHORT_DEBUG")); + } + else{ + System.clearProperty("EXHORT_DEBUG"); + } String crdaUuid; RHDAGlobalConfig globalConfig = RHDAGlobalConfig.get();