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.

Sign up for GitHub

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

Jump to bottom

(SERVER-1494) introduce lein parent project #154

Merged
merged 4 commits into from
Oct 7, 2016
Merged

(SERVER-1494) introduce lein parent project #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe8501d
(MAINT) remove lein-release and spyscope
cprice404 Sep 12, 2016
d27cbcc
(SERVER-1494) Initial consumption of parent project
cprice404 Sep 13, 2016
bf1a17f
(SERVER-1494) move remaining (PL) versions to parent
cprice404 Sep 13, 2016
87007cb
(MAINT) Remove uberjar section
cprice404 Sep 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: clojure
lein: lein2
lein: 2.7.1
jdk:
- oraclejdk7
- openjdk7
Expand Down
64 changes: 26 additions & 38 deletions project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,27 @@
(def tk-version "1.3.1")
(def ks-version "1.3.0")
(def jetty-version "9.2.10.v20150310")

(defproject puppetlabs/trapperkeeper-webserver-jetty9 "1.5.11-SNAPSHOT"
:description "A jetty9-based webserver implementation for use with the puppetlabs/trapperkeeper service framework."
:url "https://github.com/puppetlabs/trapperkeeper-webserver-jetty9"
:license {:name "Apache License, Version 2.0"
:url "http://www.apache.org/licenses/LICENSE-2.0"}

:min-lein-version "2.7.1"

:parent-project {:coords [puppetlabs/clj-parent "0.1.3"]
:inherit [:managed-dependencies]}

;; Abort when version ranges or version conflicts are detected in
;; dependencies. Also supports :warn to simply emit warnings.
;; requires lein 2.2.0+.
:pedantic? :abort
:dependencies [[org.clojure/clojure "1.7.0"]

;; begin version conflict resolution dependencies
[clj-time "0.9.0"]
[org.clojure/tools.reader "1.0.0-beta1"]
;; end version conflict resolution dependencies

[org.clojure/java.jmx "0.3.1"]
[org.clojure/tools.logging "0.2.6"]
[prismatic/schema "1.0.4"]
:dependencies [[org.clojure/clojure]
[org.clojure/java.jmx]
[org.clojure/tools.logging]

[puppetlabs/ssl-utils "0.8.1"]
[puppetlabs/kitchensink ~ks-version]
[puppetlabs/trapperkeeper ~tk-version]

[org.codehaus.janino/janino "2.7.8"]
[org.codehaus.janino/janino]

[javax.servlet/javax.servlet-api "3.1.0"]

;; Jetty Webserver
[org.eclipse.jetty/jetty-server ~jetty-version
:exclusions [org.eclipse.jetty.orbit/javax.servlet]]
Expand All @@ -40,16 +32,19 @@
[org.eclipse.jetty/jetty-jmx ~jetty-version]
[org.eclipse.jetty.websocket/websocket-server ~jetty-version]

[ring/ring-servlet "1.4.0"]
[ring/ring-codec "1.0.0"]]
[prismatic/schema]
[ring/ring-servlet]
[ring/ring-codec]

[puppetlabs/ssl-utils]
[puppetlabs/kitchensink]
[puppetlabs/trapperkeeper]
]

:source-paths ["src"]
:java-source-paths ["java"]

:plugins [[lein-release "1.0.5" :exclusions [org.clojure/clojure]]]

:lein-release {:scm :git
:deploy-via :lein-deploy}
:plugins [[lein-parent "0.3.1"]]

:deploy-repositories [["releases" {:url "https://clojars.org/repo"
:username :env/clojars_jenkins_username
Expand All @@ -71,27 +66,20 @@
"examples/webrouting_app/src"]
:java-source-paths ["examples/servlet_app/src/java"
"test/java"]
:dependencies [[puppetlabs/http-client "0.5.0"]
[puppetlabs/kitchensink ~ks-version :classifier "test"]
[puppetlabs/trapperkeeper ~tk-version :classifier "test"]
[org.clojure/tools.namespace "0.2.10"]
[spyscope "0.1.4"]
[compojure "1.1.8" :exclusions [ring/ring-core
commons-io
org.clojure/tools.macro]]
:dependencies [[puppetlabs/http-client]
[puppetlabs/kitchensink nil :classifier "test"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we take out the nil references here since you said lein 2.7.1 doesn't require them? Either way seems fine to me.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just gonna leave 'em for now, Mr. Rock.

[puppetlabs/trapperkeeper nil :classifier "test"]
[org.clojure/tools.namespace]
[compojure]
[stylefruits/gniazdo "0.4.0" :exclusions [org.eclipse.jetty.websocket/websocket-api
org.eclipse.jetty.websocket/websocket-client
org.eclipse.jetty/jetty-util]]
[ring/ring-core "1.4.0"]]
:injections [(require 'spyscope.core)]
[ring/ring-core]]
;; Enable SSLv3 for unit tests that exercise SSLv3
:jvm-opts ["-Djava.security.properties=./dev-resources/java.security"]}

:testutils {:source-paths ^:replace ["test/clj"]
:java-source-paths ^:replace ["test/java"]}
:uberjar {:aot [puppetlabs.trapperkeeper.main]
:classifiers ^:replace []
:dependencies [[org.clojure/tools.nrepl "0.2.6" :scope "test" :exclusions [[org.clojure/clojure]]]]}}
:java-source-paths ^:replace ["test/java"]}}

:main puppetlabs.trapperkeeper.main
)