Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gh-3256: Dependency updates #3257

Draft
wants to merge 33 commits into
base: develop
Choose a base branch
from
Draft

Gh-3256: Dependency updates #3257

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
7cfd3d1
inital commit
rj77259 Jul 22, 2024
e26062d
tweaks
tb06904 Jul 22, 2024
cf7e17f
gitignore
tb06904 Jul 22, 2024
08ff767
tweak to sketches
tb06904 Jul 22, 2024
b272554
minor changes to test deps
tb06904 Jul 23, 2024
7639369
ensure legacy profile still available
tb06904 Jul 23, 2024
8d60307
jackson version for legacy
tb06904 Jul 23, 2024
5a264fb
fix test assertion
tb06904 Jul 23, 2024
bcee382
java 11 ci
tb06904 Jul 23, 2024
689dd39
revert test changes
tb06904 Jul 23, 2024
0bb038c
version tweaks
tb06904 Jul 23, 2024
b0b6e2f
direct dependecy to time library
tb06904 Jul 23, 2024
93a9327
test dependency
tb06904 Jul 23, 2024
6e2b712
test dependency
tb06904 Jul 24, 2024
d2b0c1b
add direct dependencies
tb06904 Jul 24, 2024
044da97
fix junit integration tests
tb06904 Jul 24, 2024
3dd9e3f
test dependency
tb06904 Jul 24, 2024
5a6e375
test dependency
tb06904 Jul 24, 2024
4d3a662
test dependency
tb06904 Jul 24, 2024
50ad365
refactor rest api test for updated jackson
tb06904 Jul 25, 2024
9d5dd61
revert store test
tb06904 Jul 25, 2024
1fa6b5e
spotless
tb06904 Jul 25, 2024
7f21ccf
test dependency
tb06904 Jul 25, 2024
a6a14c6
test dependency
tb06904 Jul 25, 2024
9a3ba8c
typo
tb06904 Jul 25, 2024
5b705b1
missing test dependency
tb06904 Jul 25, 2024
6d711ea
test dependency
tb06904 Jul 25, 2024
de051a4
mockito dep
tb06904 Jul 25, 2024
7ca18e5
test dependency
tb06904 Jul 25, 2024
d3786c3
store test fix
tb06904 Jul 25, 2024
d7c5d8e
fix data sketches shaded jar
tb06904 Jul 26, 2024
832d64c
Merge remote-tracking branch 'origin/develop' into gh-3256-dependency…
tb06904 Jul 26, 2024
808719f
code ql version
tb06904 Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/continuous-integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '8'
java-version: '11'

- name: Run Spotless copyright check
run: mvn -ntp spotless:check -T0.5C
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '8'
java-version: '11'

