Rebuild for new Guava version

oracle · Jun 22, 2020 · e48d7f6 · e48d7f6
2 parents da51cb1 + 2e676cf
commit e48d7f6
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 1 deletion.
diff --git a/docs/charts/index.yaml b/docs/charts/index.yaml
@@ -2,83 +2,129 @@ apiVersion: v1
 entries:
   weblogic-operator:
   - apiVersion: v1
+<<<<<<< HEAD
     created: "2020-06-19T15:05:15.882687-04:00"
+=======
+    created: "2020-06-22T17:13:41.217962-04:00"
+>>>>>>> origin/release/2.6.0
     description: Helm chart for configuring the WebLogic operator.
     digest: 5f4cd8f4f3282b52b5e90a1169f26986e8272671845053606ade9c855fb04151
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.0.0-rc1.tgz
     version: 3.0.0-rc1
   - apiVersion: v1
+<<<<<<< HEAD
     created: "2020-06-19T15:05:15.880744-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: d441888a8deae1b1339e7585e3b437dfd2533303e46e842d7378e16db665e234
+=======
+    created: "2020-06-22T17:13:41.215781-04:00"
+    description: Helm chart for configuring the WebLogic operator.
+    digest: 45049e5c30c3dd4cbbfe124a956e1c8313df3b72160604d5079f2c5cfe3d27b4
+>>>>>>> origin/release/2.6.0
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.6.0.tgz
     version: 2.6.0
   - apiVersion: v1
+<<<<<<< HEAD
     created: "2020-06-19T15:05:15.875847-04:00"
+=======
+    created: "2020-06-22T17:13:41.212567-04:00"
+>>>>>>> origin/release/2.6.0
     description: Helm chart for configuring the WebLogic operator.
     digest: fe41421b7dc45dc8a3b2888d3a626a37f5d3c8e1fa292fb6699deedc5e1db33d
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.5.0.tgz
     version: 2.5.0
   - apiVersion: v1
+<<<<<<< HEAD
     created: "2020-06-19T15:05:15.874044-04:00"
+=======
+    created: "2020-06-22T17:13:41.210617-04:00"
+>>>>>>> origin/release/2.6.0
     description: Helm chart for configuring the WebLogic operator.
     digest: b36bd32083f67453a62d089a2c09ce38e6655d88ac8a7b38691230c55c40e672
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.4.0.tgz
     version: 2.4.0
   - apiVersion: v1
+<<<<<<< HEAD
     created: "2020-06-19T15:05:15.872291-04:00"
+=======
+    created: "2020-06-22T17:13:41.203195-04:00"
+>>>>>>> origin/release/2.6.0
     description: Helm chart for configuring the WebLogic operator.
     digest: a3eafe4c2c6ff49384e56421201e59a3737d651af8d5b605b87a19eb1f6f1dc3
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.3.1.tgz
     version: 2.3.1
   - apiVersion: v1
+<<<<<<< HEAD
     created: "2020-06-19T15:05:15.868706-04:00"
+=======
+    created: "2020-06-22T17:13:41.199646-04:00"
+>>>>>>> origin/release/2.6.0
     description: Helm chart for configuring the WebLogic operator.
     digest: cbc6caaa6eb28e3c7e906ede14b2ae511a0b35fc12a8e3ab629155b09993e8b2
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.3.0.tgz
     version: 2.3.0
   - apiVersion: v1
+<<<<<<< HEAD
     created: "2020-06-19T15:05:15.866966-04:00"
+=======
+    created: "2020-06-22T17:13:41.192841-04:00"
+>>>>>>> origin/release/2.6.0
     description: Helm chart for configuring the WebLogic operator.
     digest: 23d5a1c554fa8211cc1e86b7ade09460917cb2069e68fb4bfdddafc8db44fdcd
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.2.1.tgz
     version: 2.2.1
   - apiVersion: v1
+<<<<<<< HEAD
     created: "2020-06-19T15:05:15.865414-04:00"
+=======
+    created: "2020-06-22T17:13:41.189658-04:00"
+>>>>>>> origin/release/2.6.0
     description: Helm chart for configuring the WebLogic operator.
     digest: bba303686cb55d84fe8c0d693a2436e7e686b028085b56e012f6381699a3911f
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.2.0.tgz
     version: 2.2.0
   - apiVersion: v1
+<<<<<<< HEAD
     created: "2020-06-19T15:05:15.862974-04:00"
+=======
+    created: "2020-06-22T17:13:41.182221-04:00"
+>>>>>>> origin/release/2.6.0
     description: Helm chart for configuring the WebLogic operator.
     digest: 391e23c0969ada5f0cd2a088ddc6f11f237f57521801ed3925db2149a8437a0d
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.1.tgz
     version: "2.1"
   - apiVersion: v1
+<<<<<<< HEAD
     created: "2020-06-19T15:05:15.861136-04:00"
+=======
+    created: "2020-06-22T17:13:41.178805-04:00"
+>>>>>>> origin/release/2.6.0
     description: Helm chart for configuring the WebLogic operator.
     digest: 298acda78ab73db6b7ba6f2752311bfa40c65874e03fb196b70976192211c1a5
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.0.1.tgz
     version: 2.0.1
+<<<<<<< HEAD
 generated: "2020-06-19T15:05:15.857696-04:00"
+=======
+generated: "2020-06-22T17:13:41.169697-04:00"
+>>>>>>> origin/release/2.6.0
diff --git a/new-integration-tests/pom.xml b/new-integration-tests/pom.xml
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>19.0</version>
+            <version>29.0-jre</version>
             <scope>test</scope>
         </dependency>
         <dependency>