From 32e5a65f9a437084e78aeef3e4c23b7f73a125fe Mon Sep 17 00:00:00 2001
From: Lisa Davidson <xdavidson@users.noreply.github.com>
Date: Wed, 7 Jul 2021 08:56:12 -0400
Subject: [PATCH] Ccs 4310 update filter (#615)

* update filter and max retries
---
 .../auth/keycloak/KeycloakFilter.java         |  4 +--
 pantheon-karaf-feature/pom.xml                | 30 +++++++++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/pantheon-bundle/src/main/java/com/redhat/pantheon/auth/keycloak/KeycloakFilter.java b/pantheon-bundle/src/main/java/com/redhat/pantheon/auth/keycloak/KeycloakFilter.java
index 0536aa060..81ea46ee8 100644
--- a/pantheon-bundle/src/main/java/com/redhat/pantheon/auth/keycloak/KeycloakFilter.java
+++ b/pantheon-bundle/src/main/java/com/redhat/pantheon/auth/keycloak/KeycloakFilter.java
@@ -32,7 +32,7 @@
         service = Filter.class,
         property = {
                 KeycloakOIDCFilter.CONFIG_FILE_PARAM + "=" + "keycloak.json",
-                "keycloak.config.skipPattern=(/pantheon/internal/modules.json|/pantheon/builddate.json|/pantheon/fonts/*|/content/repositories.harray.1.json|/starter.html|/bin/browser.html|/content/starter/css/bundle.css|/content/starter/img/sling-logo.svg|/content/starter/img/asf-logo.svg|/content/starter/img/sling-logo.svg|/content/starter/img/gradient.jpg|/content/starter/fonts/OpenSans-Light-webfont.woff|/content/starter/fonts/OpenSans-Regular-webfont.woff|/system/sling.js|/system/*|/pantheon/*.js)",
+                "keycloak.config.skipPattern=(/pantheon/internal/modules.json|/pantheon/builddate.json|/pantheon/fonts/*|/content/repositories.harray.1.json|/starter.html|/bin/browser.html|/content/starter/css/bundle.css|/content/starter/img/sling-logo.svg|/content/starter/img/asf-logo.svg|/content/starter/img/sling-logo.svg|/content/starter/img/gradient.jpg|/content/starter/fonts/OpenSans-Light-webfont.woff|/content/starter/fonts/OpenSans-Regular-webfont.woff|/system/sling.js|/system/*|/pantheon/*.js|/static/rhdocs.css|/pantheon/fonts/RedHatText-Medium.woff|/conf/pantheon/*)",
                 HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN + "=" + "/pantheon/*",
                 HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN + "=" + "/content/pantheon",
                 HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN + "=" + "/content/products",
@@ -50,7 +50,7 @@ public class KeycloakFilter extends KeycloakOIDCFilter implements Filter {
     private static final Logger log = LoggerFactory.getLogger(KeycloakFilter.class.getName());
     private static final String KARAF_ETC = "karaf.etc";
     private static final String KEYCLOAKOIDCFILTER_CONFIG_FILE_NAME = "keycloak.json";
-    private static final int MAX_RETRIES = 3;
+    private static final int MAX_RETRIES = 5;
     protected KeycloakDeployment keycloakDeployment;
     private PathBasedKeycloakConfigResolver keycloakConfigResolver;
     /**
diff --git a/pantheon-karaf-feature/pom.xml b/pantheon-karaf-feature/pom.xml
index da4949c5a..055dffb68 100644
--- a/pantheon-karaf-feature/pom.xml
+++ b/pantheon-karaf-feature/pom.xml
@@ -65,7 +65,7 @@
             <id>maven2-central-repository</id>
             <name>Maven2 central Repository</name>
             <url>https://repo1.maven.org/maven2</url>
-            <layout>default</layout>
+<!--            <layout>default</layout>-->
             <releases>
                 <enabled>true</enabled>
                 <updatePolicy>daily</updatePolicy>
@@ -75,6 +75,21 @@
                 <updatePolicy>daily</updatePolicy>
             </snapshots>
         </repository>
+        <repository>
+            <id>redhat-public-repository-group</id>
+            <name>Red Hat Public Repository Group</name>
+            <url>https://maven.repository.redhat.com/ga/</url>
+            <layout>default</layout>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+                <updatePolicy>daily</updatePolicy>
+            </snapshots>
+        </repository>
+
         <!-- Commented out for till long term plan is implemented -->
 <!--        <repository>-->
 <!--            <id>apache-snapshots</id>-->
@@ -100,5 +115,16 @@
                 <updatePolicy>daily</updatePolicy>
             </snapshots>
         </pluginRepository>
-    </pluginRepositories>
+        <pluginRepository>
+            <id>redhat-public-repository-group</id>
+            <name>Red Hat Public Repository Group</name>
+            <url>https://maven.repository.redhat.com/ga/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+</pluginRepositories>
 </project>