Skip to content

Commit

Permalink
[6AtySekS] Bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
loveleif committed May 15, 2024
1 parent 2abb6f8 commit b58a3dc
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 20 deletions.
3 changes: 1 addition & 2 deletions LICENSES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ Apache-2.0
parboiled-core-1.2.0.jar
parboiled-scala_2.12-1.2.0.jar
picocli-4.6.1.jar
reactor-core-3.4.15.jar
reactor-core-3.6.5.jar
reload4j-1.2.22.jar
scala-library-2.12.13.jar
scala-reflect-2.12.13.jar
Expand Down Expand Up @@ -3096,7 +3096,6 @@ Public Domain, per Creative Commons CC0
jersey-container-servlet-2.34.jar
jersey-container-servlet-core-2.34.jar
jersey-hk2-2.34.jar
reactive-streams-1.0.3.jar
------------------------------------------------------------------------------

Creative Commons Legal Code
Expand Down
3 changes: 1 addition & 2 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ Apache-2.0
parboiled-core-1.2.0.jar
parboiled-scala_2.12-1.2.0.jar
picocli-4.6.1.jar
reactor-core-3.4.15.jar
reactor-core-3.6.5.jar
reload4j-1.2.22.jar
scala-library-2.12.13.jar
scala-reflect-2.12.13.jar
Expand Down Expand Up @@ -481,7 +481,6 @@ Public Domain, per Creative Commons CC0
jersey-container-servlet-2.34.jar
jersey-container-servlet-core-2.34.jar
jersey-hk2-2.34.jar
reactive-streams-1.0.3.jar

The GNU General Public License (GPL), Version 2, With Classpath Exception
jersey-common-2.34.jar
Expand Down
23 changes: 11 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ plugins {
id "com.diffplug.spotless" version "6.7.2"
}

ext {
// Move to gradle.properties (but versions.json generation build depends on this right now)
neo4jVersion = '4.4.34'
publicDir = "${project.rootDir}"
neo4jVersionEffective = project.hasProperty("neo4jVersionOverride") ? project.getProperty("neo4jVersionOverride") : neo4jVersion
neo4jDockerVersion = project.hasProperty("neo4jDockerVersionOverride") ? project.getProperty("neo4jDockerVersionOverride") : neo4jVersion
testContainersVersion = '1.17.6'
}

subprojects {
apply plugin: "com.diffplug.spotless"
apply plugin: 'java-library'
Expand All @@ -27,7 +36,6 @@ downloadLicenses {

allprojects {
group = 'org.neo4j.procedure'
version = '4.4.0.28'
base {
archivesName = 'apoc'
}
Expand Down Expand Up @@ -88,8 +96,8 @@ subprojects {
// neo4jDockerImage system property is used in TestContainerUtil
systemProperties 'user.language' : 'en' ,
'user.country ' : 'US',
'neo4jDockerImage' : project.hasProperty("neo4jDockerVersionOverride") ? 'neo4j:' + project.getProperty("neo4jDockerVersionOverride") + '-enterprise-debian' : 'neo4j:4.4.34-enterprise-debian',
'neo4jCommunityDockerImage': project.hasProperty("neo4jDockerVersionOverride") ? 'neo4j:' + project.getProperty("neo4jDockerVersionOverride") + '-debian': 'neo4j:4.4.34-debian'
'neo4jDockerImage' : "neo4j:${neo4jDockerVersion}-enterprise-debian",
'neo4jCommunityDockerImage': "neo4j:${neo4jDockerVersion}-debian"

maxHeapSize = "5G"
forkEvery = 50
Expand Down Expand Up @@ -122,7 +130,6 @@ subprojects {
apt
}


compileJava {
options.annotationProcessorPath = configurations.apt
options.compilerArgs += ["-AIgnoreContextWarnings"]
Expand All @@ -132,11 +139,3 @@ subprojects {

apply from: "licenses-3rdparties.gradle"

ext {
publicDir = "${project.rootDir}"
// NB: due to version.json generation by parsing this file, the next line must not have any if/then/else logic
neo4jVersion = "4.4.34"
// instead we apply the override logic here
neo4jVersionEffective = project.hasProperty("neo4jVersionOverride") ? project.getProperty("neo4jVersionOverride") : neo4jVersion
testContainersVersion = '1.17.6'
}
2 changes: 1 addition & 1 deletion docs/asciidoc/antora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ asciidoc:
docs-version: "4.4"
branch: "4.4"
apoc-release-absolute: "4.4"
apoc-release: "4.4.0.28"
apoc-release: "4.4.0.29"
json-path-version: "2.8.0"
1 change: 0 additions & 1 deletion extra-dependencies/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ configure(subprojects) {


subprojects {
version = '4.4.0.28'
group = 'org.neo4j.contrib'
}

Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
org.gradle.jvmargs=-Xmx5G -XX:MaxMetaspaceSize=256m
org.gradle.jvmargs=-Xmx5G -XX:MaxMetaspaceSize=256m
version=4.4.0.29 # Bumping version? Don't forget to change readme.adoc and antora.yml
2 changes: 1 addition & 1 deletion readme.adoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
:readme:
:branch: 4.4
:docs: https://neo4j.com/labs/apoc/4.4
:apoc-release: 4.4.0.28
:apoc-release: 4.4.0.29
:neo4j-version: 4.4.34
:img: https://raw.githubusercontent.com/neo4j-contrib/neo4j-apoc-procedures/{branch}/docs/images

Expand Down

0 comments on commit b58a3dc

Please sign in to comment.