Skip to content

Commit 1fc3bde

Browse files
committedMar 24, 2020
Initial stand-alone build.
Fixed some unit tests.
1 parent da3064a commit 1fc3bde

File tree

6 files changed

+78
-14
lines changed

6 files changed

+78
-14
lines changed
 

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "cass-config-definitions"]
2+
path = cass-config-definitions
3+
url = git@github.com:datastax/cass-config-definitions.git

‎build.gradle

+71-11
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,47 @@
11
/*
2-
* Copyright DataStax, Inc.
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
39
*
4-
* Please see the included license file for details.
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
517
*/
18+
plugins {
19+
id 'dev.clojurephant.clojure' version '0.5.0'
20+
id 'maven-publish'
21+
}
22+
23+
description = "Cassandra/DSE Configuration Builder Library"
24+
group = 'datastax'
25+
version = '0.1.0-SNAPSHOT'
26+
27+
repositories {
28+
mavenCentral()
29+
maven {
30+
name = 'clojars'
31+
url = 'https://repo.clojars.org'
32+
}
33+
}
34+
35+
sourceCompatibility = 1.8
36+
targetCompatibility = 1.8
637

7-
description = "DataStax Configuration Builder Library"
38+
clojure {
39+
builds {
40+
main {
41+
aotAll()
42+
}
43+
}
44+
}
845

946
sourceSets {
1047
main {
@@ -40,16 +77,39 @@ configurations {
4077
}
4178

4279
dependencies {
43-
compile "org.clojure:core.match:0.3.0-alpha5"
44-
compile "org.clojure:core.memoize:0.5.9"
45-
compile "slingshot:slingshot:0.12.2"
46-
compile "org.yaml:snakeyaml:1.23"
47-
compile "cheshire:cheshire:5.8.0"
48-
compile ("selmer:selmer:0.9.7") { // templating lib
80+
implementation "org.clojure:clojure:1.10.1"
81+
implementation "org.clojure:core.match:0.3.0-alpha5"
82+
implementation "org.clojure:core.memoize:0.5.9"
83+
implementation "slingshot:slingshot:0.12.2"
84+
implementation "org.yaml:snakeyaml:1.23"
85+
implementation "cheshire:cheshire:5.8.0"
86+
implementation ("selmer:selmer:0.9.7") { // templating lib
4987
exclude module: 'hiccups'
5088
exclude module: 'cheshire'
5189
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
5290
exclude group: 'com.fasterxml.jackson.dataformat', module: 'jackson-dataformat-smile'
5391
}
54-
testCompile "junit:junit:4.12"
55-
}
92+
devImplementation "org.clojure:tools.namespace:0.3.0-alpha4"
93+
testImplementation "junit:junit:4.12"
94+
}
95+
96+
97+
publishing {
98+
publications {
99+
main(MavenPublication) {
100+
from components.java
101+
}
102+
}
103+
104+
/* TODO: point to artifactory */
105+
repositories {
106+
maven {
107+
name = 'clojars'
108+
url = 'https://repo.clojars.org'
109+
credentials {
110+
username = System.env['CLOJARS_USER']
111+
password = System.env['CLOJARS_PASSWORD']
112+
}
113+
}
114+
}
115+
}

‎cass-config-definitions

Submodule cass-config-definitions added at 6beddd0

‎test/com/datastax/configbuilder/test_data.clj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
;; If it is necessary to evict the cache, the test should
1111
;; call reset-definitions-data!.
1212

13-
(def definitions-location "../definitions/resources")
13+
(def definitions-location "cass-config-definitions/resources")
1414

1515
(defn- load-definitions-data
1616
[definitions-data product datastax-version]

‎test/data/configs/dse-6.0.11/jvm.options

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-Dcassandra.force_default_indexing_page_size=true
88
-Dcassandra.join_ring=true
99
-Dcassandra.load_ring_state=true
10-
-Dcassandra.write_survey=true
10+
-Dcassandra.write_survey=false
1111
-ea
1212
-XX:G1RSetUpdatingPauseTimePercent=5
1313
-XX:GCLogFileSize=10M

‎test/data/configs/dse-6.7.7/jvm.options

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-Dcassandra.force_default_indexing_page_size=true
88
-Dcassandra.join_ring=true
99
-Dcassandra.load_ring_state=true
10-
-Dcassandra.write_survey=true
10+
-Dcassandra.write_survey=false
1111
-ea
1212
-XX:G1RSetUpdatingPauseTimePercent=5
1313
-XX:GCLogFileSize=10M

0 commit comments

Comments
 (0)