Skip to content

Commit 1141951

Browse files
ali-inceali-ince
authored
Tidy up and upgrade dependencies (#718)
1 parent 9042d80 commit 1141951

File tree

11 files changed

+426
-562
lines changed

11 files changed

+426
-562
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,7 @@ jobs:
1919
with:
2020
distribution: temurin
2121
java-version: 11
22-
23-
- name: Cache Maven packages
24-
uses: actions/cache@v4
25-
with:
26-
path: ~/.m2
27-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
28-
restore-keys: ${{ runner.os }}-m2
22+
cache: 'maven'
2923

3024
- name: Build with Maven
31-
env:
32-
# needed for excluding enterprise tests
33-
TRAVIS: true
3425
run: mvn -B clean test --file pom.xml --no-transfer-progress

‎common/pom.xml‎

Lines changed: 61 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,80 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
54
<modelVersion>4.0.0</modelVersion>
6-
7-
<groupId>org.neo4j</groupId>
8-
<artifactId>neo4j-streams-common</artifactId>
9-
<name>Neo4j Streams - Common</name>
10-
<description>Neo4j Streams - Commons Package</description>
11-
<version>5.0.6</version>
12-
<packaging>jar</packaging>
13-
145
<parent>
156
<groupId>org.neo4j</groupId>
167
<artifactId>neo4j-streams-parent</artifactId>
178
<version>5.0.6</version>
189
</parent>
19-
10+
<artifactId>neo4j-streams-common</artifactId>
11+
<version>5.0.6</version>
12+
<packaging>jar</packaging>
13+
<name>Neo4j Streams - Common</name>
14+
<description>Neo4j Streams - Commons Package</description>
2015
<dependencies>
2116
<dependency>
22-
<groupId>org.neo4j.driver</groupId>
23-
<artifactId>neo4j-java-driver</artifactId>
24-
<scope>provided</scope>
17+
<groupId>com.fasterxml.jackson.module</groupId>
18+
<artifactId>jackson-module-kotlin</artifactId>
19+
</dependency>
20+
<dependency>
21+
<groupId>org.apache.commons</groupId>
22+
<artifactId>commons-lang3</artifactId>
23+
</dependency>
24+
<dependency>
25+
<groupId>org.jetbrains.kotlin</groupId>
26+
<artifactId>kotlin-stdlib-jdk8</artifactId>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.jetbrains.kotlinx</groupId>
30+
<artifactId>kotlinx-coroutines-core</artifactId>
2531
</dependency>
26-
2732
<dependency>
2833
<groupId>org.apache.kafka</groupId>
2934
<artifactId>kafka-clients</artifactId>
3035
<scope>provided</scope>
3136
</dependency>
32-
3337
<dependency>
34-
<groupId>org.apache.commons</groupId>
35-
<artifactId>commons-lang3</artifactId>
38+
<groupId>org.neo4j.driver</groupId>
39+
<artifactId>neo4j-java-driver-slim</artifactId>
40+
<scope>provided</scope>
41+
</dependency>
42+
<dependency>
43+
<groupId>junit</groupId>
44+
<artifactId>junit</artifactId>
45+
<scope>test</scope>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.hamcrest</groupId>
49+
<artifactId>hamcrest-all</artifactId>
50+
<scope>test</scope>
51+
</dependency>
52+
<dependency>
53+
<groupId>org.jetbrains.kotlin</groupId>
54+
<artifactId>kotlin-test-junit</artifactId>
55+
<scope>test</scope>
56+
</dependency>
57+
<dependency>
58+
<groupId>org.mockito</groupId>
59+
<artifactId>mockito-core</artifactId>
60+
<scope>test</scope>
61+
</dependency>
62+
<dependency>
63+
<groupId>org.testcontainers</groupId>
64+
<artifactId>testcontainers</artifactId>
65+
<scope>test</scope>
3666
</dependency>
37-
3867
</dependencies>
39-
68+
<build>
69+
<plugins>
70+
<plugin>
71+
<groupId>org.jetbrains.kotlin</groupId>
72+
<artifactId>kotlin-maven-plugin</artifactId>
73+
</plugin>
74+
<plugin>
75+
<groupId>org.apache.maven.plugins</groupId>
76+
<artifactId>maven-surefire-plugin</artifactId>
77+
</plugin>
78+
</plugins>
79+
</build>
4080
</project>

‎common/src/test/kotlin/streams/utils/JSONUtilsTest.kt‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ package streams.utils
22

33
import org.junit.Test
44
import org.neo4j.driver.Values
5-
import org.neo4j.values.storable.CoordinateReferenceSystem.Cartesian
6-
import org.neo4j.values.storable.CoordinateReferenceSystem.Cartesian_3D
7-
import org.neo4j.values.storable.CoordinateReferenceSystem.WGS84
8-
import org.neo4j.values.storable.CoordinateReferenceSystem.WGS84_3D
95
import streams.events.EntityType
106
import streams.events.Meta
117
import streams.events.NodeChange
@@ -20,6 +16,12 @@ import kotlin.test.assertEquals
2016
import kotlin.test.assertFails
2117

2218
class JSONUtilsTest {
19+
companion object {
20+
const val CARTESIAN_CODE = 7203
21+
const val CARTESIAN_3D_CODE = 9157
22+
const val WGS84_CODE = 4326
23+
const val WGS84_3D_CODE = 4979
24+
}
2325

2426
@Test
2527
fun `should serialize driver Point Data Types`() {
@@ -30,10 +32,10 @@ class JSONUtilsTest {
3032
"\"point3dWgs84\":{\"crs\":\"wgs-84-3d\",\"longitude\":1.0,\"latitude\":2.0,\"height\":3.0}," +
3133
"\"time\":\"14:01:01.000000001Z\",\"dateTime\":\"2017-12-17T17:14:35.123456789Z\"}"
3234

33-
val map = linkedMapOf<String, Any>("point2dCartesian" to Values.point(Cartesian.code, 1.0, 2.0),
34-
"point3dCartesian" to Values.point(Cartesian_3D.code, 1.0, 2.0, 3.0),
35-
"point2dWgs84" to Values.point(WGS84.code, 1.0, 2.0),
36-
"point3dWgs84" to Values.point(WGS84_3D.code, 1.0, 2.0, 3.0),
35+
val map = linkedMapOf<String, Any>("point2dCartesian" to Values.point(CARTESIAN_CODE, 1.0, 2.0),
36+
"point3dCartesian" to Values.point(CARTESIAN_3D_CODE, 1.0, 2.0, 3.0),
37+
"point2dWgs84" to Values.point(WGS84_CODE, 1.0, 2.0),
38+
"point3dWgs84" to Values.point(WGS84_3D_CODE, 1.0, 2.0, 3.0),
3739
"time" to Values.value(OffsetTime.of(14, 1, 1, 1, UTC)),
3840
"dateTime" to Values.value(ZonedDateTime.of(2017, 12, 17, 17, 14, 35, 123456789, UTC)))
3941

‎kafka-connect-neo4j/pom.xml‎

Lines changed: 57 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,88 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0"
2-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5-
6-
<groupId>org.neo4j</groupId>
7-
<artifactId>kafka-connect-neo4j</artifactId>
8-
<version>5.0.6</version>
9-
<packaging>jar</packaging>
10-
11-
<name>Kafka Connect Neo4j</name>
12-
<description>A Kafka Connect Neo4j Connector for kafka-connect-neo4j</description>
13-
145
<parent>
156
<groupId>org.neo4j</groupId>
167
<artifactId>neo4j-streams-parent</artifactId>
178
<version>5.0.6</version>
189
</parent>
19-
10+
<artifactId>kafka-connect-neo4j</artifactId>
11+
<version>5.0.6</version>
12+
<packaging>jar</packaging>
13+
<name>Kafka Connect Neo4j</name>
14+
<description>A Kafka Connect Neo4j Connector for kafka-connect-neo4j</description>
2015
<properties>
21-
<confluent.serializer.version>5.0.0</confluent.serializer.version>
22-
<confluent.connect.plugin.version>0.12.0</confluent.connect.plugin.version>
23-
<mvn.assembly.plugin.version>3.1.0</mvn.assembly.plugin.version>
24-
<kafka.connect.utils.version>0.7.177</kafka.connect.utils.version>
25-
<google.guava.version>33.4.0-jre</google.guava.version>
26-
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
16+
<connector.summary><![CDATA[Support, including for Custom Connectors in Confluent Cloud, through <a href=\"https://neo4j.com/\">Neo4j</a>]]></connector.summary>
2717
<connector.title>Neo4j Connector for Confluent</connector.title>
28-
<connector.summary>
29-
<![CDATA[Support, including for Custom Connectors in Confluent Cloud, through <a href=\"https://neo4j.com/\">Neo4j</a>]]>
30-
</connector.summary>
3118
</properties>
32-
33-
<repositories>
34-
<repository>
35-
<id>confluent</id>
36-
<url>http://packages.confluent.io/maven/</url>
37-
</repository>
38-
</repositories>
39-
4019
<dependencies>
20+
<dependency>
21+
<groupId>com.github.jcustenborder.kafka.connect</groupId>
22+
<artifactId>connect-utils</artifactId>
23+
</dependency>
24+
<dependency>
25+
<groupId>org.jetbrains.kotlin</groupId>
26+
<artifactId>kotlin-stdlib-jdk8</artifactId>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.jetbrains.kotlinx</groupId>
30+
<artifactId>kotlinx-coroutines-core</artifactId>
31+
</dependency>
32+
<dependency>
33+
<groupId>org.neo4j</groupId>
34+
<artifactId>neo4j-streams-common</artifactId>
35+
<version>${project.version}</version>
36+
</dependency>
37+
<dependency>
38+
<groupId>org.neo4j.driver</groupId>
39+
<artifactId>neo4j-java-driver-slim</artifactId>
40+
</dependency>
4141
<dependency>
4242
<groupId>org.apache.kafka</groupId>
4343
<artifactId>connect-api</artifactId>
44-
<version>${kafka.version}</version>
4544
<scope>provided</scope>
4645
</dependency>
4746
<dependency>
48-
<groupId>com.github.jcustenborder.kafka.connect</groupId>
49-
<artifactId>connect-utils</artifactId>
50-
<version>${kafka.connect.utils.version}</version>
47+
<groupId>org.awaitility</groupId>
48+
<artifactId>awaitility</artifactId>
49+
<scope>test</scope>
5150
</dependency>
5251
<dependency>
5352
<groupId>org.hamcrest</groupId>
54-
<artifactId>hamcrest</artifactId>
53+
<artifactId>hamcrest-all</artifactId>
5554
<scope>test</scope>
5655
</dependency>
57-
5856
<dependency>
59-
<groupId>com.google.guava</groupId>
60-
<artifactId>guava</artifactId>
61-
<version>${google.guava.version}</version>
62-
<scope>provided</scope>
57+
<groupId>org.jetbrains.kotlin</groupId>
58+
<artifactId>kotlin-test-junit</artifactId>
59+
<scope>test</scope>
6360
</dependency>
64-
6561
<dependency>
66-
<groupId>org.neo4j</groupId>
67-
<artifactId>neo4j-streams-common</artifactId>
68-
<version>${project.parent.version}</version>
62+
<groupId>org.mockito</groupId>
63+
<artifactId>mockito-core</artifactId>
64+
<scope>test</scope>
6965
</dependency>
70-
7166
<dependency>
7267
<groupId>org.neo4j</groupId>
7368
<artifactId>neo4j-streams-test-support</artifactId>
74-
<version>${project.parent.version}</version>
69+
<version>${project.version}</version>
7570
<scope>test</scope>
7671
</dependency>
77-
78-
<dependency>
79-
<groupId>org.neo4j.driver</groupId>
80-
<artifactId>neo4j-java-driver</artifactId>
81-
</dependency>
8272
</dependencies>
83-
8473
<build>
8574
<plugins>
75+
<plugin>
76+
<groupId>org.jetbrains.kotlin</groupId>
77+
<artifactId>kotlin-maven-plugin</artifactId>
78+
</plugin>
79+
<plugin>
80+
<groupId>org.apache.maven.plugins</groupId>
81+
<artifactId>maven-surefire-plugin</artifactId>
82+
</plugin>
8683
<plugin>
8784
<groupId>org.apache.maven.plugins</groupId>
8885
<artifactId>maven-resources-plugin</artifactId>
89-
<version>${maven-resources-plugin.version}</version>
9086
<configuration>
9187
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
9288
<resources>
@@ -100,7 +96,6 @@
10096
<plugin>
10197
<groupId>io.confluent</groupId>
10298
<artifactId>kafka-connect-maven-plugin</artifactId>
103-
<version>${confluent.connect.plugin.version}</version>
10499
<executions>
105100
<execution>
106101
<goals>
@@ -132,8 +127,7 @@
132127
<documentationUrl>https://neo4j.com/docs/kafka/quickstart-connect/</documentationUrl>
133128
<description>The connector runs on Apache Kafka Connect Clusters to sink data in Kafka
134129
topics into Neo4j and Aura databases and can use Neo4j/Aura as a source for Kafka topics
135-
via Cypher queries.
136-
</description>
130+
via Cypher queries.</description>
137131
<logo>assets/neo4j-logo.png</logo>
138132
<supportSummary>${connector.summary}</supportSummary>
139133
<sourceUrl>https://github.com/neo4j-contrib/neo4j-streams</sourceUrl>
@@ -154,28 +148,23 @@
154148
</plugin>
155149
</plugins>
156150
</build>
157-
158151
<profiles>
159152
<profile>
160153
<id>oss-kafka-connect</id>
154+
<activation>
155+
<activeByDefault>false</activeByDefault>
156+
</activation>
157+
<properties>
158+
<connector.summary><![CDATA[Support, through <a href=\"https://neo4j.com/\">Neo4j</a>]]></connector.summary>
159+
<connector.title>Neo4j Connector for Apache Kafka</connector.title>
160+
</properties>
161161
<dependencies>
162162
<dependency>
163163
<groupId>com.google.guava</groupId>
164164
<artifactId>guava</artifactId>
165-
<version>${google.guava.version}</version>
166165
<scope>compile</scope>
167166
</dependency>
168167
</dependencies>
169-
<activation>
170-
<activeByDefault>false</activeByDefault>
171-
</activation>
172-
<properties>
173-
<connector.title>Neo4j Connector for Apache Kafka</connector.title>
174-
<connector.summary>
175-
<![CDATA[Support, through <a href=\"https://neo4j.com/\">Neo4j</a>]]>
176-
</connector.summary>
177-
</properties>
178168
</profile>
179169
</profiles>
180-
181170
</project>

0 commit comments

Comments
 (0)