From 66d32709278fc08952712734bddae97bcf562e73 Mon Sep 17 00:00:00 2001 From: amckenzie Date: Wed, 18 Nov 2020 14:29:22 +0000 Subject: [PATCH] Update to latest framework --- .travis.yml | 2 +- .../featurecontrol/example/HardCodedFeatureFetcher.java | 8 ++++---- pom.xml | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 64552385..01b16119 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ before_install: - ln -sfT ${PWD}/target/travis-settings/settings.xml ${HOME}/.m2/settings.xml - ln -sfT ${PWD}/target/travis-settings/mvnw mvnw - ln -sft ${PWD} ${PWD}/target/travis-settings/.mvn -install: "${PWD}/target/travis-settings/java/install.sh -e -q -DexcludeGroupIds=uk.gov.justice.service,uk.gov.justice.services" +install: "${PWD}/target/travis-settings/java/install.sh -e -DexcludeGroupIds=uk.gov.justice.service,uk.gov.justice.services" script: "${PWD}/target/travis-settings/java/script-install.sh coveralls:report sonar:sonar" after_success: "${PWD}/target/travis-settings/java/after_success.sh" notifications: diff --git a/example-context/example-service/example-feature-control/src/main/java/uk/gov/moj/cpp/featurecontrol/example/HardCodedFeatureFetcher.java b/example-context/example-service/example-feature-control/src/main/java/uk/gov/moj/cpp/featurecontrol/example/HardCodedFeatureFetcher.java index c96e9609..c035385a 100644 --- a/example-context/example-service/example-feature-control/src/main/java/uk/gov/moj/cpp/featurecontrol/example/HardCodedFeatureFetcher.java +++ b/example-context/example-service/example-feature-control/src/main/java/uk/gov/moj/cpp/featurecontrol/example/HardCodedFeatureFetcher.java @@ -8,14 +8,14 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Default; +import javax.annotation.Priority; +import javax.enterprise.inject.Alternative; import javax.inject.Inject; import org.slf4j.Logger; -@Default -@ApplicationScoped +@Alternative +@Priority(1) public class HardCodedFeatureFetcher implements FeatureFetcher { private static final Feature HARD_CODED_DISABLED_FEATURE = new Feature( diff --git a/pom.xml b/pom.xml index 7819758b..315d6984 100644 --- a/pom.xml +++ b/pom.xml @@ -31,9 +31,9 @@ cake-shop - 7.2.0 - 7.2.0 - 7.2.0 + 7.2.1 + 7.2.1 + 7.2.1