Skip to content

Commit 8f29611

Browse files
committed
remove maven cache from savant build. Update build instructions in README
1 parent e0d6b76 commit 8f29611

3 files changed

Lines changed: 52 additions & 53 deletions

File tree

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -327,12 +327,12 @@ $ sb int
327327
**Note:** If you do not yet have Savant build tool installed, use the following instructions.
328328

329329
```bash
330-
$ mkdir ~/savant
331-
$ cd ~/savant
332-
$ wget http://savant.inversoft.org/org/savantbuild/savant-core/1.0.0/savant-1.0.0.tar.gz
333-
$ tar xvfz savant-1.0.0.tar.gz
334-
$ ln -s ./savant-1.0.0 current
335-
$ export PATH=$PATH:~/savant/current/bin/
330+
mkdir ~/savant
331+
cd ~/savant
332+
wget http://savant.inversoft.org/org/savantbuild/savant-core/2.0.0-RC.6/savant-2.0.0-RC.6.tar.gz
333+
tar xvfz savant-2.0.0-RC.6.tar.gz
334+
ln -s ./savant-2.0.0-RC.6 current
335+
export PATH=$PATH:~/savant/current/bin/
336336
```
337337

338338
For more information, checkout [savantbuild.org](http://savantbuild.org/).

build.savant

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ project(group: "io.fusionauth", name: "fusionauth-jwt", version: "5.2.4", licens
2020

2121
workflow {
2222
fetch {
23-
// 1. Check local Savant and Maven cache
23+
// 1. Check local Savant cache
2424
cache()
25-
mavenCache()
2625
// 2. Check public Savant repo
2726
url(url: "https://repository.savantbuild.org")
2827
// 3. Pull it from Maven central
@@ -57,12 +56,12 @@ project(group: "io.fusionauth", name: "fusionauth-jwt", version: "5.2.4", licens
5756
/*
5857
* Define Plugins
5958
*/
60-
dependency = loadPlugin(id: "org.savantbuild.plugin:dependency:2.0.0-RC.4")
61-
java = loadPlugin(id: "org.savantbuild.plugin:java:2.0.0-RC.4")
62-
javaTestNG = loadPlugin(id: "org.savantbuild.plugin:java-testng:2.0.0-RC.4")
63-
groovy = loadPlugin(id: "org.savantbuild.plugin:groovy:2.0.0-RC.4")
64-
idea = loadPlugin(id: "org.savantbuild.plugin:idea:2.0.0-RC.4")
65-
release = loadPlugin(id: "org.savantbuild.plugin:release-git:2.0.0-RC.4")
59+
dependency = loadPlugin(id: "org.savantbuild.plugin:dependency:2.0.0-RC.6")
60+
java = loadPlugin(id: "org.savantbuild.plugin:java:2.0.0-RC.6")
61+
javaTestNG = loadPlugin(id: "org.savantbuild.plugin:java-testng:2.0.0-RC.6")
62+
groovy = loadPlugin(id: "org.savantbuild.plugin:groovy:2.0.0-RC.6")
63+
idea = loadPlugin(id: "org.savantbuild.plugin:idea:2.0.0-RC.7")
64+
release = loadPlugin(id: "org.savantbuild.plugin:release-git:2.0.0-RC.6")
6665

6766
/*
6867
* Plugin Settings

fusionauth-jwt.iml

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,73 +16,73 @@
1616
<orderEntry type="module-library">
1717
<library>
1818
<CLASSES>
19-
<root url="jar://$USER_HOME$/.savant/cache/com/fasterxml/jackson/core/jackson-databind/2.14.0/jackson-databind-2.14.0.jar!/" />
19+
<root url="jar://$MODULE_DIR$/.savant/cache/com/fasterxml/jackson/core/jackson-databind/2.14.0/jackson-databind-2.14.0.jar!/" />
2020
</CLASSES>
2121
<JAVADOC />
2222
<SOURCES>
23-
<root url="jar://$USER_HOME$/.savant/cache/com/fasterxml/jackson/core/jackson-databind/2.14.0/jackson-databind-2.14.0-src.jar!/" />
23+
<root url="jar://$MODULE_DIR$/.savant/cache/com/fasterxml/jackson/core/jackson-databind/2.14.0/jackson-databind-2.14.0-src.jar!/" />
2424
</SOURCES>
2525
</library>
2626
</orderEntry>
2727
<orderEntry type="module-library">
2828
<library>
2929
<CLASSES>
30-
<root url="jar://$USER_HOME$/.savant/cache/com/fasterxml/jackson/core/jackson-annotations/2.14.0/jackson-annotations-2.14.0.jar!/" />
30+
<root url="jar://$MODULE_DIR$/.savant/cache/com/fasterxml/jackson/core/jackson-annotations/2.14.0/jackson-annotations-2.14.0.jar!/" />
3131
</CLASSES>
3232
<JAVADOC />
3333
<SOURCES>
34-
<root url="jar://$USER_HOME$/.savant/cache/com/fasterxml/jackson/core/jackson-annotations/2.14.0/jackson-annotations-2.14.0-src.jar!/" />
34+
<root url="jar://$MODULE_DIR$/.savant/cache/com/fasterxml/jackson/core/jackson-annotations/2.14.0/jackson-annotations-2.14.0-src.jar!/" />
3535
</SOURCES>
3636
</library>
3737
</orderEntry>
3838
<orderEntry type="module-library">
3939
<library>
4040
<CLASSES>
41-
<root url="jar://$USER_HOME$/.savant/cache/com/fasterxml/jackson/core/jackson-core/2.14.0/jackson-core-2.14.0.jar!/" />
41+
<root url="jar://$MODULE_DIR$/.savant/cache/com/fasterxml/jackson/core/jackson-core/2.14.0/jackson-core-2.14.0.jar!/" />
4242
</CLASSES>
4343
<JAVADOC />
4444
<SOURCES>
45-
<root url="jar://$USER_HOME$/.savant/cache/com/fasterxml/jackson/core/jackson-core/2.14.0/jackson-core-2.14.0-src.jar!/" />
45+
<root url="jar://$MODULE_DIR$/.savant/cache/com/fasterxml/jackson/core/jackson-core/2.14.0/jackson-core-2.14.0-src.jar!/" />
4646
</SOURCES>
4747
</library>
4848
</orderEntry>
4949
<orderEntry type="module-library" scope="TEST">
5050
<library>
5151
<CLASSES>
52-
<root url="jar://$USER_HOME$/.savant/cache/org/bouncycastle/bc-fips/1.0.2+P1/bc-fips-1.0.2+P1.jar!/" />
52+
<root url="jar://$MODULE_DIR$/.savant/cache/org/bouncycastle/bc-fips/1.0.2+P1/bc-fips-1.0.2+P1.jar!/" />
5353
</CLASSES>
5454
<JAVADOC />
5555
<SOURCES>
56-
<root url="jar://$USER_HOME$/.savant/cache/org/bouncycastle/bc-fips/1.0.2+P1/bc-fips-1.0.2+P1-src.jar!/" />
56+
<root url="jar://$MODULE_DIR$/.savant/cache/org/bouncycastle/bc-fips/1.0.2+P1/bc-fips-1.0.2+P1-src.jar!/" />
5757
</SOURCES>
5858
</library>
5959
</orderEntry>
6060
<orderEntry type="module-library" scope="TEST">
6161
<library>
6262
<CLASSES>
63-
<root url="jar://$USER_HOME$/.savant/cache/org/testng/testng/7.3.0/testng-7.3.0.jar!/" />
63+
<root url="jar://$MODULE_DIR$/.savant/cache/org/testng/testng/7.3.0/testng-7.3.0.jar!/" />
6464
</CLASSES>
6565
<JAVADOC />
6666
<SOURCES>
67-
<root url="jar://$USER_HOME$/.savant/cache/org/testng/testng/7.3.0/testng-7.3.0-src.jar!/" />
67+
<root url="jar://$MODULE_DIR$/.savant/cache/org/testng/testng/7.3.0/testng-7.3.0-src.jar!/" />
6868
</SOURCES>
6969
</library>
7070
</orderEntry>
7171
<orderEntry type="module-library" scope="TEST">
7272
<library>
7373
<CLASSES>
74-
<root url="jar://$USER_HOME$/.savant/cache/com/beust/jcommander/1.78.0/jcommander-1.78.0.jar!/" />
74+
<root url="jar://$MODULE_DIR$/.savant/cache/com/beust/jcommander/1.78.0/jcommander-1.78.0.jar!/" />
7575
</CLASSES>
7676
<JAVADOC />
7777
<SOURCES>
78-
<root url="jar://$USER_HOME$/.savant/cache/com/beust/jcommander/1.78.0/jcommander-1.78.0-src.jar!/" />
78+
<root url="jar://$MODULE_DIR$/.savant/cache/com/beust/jcommander/1.78.0/jcommander-1.78.0-src.jar!/" />
7979
</SOURCES>
8080
</library>
8181
</orderEntry>
8282
<orderEntry type="module-library" scope="TEST">
8383
<library>
8484
<CLASSES>
85-
<root url="jar://$USER_HOME$/.savant/cache/com/google/inject/guice/4.2.2/guice-no_aop-4.2.2.jar!/" />
85+
<root url="jar://$MODULE_DIR$/.savant/cache/com/google/inject/guice/4.2.2/guice-no_aop-4.2.2.jar!/" />
8686
</CLASSES>
8787
<JAVADOC />
8888
<SOURCES />
@@ -91,143 +91,143 @@
9191
<orderEntry type="module-library" scope="TEST">
9292
<library>
9393
<CLASSES>
94-
<root url="jar://$USER_HOME$/.savant/cache/javax/inject/javax.inject/1.0.0/javax.inject-1.0.0.jar!/" />
94+
<root url="jar://$MODULE_DIR$/.savant/cache/javax/inject/javax.inject/1.0.0/javax.inject-1.0.0.jar!/" />
9595
</CLASSES>
9696
<JAVADOC />
9797
<SOURCES>
98-
<root url="jar://$USER_HOME$/.savant/cache/javax/inject/javax.inject/1.0.0/javax.inject-1.0.0-src.jar!/" />
98+
<root url="jar://$MODULE_DIR$/.savant/cache/javax/inject/javax.inject/1.0.0/javax.inject-1.0.0-src.jar!/" />
9999
</SOURCES>
100100
</library>
101101
</orderEntry>
102102
<orderEntry type="module-library" scope="TEST">
103103
<library>
104104
<CLASSES>
105-
<root url="jar://$USER_HOME$/.savant/cache/org/aopalliance/aopalliance/1.0.0/aopalliance-1.0.0.jar!/" />
105+
<root url="jar://$MODULE_DIR$/.savant/cache/org/aopalliance/aopalliance/1.0.0/aopalliance-1.0.0.jar!/" />
106106
</CLASSES>
107107
<JAVADOC />
108108
<SOURCES>
109-
<root url="jar://$USER_HOME$/.savant/cache/org/aopalliance/aopalliance/1.0.0/aopalliance-1.0.0-src.jar!/" />
109+
<root url="jar://$MODULE_DIR$/.savant/cache/org/aopalliance/aopalliance/1.0.0/aopalliance-1.0.0-src.jar!/" />
110110
</SOURCES>
111111
</library>
112112
</orderEntry>
113113
<orderEntry type="module-library" scope="TEST">
114114
<library>
115115
<CLASSES>
116-
<root url="jar://$USER_HOME$/.savant/cache/com/google/guava/guava/25.1.0-android/guava-25.1.0-android.jar!/" />
116+
<root url="jar://$MODULE_DIR$/.savant/cache/com/google/guava/guava/25.1.0-android/guava-25.1.0-android.jar!/" />
117117
</CLASSES>
118118
<JAVADOC />
119119
<SOURCES>
120-
<root url="jar://$USER_HOME$/.savant/cache/com/google/guava/guava/25.1.0-android/guava-25.1.0-android-src.jar!/" />
120+
<root url="jar://$MODULE_DIR$/.savant/cache/com/google/guava/guava/25.1.0-android/guava-25.1.0-android-src.jar!/" />
121121
</SOURCES>
122122
</library>
123123
</orderEntry>
124124
<orderEntry type="module-library" scope="TEST">
125125
<library>
126126
<CLASSES>
127-
<root url="jar://$USER_HOME$/.savant/cache/org/checkerframework/checker-compat-qual/2.0.0/checker-compat-qual-2.0.0.jar!/" />
127+
<root url="jar://$MODULE_DIR$/.savant/cache/org/checkerframework/checker-compat-qual/2.0.0/checker-compat-qual-2.0.0.jar!/" />
128128
</CLASSES>
129129
<JAVADOC />
130130
<SOURCES>
131-
<root url="jar://$USER_HOME$/.savant/cache/org/checkerframework/checker-compat-qual/2.0.0/checker-compat-qual-2.0.0-src.jar!/" />
131+
<root url="jar://$MODULE_DIR$/.savant/cache/org/checkerframework/checker-compat-qual/2.0.0/checker-compat-qual-2.0.0-src.jar!/" />
132132
</SOURCES>
133133
</library>
134134
</orderEntry>
135135
<orderEntry type="module-library" scope="TEST">
136136
<library>
137137
<CLASSES>
138-
<root url="jar://$USER_HOME$/.savant/cache/com/google/j2objc/j2objc-annotations/1.1.0/j2objc-annotations-1.1.0.jar!/" />
138+
<root url="jar://$MODULE_DIR$/.savant/cache/com/google/j2objc/j2objc-annotations/1.1.0/j2objc-annotations-1.1.0.jar!/" />
139139
</CLASSES>
140140
<JAVADOC />
141141
<SOURCES>
142-
<root url="jar://$USER_HOME$/.savant/cache/com/google/j2objc/j2objc-annotations/1.1.0/j2objc-annotations-1.1.0-src.jar!/" />
142+
<root url="jar://$MODULE_DIR$/.savant/cache/com/google/j2objc/j2objc-annotations/1.1.0/j2objc-annotations-1.1.0-src.jar!/" />
143143
</SOURCES>
144144
</library>
145145
</orderEntry>
146146
<orderEntry type="module-library" scope="TEST">
147147
<library>
148148
<CLASSES>
149-
<root url="jar://$USER_HOME$/.savant/cache/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar!/" />
149+
<root url="jar://$MODULE_DIR$/.savant/cache/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar!/" />
150150
</CLASSES>
151151
<JAVADOC />
152152
<SOURCES>
153-
<root url="jar://$USER_HOME$/.savant/cache/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-src.jar!/" />
153+
<root url="jar://$MODULE_DIR$/.savant/cache/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-src.jar!/" />
154154
</SOURCES>
155155
</library>
156156
</orderEntry>
157157
<orderEntry type="module-library" scope="TEST">
158158
<library>
159159
<CLASSES>
160-
<root url="jar://$USER_HOME$/.savant/cache/com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3.jar!/" />
160+
<root url="jar://$MODULE_DIR$/.savant/cache/com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3.jar!/" />
161161
</CLASSES>
162162
<JAVADOC />
163163
<SOURCES>
164-
<root url="jar://$USER_HOME$/.savant/cache/com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3-src.jar!/" />
164+
<root url="jar://$MODULE_DIR$/.savant/cache/com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3-src.jar!/" />
165165
</SOURCES>
166166
</library>
167167
</orderEntry>
168168
<orderEntry type="module-library" scope="TEST">
169169
<library>
170170
<CLASSES>
171-
<root url="jar://$USER_HOME$/.savant/cache/org/codehaus/mojo/animal-sniffer-annotations/1.14.0/animal-sniffer-annotations-1.14.0.jar!/" />
171+
<root url="jar://$MODULE_DIR$/.savant/cache/org/codehaus/mojo/animal-sniffer-annotations/1.14.0/animal-sniffer-annotations-1.14.0.jar!/" />
172172
</CLASSES>
173173
<JAVADOC />
174174
<SOURCES>
175-
<root url="jar://$USER_HOME$/.savant/cache/org/codehaus/mojo/animal-sniffer-annotations/1.14.0/animal-sniffer-annotations-1.14.0-src.jar!/" />
175+
<root url="jar://$MODULE_DIR$/.savant/cache/org/codehaus/mojo/animal-sniffer-annotations/1.14.0/animal-sniffer-annotations-1.14.0-src.jar!/" />
176176
</SOURCES>
177177
</library>
178178
</orderEntry>
179179
<orderEntry type="module-library" scope="TEST">
180180
<library>
181181
<CLASSES>
182-
<root url="jar://$USER_HOME$/.savant/cache/org/yaml/snakeyaml/1.21.0/snakeyaml-1.21.0.jar!/" />
182+
<root url="jar://$MODULE_DIR$/.savant/cache/org/yaml/snakeyaml/1.21.0/snakeyaml-1.21.0.jar!/" />
183183
</CLASSES>
184184
<JAVADOC />
185185
<SOURCES>
186-
<root url="jar://$USER_HOME$/.savant/cache/org/yaml/snakeyaml/1.21.0/snakeyaml-1.21.0-src.jar!/" />
186+
<root url="jar://$MODULE_DIR$/.savant/cache/org/yaml/snakeyaml/1.21.0/snakeyaml-1.21.0-src.jar!/" />
187187
</SOURCES>
188188
</library>
189189
</orderEntry>
190190
<orderEntry type="module-library" scope="TEST">
191191
<library>
192192
<CLASSES>
193-
<root url="jar://$USER_HOME$/.savant/cache/org/junit/junit/4.12.0/junit-4.12.0.jar!/" />
193+
<root url="jar://$MODULE_DIR$/.savant/cache/org/junit/junit/4.12.0/junit-4.12.0.jar!/" />
194194
</CLASSES>
195195
<JAVADOC />
196196
<SOURCES>
197-
<root url="jar://$USER_HOME$/.savant/cache/org/junit/junit/4.12.0/junit-4.12.0-src.jar!/" />
197+
<root url="jar://$MODULE_DIR$/.savant/cache/org/junit/junit/4.12.0/junit-4.12.0-src.jar!/" />
198198
</SOURCES>
199199
</library>
200200
</orderEntry>
201201
<orderEntry type="module-library" scope="TEST">
202202
<library>
203203
<CLASSES>
204-
<root url="jar://$USER_HOME$/.savant/cache/org/hamcrest/hamcrest-core/1.3.0/hamcrest-core-1.3.0.jar!/" />
204+
<root url="jar://$MODULE_DIR$/.savant/cache/org/hamcrest/hamcrest-core/1.3.0/hamcrest-core-1.3.0.jar!/" />
205205
</CLASSES>
206206
<JAVADOC />
207207
<SOURCES>
208-
<root url="jar://$USER_HOME$/.savant/cache/org/hamcrest/hamcrest-core/1.3.0/hamcrest-core-1.3.0-src.jar!/" />
208+
<root url="jar://$MODULE_DIR$/.savant/cache/org/hamcrest/hamcrest-core/1.3.0/hamcrest-core-1.3.0-src.jar!/" />
209209
</SOURCES>
210210
</library>
211211
</orderEntry>
212212
<orderEntry type="module-library" scope="TEST">
213213
<library>
214214
<CLASSES>
215-
<root url="jar://$USER_HOME$/.savant/cache/org/apache/ant/ant/1.10.3/ant-1.10.3.jar!/" />
215+
<root url="jar://$MODULE_DIR$/.savant/cache/org/apache/ant/ant/1.10.3/ant-1.10.3.jar!/" />
216216
</CLASSES>
217217
<JAVADOC />
218218
<SOURCES>
219-
<root url="jar://$USER_HOME$/.savant/cache/org/apache/ant/ant/1.10.3/ant-1.10.3-src.jar!/" />
219+
<root url="jar://$MODULE_DIR$/.savant/cache/org/apache/ant/ant/1.10.3/ant-1.10.3-src.jar!/" />
220220
</SOURCES>
221221
</library>
222222
</orderEntry>
223223
<orderEntry type="module-library" scope="TEST">
224224
<library>
225225
<CLASSES>
226-
<root url="jar://$USER_HOME$/.savant/cache/org/apache/ant/ant-launcher/1.10.3/ant-launcher-1.10.3.jar!/" />
226+
<root url="jar://$MODULE_DIR$/.savant/cache/org/apache/ant/ant-launcher/1.10.3/ant-launcher-1.10.3.jar!/" />
227227
</CLASSES>
228228
<JAVADOC />
229229
<SOURCES>
230-
<root url="jar://$USER_HOME$/.savant/cache/org/apache/ant/ant-launcher/1.10.3/ant-launcher-1.10.3-src.jar!/" />
230+
<root url="jar://$MODULE_DIR$/.savant/cache/org/apache/ant/ant-launcher/1.10.3/ant-launcher-1.10.3-src.jar!/" />
231231
</SOURCES>
232232
</library>
233233
</orderEntry>

0 commit comments

Comments
 (0)