- name: Cache dependencies
uses: actions/cache@v4
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ example/real-federated-store/*.properties
example/real-federated-store/*.json
example/real-federated-store/*.jar
.flattened-pom.xml
dependency-reduced-pom.xml
2 changes: 1 addition & 1 deletion core/common-util/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<dependency>
<groupId>uk.gov.gchq.koryphe</groupId>
<artifactId>core</artifactId>
<classifier>jdk8</classifier>
<classifier>${koryphe.classifer}</classifier>
</dependency>
<!-- Opentelementry libraries -->
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions core/data/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependency>
<groupId>uk.gov.gchq.koryphe</groupId>
<artifactId>core</artifactId>
<classifier>jdk8</classifier>
<classifier>${koryphe.classifer}</classifier>
</dependency>
<dependency>
<groupId>uk.gov.gchq.gaffer</groupId>
Expand Down Expand Up @@ -67,7 +67,7 @@
<dependency>
<groupId>uk.gov.gchq.koryphe</groupId>
<artifactId>core</artifactId>
<classifier>tests-jdk8</classifier>
<classifier>${koryphe.test.classifer}</classifier>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion core/operation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<dependency>
<groupId>uk.gov.gchq.koryphe</groupId>
<artifactId>core</artifactId>
<classifier>tests-jdk8</classifier>
<classifier>${koryphe.test.classifer}</classifier>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
16 changes: 4 additions & 12 deletions core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,11 +528,7 @@ public void shouldReturnAllSupportedOperationsWhenJobTrackerIsEnabled(@Mock fina

final List<Class<? extends Operation>> expectedOperations =
Lists.newArrayList(AddElements.class,
GetElements.class,
GetAdjacentIds.class,
GetAllElements.class,

mock(AddElements.class).getClass(),
mock(GetAllElements.class).getClass(),
mock(GetElements.class).getClass(),
mock(GetAdjacentIds.class).getClass(),

Expand Down Expand Up @@ -616,7 +612,7 @@ public void shouldReturnAllSupportedOperationsWhenJobTrackerIsEnabled(@Mock fina

expectedOperations.sort(Comparator.comparing(Class::getName));
supportedOperations.sort(Comparator.comparing(Class::getName));
assertThat(supportedOperations).isEqualTo(expectedOperations);
assertThat(supportedOperations).containsExactlyElementsOf(expectedOperations);
}

@Test
Expand All @@ -640,11 +636,7 @@ public void shouldReturnAllSupportedOperationsWhenJobTrackerIsDisabled(@Mock fin

final List<Class<? extends Operation>> expectedOperations =
Lists.newArrayList(AddElements.class,
GetElements.class,
GetAdjacentIds.class,
GetAllElements.class,

mock(AddElements.class).getClass(),
mock(GetAllElements.class).getClass(),
mock(GetElements.class).getClass(),
mock(GetAdjacentIds.class).getClass(),

Expand Down Expand Up @@ -724,7 +716,7 @@ public void shouldReturnAllSupportedOperationsWhenJobTrackerIsDisabled(@Mock fin

expectedOperations.sort(Comparator.comparing(Class::getName));
supportedOperations.sort(Comparator.comparing(Class::getName));
assertThat(supportedOperations).isEqualTo(expectedOperations);
assertThat(supportedOperations).containsExactlyElementsOf(expectedOperations);
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions core/type/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@
<dependency>
<groupId>uk.gov.gchq.koryphe</groupId>
<artifactId>core</artifactId>
<classifier>jdk8</classifier>
<classifier>${koryphe.classifer}</classifier>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>uk.gov.gchq.koryphe</groupId>
<artifactId>core</artifactId>
<classifier>tests-jdk8</classifier>
<classifier>${koryphe.test.classifer}</classifier>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
5 changes: 3 additions & 2 deletions library/bitmap-library/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>bitmap-library</artifactId>
<version>${revision}</version>

<dependencies>
<dependency>
Expand All @@ -34,7 +35,7 @@
<dependency>
<groupId>uk.gov.gchq.koryphe</groupId>
<artifactId>core</artifactId>
<classifier>jdk8</classifier>
<classifier>${koryphe.classifer}</classifier>
</dependency>
<dependency>
<groupId>org.roaringbitmap</groupId>
Expand All @@ -45,7 +46,7 @@
<dependency>
<groupId>uk.gov.gchq.koryphe</groupId>
<artifactId>core</artifactId>
<classifier>tests-jdk8</classifier>
<classifier>${koryphe.test.classifer}</classifier>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
1 change: 1 addition & 0 deletions library/hdfs-library/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
</parent>

<artifactId>hdfs-library</artifactId>
<version>${revision}</version>

<properties>
<!-- IT is designed to be extended by other classes, cannot be run standalone -->
Expand Down
5 changes: 3 additions & 2 deletions library/sketches-library/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
</parent>

<artifactId>sketches-library</artifactId>
<version>${revision}</version>

<dependencies>
<dependency>
Expand All @@ -39,7 +40,7 @@
<dependency>
<groupId>uk.gov.gchq.koryphe</groupId>
<artifactId>core</artifactId>
<classifier>jdk8</classifier>
<classifier>${koryphe.classifer}</classifier>
</dependency>
<dependency>
<groupId>com.clearspring.analytics</groupId>
Expand All @@ -56,7 +57,7 @@
<dependency>
<groupId>uk.gov.gchq.koryphe</groupId>
<artifactId>core</artifactId>
<classifier>tests-jdk8</classifier>
<classifier>${koryphe.test.classifer}</classifier>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
21 changes: 16 additions & 5 deletions library/time-library/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,36 +24,47 @@
</parent>

<artifactId>time-library</artifactId>
<version>${revision}</version>

<dependencies>
<dependency>
<groupId>uk.gov.gchq.gaffer</groupId>
<artifactId>bitmap-library</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.gchq.gaffer</groupId>
<artifactId>sketches-library</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.roaringbitmap</groupId>
<artifactId>RoaringBitmap</artifactId>
<version>0.5.11</version>
</dependency>
<dependency>
<groupId>org.apache.datasketches</groupId>
<artifactId>datasketches-java</artifactId>
<version>${datasketches.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.gchq.gaffer</groupId>
<artifactId>serialisation</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>uk.gov.gchq.gaffer</groupId>
<artifactId>common-util</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>uk.gov.gchq.koryphe</groupId>
<artifactId>core</artifactId>
<classifier>tests-jdk8</classifier>
<classifier>${koryphe.test.classifer}</classifier>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
22 changes: 13 additions & 9 deletions library/tinkerpop/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
<properties>
<google-guice.version>4.2.3</google-guice.version>
<cucumber.version>7.15.0</cucumber.version>
<!-- Note later versions require scala version 2.12.x -->
<cypher-gremlin.version>1.0.0</cypher-gremlin.version>

<!-- Don't run any of the standard tinkerpop tests by default-->
<test>!GafferPopGraphStructureStandardTest,!GafferPopFeatureTest,!GafferPopGraphProcessStandardTest</test>
Expand All @@ -40,7 +38,7 @@
<dependency>
<groupId>uk.gov.gchq.gaffer</groupId>
<artifactId>graph</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
</dependency>

<!-- TinkerPop dependencies -->
Expand All @@ -65,33 +63,33 @@
<dependency>
<groupId>uk.gov.gchq.gaffer</groupId>
<artifactId>accumulo-store</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>uk.gov.gchq.gaffer</groupId>
<artifactId>map-store</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>uk.gov.gchq.gaffer</groupId>
<artifactId>proxy-store</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>uk.gov.gchq.gaffer</groupId>
<artifactId>jcs-cache-service</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>uk.gov.gchq.gaffer</groupId>
<artifactId>accumulo-store</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand All @@ -100,10 +98,16 @@
<artifactId>accumulo-minicluster</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>uk.gov.gchq.gaffer</groupId>
<artifactId>hdfs-library</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>uk.gov.gchq.gaffer</groupId>
<artifactId>common-util</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
Loading
Loading