Skip to content

Commit ec554c8

Browse files
committed
deploy the boot/base uberjar to Clojars
1 parent e715563 commit ec554c8

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ aetheruber = aether.uber.jar
1414
workerjar = boot/worker/target/worker-$(version).jar
1515
corejar = boot/core/target/core-$(version).jar
1616
basejar = boot/base/target/base-$(version).jar
17-
baseuber = boot/base/target/base-$(version)-jar-with-dependencies.jar
17+
baseuber = boot/base/target/base-$(version)-uber.jar
1818
alljars = $(podjar) $(aetherjar) $(workerjar) $(corejar) $(baseuber) $(bootjar)
1919
java_version = $(shell java -version 2>&1 | awk -F '"' '/version/ {print $$2}' |awk -F. '{print $$1 "." $$2}')
2020

@@ -69,6 +69,7 @@ $(corejar): $(verfile) boot/core/project.clj $(shell find boot/core/src)
6969

7070
$(baseuber): boot/base/pom.xml $(shell find boot/base/src/main)
7171
(cd boot/base && mvn -q assembly:assembly -DdescriptorId=jar-with-dependencies)
72+
(cd boot/base && mv target/base-$(version)-jar-with-dependencies.jar target/base-$(version)-uber.jar)
7273

7374
.installed: mkdirs $(basejar) $(alljars)
7475
cp $(baseuber) $(distjar)
@@ -84,7 +85,7 @@ install: .installed
8485
@echo -e "\033[0;33m<< Java version: $(java_version) >>\033[0m"
8586
@[ "$(java_version)" == "1.7" ] \
8687
|| (echo -e "\033[0;31mYou must build with Java version 1.7 only.\033[0m" && false)
87-
(cd boot/base && lein deploy clojars boot/base $(version) target/base-$(version).jar pom.xml)
88+
(cd boot/base && lein deploy clojars boot/base $(version) target/base-$(version)-uber.jar pom.xml)
8889
(cd boot/pod && lein deploy clojars)
8990
(cd boot/aether && lein deploy clojars)
9091
(cd boot/worker && lein deploy clojars)

0 commit comments

Comments
 (0)