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.

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

NO AUTO Renames core to common package, makes core and full depend on it #3079

Merged
merged 5 commits into from
Aug 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
with:
name: test-results
path: |
core/build/reports/tests/test/
common/build/reports/tests/test/
full/build/reports/tests/test/
processor/build/reports/tests/test/
test-startup/build/reports/tests/test/
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ downloadLicenses {

allprojects {
group = 'org.neo4j.procedure'
version = project.hasProperty("neo4jVersionOverride") ? project.getProperty("neo4jVersionOverride") : '4.3.0-rc01'
version = project.hasProperty("neo4jVersionOverride") ? project.getProperty("neo4jVersionOverride") : '5.0.0.0-rc01'
archivesBaseName = 'apoc'
description = """neo4j-apoc-procedures"""
}
Expand Down
159 changes: 159 additions & 0 deletions common/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
plugins {
id 'java'
id 'maven-publish'
id 'antlr'
id "org.sonarqube"
id "com.diffplug.spotless" version "6.7.2"
}

spotless {
java {
target 'src/*/java/**/*.java'
removeUnusedImports()
}
}

archivesBaseName = "apoc"

configurations {
apt
}

javadoc {
failOnError = false
options.addStringOption('Xdoclint:none', '-quiet')
}


generateGrammarSource {
arguments += ["-package", "apoc.custom"]
}

dependencies {
testImplementation project(':test-utils')
apt project(':processor')

apt group: 'org.neo4j', name: 'neo4j', version: neo4jVersionEffective
implementation group: 'commons-codec', name: 'commons-codec', version: '1.14'
implementation group: 'com.jayway.jsonpath', name: 'json-path', version: '2.7.0'
implementation group: 'net.minidev', name: 'json-smart', version: '2.4.8'
implementation group: 'org.hdrhistogram', name: 'HdrHistogram', version: '2.1.9'

antlr "org.antlr:antlr4:4.7.2", {
exclude group: 'org.glassfish'
exclude group: 'com.ibm.icu'
exclude group: 'org.abego.treelayout'
}
// compileOnly "org.antlr:antlr4-runtime:4.7.2"
// testCompile "org.antlr:antlr4-runtime:4.7.2"

implementation group: 'org.roaringbitmap', name: 'RoaringBitmap', version: '0.7.17'
implementation(group: 'org.apache.commons', name: 'commons-configuration2', version: '2.8.0') {
exclude group: "org.yaml"
exclude module: "snakeyaml"
exclude module: "commons-lang3"
}
implementation group: 'org.yaml', name: 'snakeyaml', version: '1.26'
testImplementation group: 'com.github.stefanbirkner', name: 'system-rules', version: '1.19.0'
implementation group: 'com.github.seancfoley', name: 'ipaddress', version: '5.3.3'

testImplementation 'net.sourceforge.jexcelapi:jxl:2.6.12'

// This was reported here https://github.com/neo4j-contrib/neo4j-apoc-procedures/issues/3048
implementation(group: 'org.apache.commons', name: 'commons-lang3') {
version {
strictly '3.12.0'
}
}

compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.270'
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.270'

testImplementation group: 'org.reflections', name: 'reflections', version: '0.9.12'
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '1.3'
testImplementation group: 'org.neo4j.test', name: 'neo4j-harness', version: neo4jVersionEffective
testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.2.22.v20170606'
testImplementation group: 'org.apache.derby', name: 'derby', version: '10.12.1.1'

testImplementation group: 'org.neo4j', name: 'neo4j-common', version: neo4jVersionEffective, classifier: "tests"
testImplementation group: 'org.neo4j.community', name: 'it-test-support', version: neo4jVersionEffective // , classifier: "tests"
testImplementation group: 'org.neo4j', name: 'log-test-utils', version: neo4jVersionEffective // , classifier: "tests"


testImplementation group: 'org.neo4j', name: 'neo4j-kernel', version: neo4jVersionEffective, classifier: "tests"
testImplementation group: 'org.neo4j', name: 'neo4j-io', version: neo4jVersionEffective, classifier: "tests"


def withoutServers = {
exclude group: 'org.eclipse.jetty'
exclude group: 'org.eclipse.jetty.aggregate'
exclude group: 'org.apache.hive', module: 'hive-service'
}

def withoutJacksons = {
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-annotations'
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind'
}

compileOnly group: 'org.neo4j', name: 'neo4j', version: neo4jVersionEffective

testImplementation 'org.mock-server:mockserver-netty:5.6.0'
testImplementation 'org.mock-server:mockserver-client-java:5.6.0'

compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-comprehend', version: '1.12.214' , withoutJacksons
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-comprehend', version: '1.12.214' , withoutJacksons

testImplementation group: 'org.codehaus.jackson', name: 'jackson-mapper-asl', version: '1.9.7'
implementation group: 'com.opencsv', name: 'opencsv', version: '4.6'
compileOnly group: 'org.ow2.asm', name: 'asm', version: '5.0.2'

testImplementation group: 'org.apache.hive', name: 'hive-jdbc', version: '1.2.2', withoutServers

compileOnly group: 'org.apache.hadoop', name: 'hadoop-hdfs', version: '3.3.2', withoutServers
compileOnly group: 'org.apache.hadoop', name: 'hadoop-common', version: '3.3.2', withoutServers

implementation group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
//compileOnly group: 'org.apache.commons', name: 'commons-text', version: '1.7'
// jmh group: 'org.neo4j', name: 'neo4j-lucene-index', version: neo4jVersionEffective
// jmh group: 'org.neo4j', name: 'neo4j-kernel', version: neo4jVersionEffective, classifier: "tests"

testImplementation group: 'org.xmlunit', name: 'xmlunit-core', version: '2.2.1'
testImplementation group: 'com.github.adejanovski', name: 'cassandra-jdbc-wrapper', version: '3.1.0'

testImplementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-csv', version: '2.13.2'
testImplementation group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.0'
testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.13.2'
testImplementation group: 'org.mockito', name: 'mockito-core', version: '4.2.0'

compileOnly group: 'com.google.cloud', name: 'google-cloud-storage', version: '2.6.1'
testImplementation group: 'com.google.cloud', name: 'google-cloud-storage', version: '2.6.1', {
exclude group: 'com.google.guava', module: 'guava'
}

implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'

implementation group: 'org.apache.arrow', name: 'arrow-vector', version: '7.0.0', {
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-annotations'
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind'
exclude group: 'io.netty', module: 'netty-common'
}
implementation group: 'org.apache.arrow', name: 'arrow-memory-netty', version: '7.0.0', {
exclude group: 'com.google.guava', module: 'guava'
exclude group: 'io.netty', module: 'netty-common'
exclude group: 'io.netty', module: 'netty-buffer'
}
testImplementation group: 'org.apache.arrow', name: 'arrow-vector', version: '7.0.0'
testImplementation group: 'org.apache.arrow', name: 'arrow-memory-netty', version: '7.0.0'

configurations.all {
exclude group: 'org.slf4j', module: 'slf4j-nop'
exclude group: 'ch.qos.logback', module: 'logback-classic'
}
}

task copyRuntimeLibs(type: Copy) {
into "lib"
from configurations.testRuntimeClasspath
}
File renamed without changes.
Loading