revert changes (#617)

redhataccess · Jul 7, 2021 · e16f465 · e16f465
1 parent 32e5a65
commit e16f465
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 29 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
@@ -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|/static/rhdocs.css|/pantheon/fonts/RedHatText-Medium.woff|/conf/pantheon/*)",
+                "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)",
                 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 = 5;
+    private static final int MAX_RETRIES = 3;
     protected KeycloakDeployment keycloakDeployment;
     private PathBasedKeycloakConfigResolver keycloakConfigResolver;
     /**

diff --git a/pantheon-karaf-feature/pom.xml b/pantheon-karaf-feature/pom.xml
@@ -65,31 +65,16 @@
             <id>maven2-central-repository</id>
             <name>Maven2 central Repository</name>
             <url>https://repo1.maven.org/maven2</url>
-<!--            <layout>default</layout>-->
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-                <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>
+                <updatePolicy>daily</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>-->
@@ -115,16 +100,5 @@
                 <updatePolicy>daily</updatePolicy>
             </snapshots>
         </pluginRepository>
-        <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>