ci: update build resources and prepare for release

neo4j · Jun 1, 2024 · f41f7a2 · f41f7a2
1 parent 42ecbc5
commit f41f7a2
Show file tree

Hide file tree

Showing 41 changed files with 141 additions and 126 deletions.
diff --git a/.teamcity/builds/Build.kt b/.teamcity/builds/Build.kt
@@ -6,59 +6,59 @@ import jetbrains.buildServer.configs.kotlin.toId
 import jetbrains.buildServer.configs.kotlin.triggers.vcs
 
 class Build(
-  name: String,
-  branchFilter: String,
-  forPullRequests: Boolean,
-  triggerRules: String? = null
+    name: String,
+    branchFilter: String,
+    forPullRequests: Boolean,
+    triggerRules: String? = null
 ) :
-  Project(
-      {
-        this.id(name.toId())
-        this.name = name
+    Project(
+        {
+          this.id(name.toId())
+          this.name = name
 
-        val complete = Empty("${name}-complete", "complete")
+          val complete = Empty("${name}-complete", "complete")
 
-        val bts = sequential {
-          if (forPullRequests)
-            buildType(WhiteListCheck("${name}-whitelist-check", "white-list check"))
-          if (forPullRequests) dependentBuildType(PRCheck("${name}-pr-check", "pr check"))
-          dependentBuildType(
-              Maven(
-                  "${name}-build",
-                  "build",
-                  "test-compile",
-                  "",
-              ),
-          )
-          dependentBuildType(
-              Maven(
-                  "${name}-test",
-                  "test",
-                  "verify",
-                  size = LinuxSize.LARGE,
-              ),
-          )
-          dependentBuildType(complete)
-          if (!forPullRequests)
-            collectArtifacts(dependentBuildType(Release("${name}-release", "release")))
-        }
+          val bts = sequential {
+            if (forPullRequests)
+                buildType(WhiteListCheck("${name}-whitelist-check", "white-list check"))
+            if (forPullRequests) dependentBuildType(PRCheck("${name}-pr-check", "pr check"))
+            dependentBuildType(
+                Maven(
+                    "${name}-build",
+                    "build",
+                    "test-compile",
+                    "",
+                ),
+            )
+            dependentBuildType(
+                Maven(
+                    "${name}-test",
+                    "test",
+                    "verify",
+                    size = LinuxSize.LARGE,
+                ),
+            )
+            dependentBuildType(complete)
+            if (!forPullRequests)
+                collectArtifacts(dependentBuildType(Release("${name}-release", "release")))
+          }
 
-        bts.buildTypes().forEach {
-          it.thisVcs()
+          bts.buildTypes().forEach {
+            it.thisVcs()
 
-          it.features {
-            enableCommitStatusPublisher()
-            if (forPullRequests) enablePullRequests()
-          }
+            it.features {
+              enableCommitStatusPublisher()
+              if (forPullRequests) enablePullRequests()
+            }
 
-          buildType(it)
-        }
+            buildType(it)
+          }
 
-        complete.triggers {
-          vcs {
-            this.branchFilter = branchFilter
-            this.triggerRules = triggerRules
+          complete.triggers {
+            vcs {
+              this.branchFilter = branchFilter
+              this.triggerRules = triggerRules
+            }
           }
-        }
-      },
-  )
+        },
+    )
diff --git a/.teamcity/builds/Common.kt b/.teamcity/builds/Common.kt
@@ -63,8 +63,8 @@ fun collectArtifacts(buildType: BuildType): BuildType {
 }
 
 fun BuildSteps.runMaven(
-  javaVersion: String = JAVA_VERSION,
-  init: MavenBuildStep.() -> Unit
+    javaVersion: String = JAVA_VERSION,
+    init: MavenBuildStep.() -> Unit
 ): MavenBuildStep {
   val maven =
       this.maven {
@@ -86,10 +86,10 @@ fun BuildSteps.setVersion(name: String, version: String): MavenBuildStep {
 }
 
 fun BuildSteps.commitAndPush(
-  name: String,
-  commitMessage: String,
-  includeFiles: String = "\\*pom.xml",
-  dryRunParameter: String = "dry-run"
+    name: String,
+    commitMessage: String,
+    includeFiles: String = "\\*pom.xml",
+    dryRunParameter: String = "dry-run"
 ): ScriptBuildStep {
   return this.script {
     this.name = name
@@ -108,8 +108,8 @@ fun BuildSteps.commitAndPush(
 }
 
 fun BuildSteps.publishToMavenCentral(
-  name: String,
-  dryRunParameter: String = "dry-run"
+    name: String,
+    dryRunParameter: String = "dry-run"
 ): ScriptBuildStep {
   return this.script {
     this.name = name

diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <project>
     <modelVersion>4.0.0</modelVersion>
-    <name>BuildResources Config DSL Script</name>
-    <groupId>BuildResources</groupId>
+    <name>CDC Client Config DSL Script</name>
+    <groupId>org.neo4j.connectors.cdc</groupId>
     <artifactId>teamcity-pipeline</artifactId>
     <version>1.0-SNAPSHOT</version>
 

diff --git a/LICENSES.txt b/LICENSES.txt
@@ -280,9 +280,9 @@ MIT No Attribution License
   reactive-streams
 ------------------------------------------------------------------------------
 
-The MIT No Attribution License
+MIT No Attribution
 
-Copyright <YEAR> <COPYRIGHT HOLDER>
+Copyright <year> <copyright holders>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this
 software and associated documentation files (the "Software"), to deal in the Software
@@ -299,3 +299,4 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 
+
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -1,5 +1,5 @@
 Copyright (c) "Neo4j"
-Neo4j Sweden AB [http://neo4j.com]
+Neo4j Sweden AB [https://neo4j.com]
 
 This file is part of Neo4j.
 

diff --git a/pom.xml b/pom.xml
@@ -8,44 +8,56 @@
     <packaging>jar</packaging>
     <name>cdc</name>
     <description>CDC Client Library</description>
+    <url>http://github.com/neo4j/neo4j-cdc-client</url>
+    <inceptionYear>2023</inceptionYear>
+    <organization>
+        <name>Neo4j, Neo4j Sweden AB</name>
+        <url>https://neo4j.com</url>
+    </organization>
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
             <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
         </license>
     </licenses>
-    <distributionManagement>
-        <repository>
-            <id>github</id>
-            <name>Github Packages</name>
-            <url>https://maven.pkg.github.com/neo4j/neo4j-cdc-client</url>
-        </repository>
-    </distributionManagement>
+    <developers>
+        <developer>
+            <id>team-connectors</id>
+            <name>Connectors Team</name>
+            <organization>Neo4j</organization>
+            <organizationUrl>https://neo4j.com</organizationUrl>
+        </developer>
+    </developers>
+    <scm>
+        <connection>scm:git:git://github.com/neo4j/neo4j-cdc-client.git</connection>
+        <developerConnection>scm:git:git@github.com:neo4j/neo4j-cdc-client.git</developerConnection>
+        <url>https://github.com/neo4j/neo4j-cdc-client</url>
+    </scm>
     <properties>
-        <annotations.version>24.0.1</annotations.version>
+        <annotations.version>24.1.0</annotations.version>
         <antlr4.version>4.13.1</antlr4.version>
-        <assertj-core.version>3.24.2</assertj-core.version>
-        <build-resources.version>1.0.0</build-resources.version>
+        <assertj-core.version>3.26.0</assertj-core.version>
+        <build-resources.version>2024-05.1</build-resources.version>
         <commons-collections4.version>4.4</commons-collections4.version>
         <java.version>11</java.version>
         <junit-jupiter.version>5.10.0</junit-jupiter.version>
-        <license-maven-plugin.version>4.2</license-maven-plugin.version>
+        <license-maven-plugin.version>4.5</license-maven-plugin.version>
         <licensing-maven-plugin.version>1.7.11</licensing-maven-plugin.version>
-        <licensing.prepend.text>/licensing/notice-asl-prefix.txt</licensing.prepend.text>
-        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+        <licensing.prepend.text>/license/neo4j_apache_v2/notice.txt</licensing.prepend.text>
+        <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
         <maven-enforcer-plugin.version>3.3.0</maven-enforcer-plugin.version>
         <maven-failsafe-plugin.version>3.1.2</maven-failsafe-plugin.version>
-        <maven-javadoc-plugin.version>3.6.2</maven-javadoc-plugin.version>
-        <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
+        <maven-javadoc-plugin.version>3.7.0</maven-javadoc-plugin.version>
+        <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
         <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
-        <neo4j-java-driver.version>4.4.9</neo4j-java-driver.version>
+        <neo4j-java-driver.version>4.4.17</neo4j-java-driver.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <reactive-streams.version>1.0.4</reactive-streams.version>
-        <reactor.version>3.5.10</reactor.version>
+        <reactor.version>3.6.6</reactor.version>
         <slf4j-api.version>1.7.36</slf4j-api.version>
         <sortpom-maven-plugin.version>3.3.0</sortpom-maven-plugin.version>
         <spotless-maven-plugin.version>2.38.0</spotless-maven-plugin.version>
-        <testcontainers.version>1.19.0</testcontainers.version>
+        <testcontainers.version>1.19.8</testcontainers.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -105,6 +117,12 @@
             <version>${junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>${slf4j-api.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
@@ -118,12 +136,6 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>github</id>
-            <url>https://maven.pkg.github.com/neo4j/connectors-build-resources</url>
-        </pluginRepository>
-    </pluginRepositories>
     <build>
         <plugins>
             <plugin>
@@ -140,8 +152,8 @@
                 </configuration>
                 <dependencies>
                     <dependency>
-                        <groupId>org.neo4j.connectors</groupId>
-                        <artifactId>build-resources</artifactId>
+                        <groupId>org.neo4j.build</groupId>
+                        <artifactId>resources</artifactId>
                         <version>${build-resources.version}</version>
                     </dependency>
                 </dependencies>
@@ -204,7 +216,7 @@
                     <strictCheck>true</strictCheck>
                     <licenseSets>
                         <licenseSet>
-                            <header>/headers/ASL-2-header.txt</header>
+                            <header>/license/neo4j_apache_v2/header.txt</header>
                             <includes>
                                 <include>src/**/*.kt</include>
                                 <include>src/**/*.java</include>
@@ -217,8 +229,8 @@
                 </configuration>
                 <dependencies>
                     <dependency>
-                        <groupId>org.neo4j.connectors</groupId>
-                        <artifactId>build-resources</artifactId>
+                        <groupId>org.neo4j.build</groupId>
+                        <artifactId>resources</artifactId>
                         <version>${build-resources.version}</version>
                     </dependency>
                 </dependencies>

diff --git a/src/main/java/org/neo4j/cdc/client/CDCClient.java b/src/main/java/org/neo4j/cdc/client/CDCClient.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) "Neo4j"
- * Neo4j Sweden AB [http://neo4j.com]
+ * Neo4j Sweden AB [https://neo4j.com]
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/neo4j/cdc/client/CDCService.java b/src/main/java/org/neo4j/cdc/client/CDCService.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) "Neo4j"
- * Neo4j Sweden AB [http://neo4j.com]
+ * Neo4j Sweden AB [https://neo4j.com]
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/neo4j/cdc/client/ResultMapper.java b/src/main/java/org/neo4j/cdc/client/ResultMapper.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) "Neo4j"
- * Neo4j Sweden AB [http://neo4j.com]
+ * Neo4j Sweden AB [https://neo4j.com]
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/neo4j/cdc/client/SessionConfigSupplier.java b/src/main/java/org/neo4j/cdc/client/SessionConfigSupplier.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) "Neo4j"
- * Neo4j Sweden AB [http://neo4j.com]
+ * Neo4j Sweden AB [https://neo4j.com]
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/neo4j/cdc/client/model/CaptureMode.java b/src/main/java/org/neo4j/cdc/client/model/CaptureMode.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) "Neo4j"
- * Neo4j Sweden AB [http://neo4j.com]
+ * Neo4j Sweden AB [https://neo4j.com]
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/neo4j/cdc/client/model/ChangeEvent.java b/src/main/java/org/neo4j/cdc/client/model/ChangeEvent.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) "Neo4j"
- * Neo4j Sweden AB [http://neo4j.com]
+ * Neo4j Sweden AB [https://neo4j.com]
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/neo4j/cdc/client/model/ChangeIdentifier.java b/src/main/java/org/neo4j/cdc/client/model/ChangeIdentifier.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) "Neo4j"
- * Neo4j Sweden AB [http://neo4j.com]
+ * Neo4j Sweden AB [https://neo4j.com]
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/neo4j/cdc/client/model/EntityEvent.java b/src/main/java/org/neo4j/cdc/client/model/EntityEvent.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) "Neo4j"
- * Neo4j Sweden AB [http://neo4j.com]
+ * Neo4j Sweden AB [https://neo4j.com]
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/neo4j/cdc/client/model/EntityOperation.java b/src/main/java/org/neo4j/cdc/client/model/EntityOperation.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) "Neo4j"
- * Neo4j Sweden AB [http://neo4j.com]
+ * Neo4j Sweden AB [https://neo4j.com]
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/neo4j/cdc/client/model/Event.java b/src/main/java/org/neo4j/cdc/client/model/Event.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) "Neo4j"
- * Neo4j Sweden AB [http://neo4j.com]
+ * Neo4j Sweden AB [https://neo4j.com]
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/neo4j/cdc/client/model/EventType.java b/src/main/java/org/neo4j/cdc/client/model/EventType.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) "Neo4j"
- * Neo4j Sweden AB [http://neo4j.com]
+ * Neo4j Sweden AB [https://neo4j.com]
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.