diff --git a/.travis.yml b/.travis.yml index 5bd2216..288c488 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: clojure -lein: lein2 +lein: 2.7.1 jdk: - oraclejdk7 - openjdk7 diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c91fb1..c4f92f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 0.3.2 + +This is a minor bugfix release. + +* [TK-464](https://tickets.puppetlabs.com/browse/TK-464) : Fix bug with URL parsing by updating bidi to 2.1.3. Also update clj-parent. + ## 0.3.1 This is a minor bugfix release. diff --git a/MAINTAINERS b/MAINTAINERS new file mode 100644 index 0000000..c6e0173 --- /dev/null +++ b/MAINTAINERS @@ -0,0 +1,18 @@ +{ + "version": 1, + "file_format": "This MAINTAINERS file format is described at http://pup.pt/maintainers", + "issues": "https://tickets.puppetlabs.com/browse/TK", + "internal_list": "https://groups.google.com/a/puppet.com/forum/?hl=en#!forum/discuss-trapperkeeper-maintainers", + "people": [ + { + "github": "rlinehan", + "email": "ruth@puppet.com", + "name": "Ruth Linehan" + }, + { + "github": "scottyw", + "email": "scott.walker@puppet.com", + "name": "Scott Walker" + } + ] +} diff --git a/ext/travisci/test.sh b/ext/travisci/test.sh index c70b626..a34bccc 100755 --- a/ext/travisci/test.sh +++ b/ext/travisci/test.sh @@ -1,3 +1,3 @@ #!/bin/bash -lein2 test :all \ No newline at end of file +lein test :all diff --git a/project.clj b/project.clj index f88aa50..1faa29e 100644 --- a/project.clj +++ b/project.clj @@ -1,22 +1,24 @@ -(defproject puppetlabs/comidi "0.3.1" +(defproject puppetlabs/comidi "0.3.2" :description "Puppet Labs utility functions and compojure-like wrappers for use with the bidi web routing library" :url "https://github.com/puppetlabs/comidi" :pedantic? :abort - :dependencies [[org.clojure/clojure "1.7.0"] - - ;; begin version conflict resolution dependencies - [clj-time "0.10.0"] - ;; end version conflict resolution dependencies + :min-lein-version "2.7.1" - [bidi "1.23.1" :exclusions [org.clojure/clojurescript]] - [compojure "1.4.0"] - [prismatic/schema "1.0.4"] + :parent-project {:coords [puppetlabs/clj-parent "1.6.0"] + :inherit [:managed-dependencies]} - [puppetlabs/kitchensink "1.1.0"]] + :dependencies [[org.clojure/clojure] + + [bidi "2.1.3"] + [compojure] + [prismatic/schema] + [puppetlabs/kitchensink]] :deploy-repositories [["releases" {:url "https://clojars.org/repo" :username :env/clojars_jenkins_username :password :env/clojars_jenkins_password - :sign-releases false}]]) + :sign-releases false}]] + + :plugins [[lein-parent "0.3.1"]]) diff --git a/src/puppetlabs/comidi.clj b/src/puppetlabs/comidi.clj index a8035e0..7994863 100644 --- a/src/puppetlabs/comidi.clj +++ b/src/puppetlabs/comidi.clj @@ -167,11 +167,7 @@ (update-in route-info [:path] conj "!") (sequential? pattern) - (if-let [next (first pattern)] - (update-route-info* - (update-in route-info [:path] conj next) - (rest pattern)) - route-info) + (update-in route-info [:path] into pattern) :else (update-in route-info [:path] conj pattern)))