HAWKULAR-985 - Removed direct dependency on secret store.

hawkular · Feb 4, 2016 · cbb6b7b · cbb6b7b
1 parent e34c899
commit cbb6b7b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 30 deletions.
diff --git a/dist/pom.xml b/dist/pom.xml
@@ -324,6 +324,7 @@
             <configuration>
               <tasks>
                 <replace token="org.hawkular.nest" value="org.hawkular.bus" file="${project.build.directory}/${project.build.finalName}/modules/org/hawkular/nest/main/deployments/hawkular-metrics-component.war//WEB-INF/jboss-deployment-structure.xml" />
+                <replace token="MaxMetaspaceSize=256m" value="MaxMetaspaceSize=512m" file="${project.build.directory}/${project.build.finalName}/bin/standalone.conf" />
               </tasks>
             </configuration>
           </execution>

diff --git a/modules/end-to-end-test/src/test/java/org/hawkular/integration/test/Scenario1ITest.java b/modules/end-to-end-test/src/test/java/org/hawkular/integration/test/Scenario1ITest.java
@@ -152,7 +152,7 @@ public void testScenario() throws Throwable {
         path = "/hawkular/metrics/gauges/" + resourceId + "." + statusCodeId + "/data";
         String query = "?start=" + start + "&end=" + end;
         response = client
-                .newCall(newAuthRequest().addHeader("Hawkular-Tenant", tenantId).url(baseURI + path + query).build())
+                .newCall(newAuthRequest().url(baseURI + path + query).build())
                 .execute();
         String body = response.body().string();
         TypeReference<List<DataPoint<Double>>> dataPointListTypeRef = new TypeReference<List<DataPoint<Double>>>() {};
@@ -163,7 +163,7 @@ public void testScenario() throws Throwable {
         path = "/hawkular/metrics/gauges/" + resourceId + "." + durationId + "/data";
         query = "?start=" + start + "&end=" + end;
         response = client
-                .newCall(newAuthRequest().addHeader("Hawkular-Tenant", tenantId).url(baseURI + path + query).build())
+                .newCall(newAuthRequest().url(baseURI + path + query).build())
                 .execute();
         body = response.body().string();
         List<DataPoint<Double>> durations = mapper.readValue(body, dataPointListTypeRef);
@@ -196,7 +196,7 @@ private void postMetricValue(String tenantId, String resourceId, String metricNa
 
         String path = "/hawkular/metrics/gauges/" + tmp + "/data";
         String json = "[{timestamp: " + time + ", value: " + value + "}]";
-        Request request = newAuthRequest().addHeader("Hawkular-Tenant", tenantId).url(baseURI + path)
+        Request request = newAuthRequest().url(baseURI + path)
                 .post(RequestBody.create(MEDIA_TYPE_JSON, json)).build();
         Response response = client.newCall(request).execute();
         Assert.assertEquals(200, response.code());

diff --git a/modules/hawkular-api-parent/pom.xml b/modules/hawkular-api-parent/pom.xml
@@ -34,12 +34,13 @@
   <name>Hawkular: API parent pom</name>
   <description>Common pom for rest api module and RX extensions module, to be able to build them together.</description>
 
+  <properties>
+    <version.org.apache.activemq>5.10.0</version.org.apache.activemq>
+  </properties>
+
   <modules>
     <module>hawkular-rest-api</module>
     <module>hawkular-rx</module>
   </modules>
-
-  <properties>
-  </properties>
 </project>
 
diff --git a/modules/hawkular-wildfly-agent-download/pom.xml b/modules/hawkular-wildfly-agent-download/pom.xml
@@ -44,11 +44,6 @@
       <artifactId>hawkular-accounts-api</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.keycloak.secretstore</groupId>
-      <artifactId>secret-store-undertow-filter</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.jboss.spec.javax.annotation</groupId>
       <artifactId>jboss-annotations-api_1.2_spec</artifactId>

diff --git a/modules/hawkular-wildfly-agent-download/src/main/webapp/WEB-INF/web.xml b/modules/hawkular-wildfly-agent-download/src/main/webapp/WEB-INF/web.xml
@@ -27,10 +27,6 @@
     <param-value>true</param-value>
   </context-param>
 
-  <listener>
-    <listener-class>org.keycloak.secretstore.common.ServletContextEnhancer</listener-class>
-  </listener>
-
   <security-constraint>
     <web-resource-collection>
       <web-resource-name>Installer download endpoint</web-resource-name>

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.hawkular</groupId>
     <artifactId>hawkular-parent</artifactId>
-    <version>33</version>
+    <version>35</version>
   </parent>
 
   <artifactId>hawkular</artifactId>
@@ -88,15 +88,15 @@
     <version.com.google.code.gson>2.2.4</version.com.google.code.gson>
     <version.commons.io>2.4</version.commons.io>
     <version.gnu.getopt>1.0.13</version.gnu.getopt>
-    <version.org.hawkular.accounts>2.0.18.Final-SRC-revision-0c09a7676792a60db75d6ee8f49500496b8f6d42</version.org.hawkular.accounts>
-    <version.org.hawkular.agent>0.15.6.Final</version.org.hawkular.agent>
-    <version.org.hawkular.alerts>0.8.2.Final</version.org.hawkular.alerts>
-    <version.org.hawkular.cmdgw>0.10.9.Final</version.org.hawkular.cmdgw>
-    <version.org.hawkular.commons>0.3.4.Final</version.org.hawkular.commons>
-    <version.org.hawkular.inventory>0.12.1.Final</version.org.hawkular.inventory>
-    <version.org.hawkular.metrics>0.11.0.Final</version.org.hawkular.metrics>
+    <version.org.hawkular.accounts>2.0.18.Final</version.org.hawkular.accounts>
+    <version.org.hawkular.agent>0.15.7.Final-SRC-revision-f486b356c1cdee2e53982da9b4dfb2f590b24c54</version.org.hawkular.agent>
+    <version.org.hawkular.alerts>0.9.0.Final-SRC-revision-a1532ba2882645d80171d1c8e353320de0ddc31a</version.org.hawkular.alerts>
+    <version.org.hawkular.cmdgw>0.10.11.Final-SRC-revision-6858e69c9543587bcc15da618c6cec80b08dd108</version.org.hawkular.cmdgw>
+    <version.org.hawkular.commons>0.3.5.Final</version.org.hawkular.commons>
+    <version.org.hawkular.inventory>0.13.0.Final-SRC-revision-8030a5aa969e3ff5bab534112ea2b5b91c8088d7</version.org.hawkular.inventory>
+    <version.org.hawkular.metrics>0.13.0-SRC-revision-c9260099383bcaab020b9623dff7baa1a421e73e</version.org.hawkular.metrics>
     <version.org.jboss.weld.se>2.3.2.Final</version.org.jboss.weld.se>
-    <version.org.keycloak.secretstore>1.0.9.Final</version.org.keycloak.secretstore>
+    <version.org.keycloak.secretstore>1.0.12.Final</version.org.keycloak.secretstore>
     <version.rxjava>1.0.16</version.rxjava>
     <version.hystrix-core>1.4.21</version.hystrix-core>
     <version.hystrix-request-servlet>1.1.2</version.hystrix-request-servlet>
@@ -111,12 +111,6 @@
         <version>${version.org.hawkular.accounts}</version>
       </dependency>
 
-      <dependency>
-        <groupId>org.keycloak.secretstore</groupId>
-        <artifactId>secret-store-undertow-filter</artifactId>
-        <version>${version.org.keycloak.secretstore}</version>
-      </dependency>
-
       <dependency>
         <groupId>org.hawkular.alerts</groupId>
         <artifactId>hawkular-alerts-actions-email</artifactId>