Skip to content

Commit

Permalink
Bring build up to date with Gradle 6.0 and Java 11
Browse files Browse the repository at this point in the history
  • Loading branch information
joshsh committed Oct 8, 2022
1 parent eff1b8d commit 636ddb1
Show file tree
Hide file tree
Showing 22 changed files with 418 additions and 257 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "smsn-hydra/hydra"]
path = smsn-models/hydra
url = git@github.com:CategoricalData/hydra.git
46 changes: 25 additions & 21 deletions brain/build.gradle
Original file line number Diff line number Diff line change
@@ -1,27 +1,31 @@
configurations {
testOutput
testOutput
}

dependencies {
compile project(':smsn-rdf')
compile group: 'org.apache.tinkerpop', name: 'gremlin-core', version:tinkerpopVersion
compile group: 'org.apache.tinkerpop', name: 'tinkergraph-gremlin', version:tinkerpopVersion
compile group: 'org.apache.tinkerpop', name: 'neo4j-gremlin', version:tinkerpopVersion
compile group: 'org.neo4j', name: 'neo4j-tinkerpop-api-impl', version:neo4jTinkerpopApiVersion
compile group: 'org.apache.lucene', name: 'lucene-analyzers', version:luceneVersion
compile group: 'org.openrdf.sesame', name: 'sesame-rio-api', version:sesameVersion
compile(group: 'org.openrdf.sesame', name: 'sesame-sail-memory', version:sesameVersion) {
exclude(module: 'commons-codec')
}
compile group: 'com.atlassian.commonmark', name: 'commonmark', version:'0.8.0'
compile group: 'commons-lang', name: 'commons-lang', version:'2.6'
compile(group: 'commons-validator', name: 'commons-validator', version:'1.4.0') {
exclude(module: 'commons-logging')
}
testCompile group: 'org.openrdf.sesame', name: 'sesame-rio-ntriples', version:sesameVersion
testCompile group: 'org.openrdf.sesame', name: 'sesame-repository-sail', version:sesameVersion
testCompile group: 'org.openrdf.sesame', name: 'sesame-queryalgebra-evaluation', version:sesameVersion
testCompile group: 'junit', name: 'junit', version:junitVersion
implementation project(':smsn-core')
implementation project(':smsn-rdf')

testOutput sourceSets.test.output
implementation 'org.json:json:20220924'

implementation group: 'org.apache.tinkerpop', name: 'gremlin-core', version: tinkerpopVersion
implementation group: 'org.apache.tinkerpop', name: 'tinkergraph-gremlin', version: tinkerpopVersion
implementation group: 'org.apache.tinkerpop', name: 'neo4j-gremlin', version: tinkerpopVersion
implementation group: 'org.neo4j', name: 'neo4j-tinkerpop-api-impl', version: neo4jTinkerpopApiVersion
implementation group: 'org.apache.lucene', name: 'lucene-analyzers', version: luceneVersion
implementation group: 'org.openrdf.sesame', name: 'sesame-rio-api', version: sesameVersion
implementation(group: 'org.openrdf.sesame', name: 'sesame-sail-memory', version: sesameVersion) {
exclude(module: 'commons-codec')
}
implementation group: 'com.atlassian.commonmark', name: 'commonmark', version: '0.8.0'
implementation group: 'commons-lang', name: 'commons-lang', version: '2.6'
implementation(group: 'commons-validator', name: 'commons-validator', version: '1.4.0') {
exclude(module: 'commons-logging')
}
testImplementation group: 'org.openrdf.sesame', name: 'sesame-rio-ntriples', version: sesameVersion
testImplementation group: 'org.openrdf.sesame', name: 'sesame-repository-sail', version: sesameVersion
testImplementation group: 'org.openrdf.sesame', name: 'sesame-queryalgebra-evaluation', version: sesameVersion
testImplementation group: 'junit', name: 'junit', version: junitVersion

testOutput sourceSets.test.output
}
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ public class KnowledgeBaseTest extends BrainTestBase {
protected TopicGraph createTopicGraph() throws IOException {
return createNeo4jTopicGraph();
}

@Test
public void testAKASyntax() throws Exception {
NoteClass t = AKAReference.class.newInstance();
Expand Down
50 changes: 26 additions & 24 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,39 +1,41 @@
allprojects {
apply plugin: 'maven'
//apply plugin: 'maven'

group = 'net.fortytwo.smsn'
version = '1.5'
group = 'net.fortytwo.smsn'
version = '1.5'
}

subprojects {
apply plugin: 'java'
sourceCompatibility = 1.8
targetCompatibility = 1.8
tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
}
apply plugin: 'java'
sourceCompatibility = 1.8
targetCompatibility = 1.8
tasks.withType(JavaCompile) {
// options.release = 8
options.encoding = 'UTF-8'
}

repositories {
mavenCentral()
mavenLocal()
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
}
repositories {
mavenCentral()
mavenLocal()
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
}

test {
exclude '**/**IT.*'
}
test {
exclude '**/**IT.*'
}
}

//task wrapper(type: Wrapper) {
// gradleVersion = '4.4.1'
//}

ext {
junitVersion = '4.12'
luceneVersion = '3.6.2'
neo4jTinkerpopApiVersion = '0.3-2.3.3'
rdfagentsVersion = '1.3'
sesameVersion = '4.1.2'
stream42Version = '1.2'
tinkerpopVersion = '3.2.5'
junitVersion = '4.12'
luceneVersion = '3.6.2'
neo4jTinkerpopApiVersion = '0.3-2.3.3'
rdfagentsVersion = '1.3'
rippleVersion = '1.5'
sesameVersion = '4.1.2'
stream42Version = '1.2'
tinkerpopVersion = '3.2.5'
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip

0 comments on commit 636ddb1

Please sign in to comment.