Skip to content

Commit

Permalink
Gh-3368: Update Koryphe version (#3369)
Browse files Browse the repository at this point in the history
* update koryphe version

* test fix and copyright

---------

Co-authored-by: wb36499 <[email protected]>
  • Loading branch information
cn337131 and wb36499 authored Feb 4, 2025
1 parent f370d37 commit 0c98f2c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion NOTICES
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ and their licenses, below. For information on the dependencies of these dependen
projects below.


Koryphe (uk.gov.gchq.koryphe:koryphe:2.5.2):
Koryphe (uk.gov.gchq.koryphe:koryphe:2.6.0):

- Apache License, Version 2.0

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2017-2021 Crown Copyright
* Copyright 2017-2025 Crown Copyright
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package uk.gov.gchq.gaffer.store.operation.handler;

import com.google.common.collect.Lists;
Expand Down Expand Up @@ -255,11 +256,12 @@ public void shouldFlatMapMultipleObjects() throws OperationException {
// Given
final MapHandler<Iterable<Iterable<Integer>>, Iterable<Integer>> handler = new MapHandler<>();

final Function<? extends Iterable<? extends Iterable<Integer>>, Iterable<Integer>> iterableConcat = new IterableConcat<>();
final Map<Iterable<Iterable<Integer>>, Iterable<Integer>> operation = new Map.Builder<Iterable<Iterable<Integer>>>()
.input(Arrays.asList(
Arrays.asList(1, 2),
Arrays.asList(3, 4)))
.first(new IterableConcat<>())
.first((Function<Iterable<Iterable<Integer>>, Iterable<Integer>>) iterableConcat)
.build();

// When
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2016-2024 Crown Copyright
~ Copyright 2016-2025 Crown Copyright
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -64,7 +64,7 @@
<spark.minor.version>2.4</spark.minor.version>
<spark.version>${spark.minor.version}.5</spark.version>

<koryphe.version>2.5.2</koryphe.version>
<koryphe.version>2.6.0</koryphe.version>
<accumulo.version>2.0.1</accumulo.version>
<avro.version>1.8.2</avro.version>
<hadoop.version>3.3.3</hadoop.version>
Expand Down

0 comments on commit 0c98f2c

Please sign in to comment.