Merge tag '0.3.2' into debian/latest
Version 0.3.2
Thomas Goirand
3 years ago
| 0 | 0 |
language: clojure
|
| 1 | |
lein: lein2
|
|
1 |
lein: 2.7.1
|
| 2 | 2 |
jdk:
|
| 3 | 3 |
- oraclejdk7
|
| 4 | 4 |
- openjdk7
|
|
0 |
## 0.3.2
|
|
1 |
|
|
2 |
This is a minor bugfix release.
|
|
3 |
|
|
4 |
* [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.
|
|
5 |
|
| 0 | 6 |
## 0.3.1
|
| 1 | 7 |
|
| 2 | 8 |
This is a minor bugfix release.
|
|
0 |
{
|
|
1 |
"version": 1,
|
|
2 |
"file_format": "This MAINTAINERS file format is described at http://pup.pt/maintainers",
|
|
3 |
"issues": "https://tickets.puppetlabs.com/browse/TK",
|
|
4 |
"internal_list": "https://groups.google.com/a/puppet.com/forum/?hl=en#!forum/discuss-trapperkeeper-maintainers",
|
|
5 |
"people": [
|
|
6 |
{
|
|
7 |
"github": "rlinehan",
|
|
8 |
"email": "ruth@puppet.com",
|
|
9 |
"name": "Ruth Linehan"
|
|
10 |
},
|
|
11 |
{
|
|
12 |
"github": "scottyw",
|
|
13 |
"email": "scott.walker@puppet.com",
|
|
14 |
"name": "Scott Walker"
|
|
15 |
}
|
|
16 |
]
|
|
17 |
}
|
| 0 | 0 |
#!/bin/bash
|
| 1 | 1 |
|
| 2 | |
lein2 test :all⏎
|
|
2 |
lein test :all
|
| 0 | |
(defproject puppetlabs/comidi "0.3.1"
|
|
0 |
(defproject puppetlabs/comidi "0.3.2"
|
| 1 | 1 |
:description "Puppet Labs utility functions and compojure-like wrappers for use with the bidi web routing library"
|
| 2 | 2 |
:url "https://github.com/puppetlabs/comidi"
|
| 3 | 3 |
|
| 4 | 4 |
:pedantic? :abort
|
| 5 | 5 |
|
| 6 | |
:dependencies [[org.clojure/clojure "1.7.0"]
|
| 7 | |
|
| 8 | |
;; begin version conflict resolution dependencies
|
| 9 | |
[clj-time "0.10.0"]
|
| 10 | |
;; end version conflict resolution dependencies
|
|
6 |
:min-lein-version "2.7.1"
|
| 11 | 7 |
|
| 12 | |
[bidi "1.23.1" :exclusions [org.clojure/clojurescript]]
|
| 13 | |
[compojure "1.4.0"]
|
| 14 | |
[prismatic/schema "1.0.4"]
|
|
8 |
:parent-project {:coords [puppetlabs/clj-parent "1.6.0"]
|
|
9 |
:inherit [:managed-dependencies]}
|
| 15 | 10 |
|
| 16 | |
[puppetlabs/kitchensink "1.1.0"]]
|
|
11 |
:dependencies [[org.clojure/clojure]
|
|
12 |
|
|
13 |
[bidi "2.1.3"]
|
|
14 |
[compojure]
|
|
15 |
[prismatic/schema]
|
|
16 |
[puppetlabs/kitchensink]]
|
| 17 | 17 |
|
| 18 | 18 |
:deploy-repositories [["releases" {:url "https://clojars.org/repo"
|
| 19 | 19 |
:username :env/clojars_jenkins_username
|
| 20 | 20 |
:password :env/clojars_jenkins_password
|
| 21 | |
:sign-releases false}]])
|
|
21 |
:sign-releases false}]]
|
|
22 |
|
|
23 |
:plugins [[lein-parent "0.3.1"]])
|
| 166 | 166 |
(update-in route-info [:path] conj "!")
|
| 167 | 167 |
|
| 168 | 168 |
(sequential? pattern)
|
| 169 | |
(if-let [next (first pattern)]
|
| 170 | |
(update-route-info*
|
| 171 | |
(update-in route-info [:path] conj next)
|
| 172 | |
(rest pattern))
|
| 173 | |
route-info)
|
|
169 |
(update-in route-info [:path] into pattern)
|
| 174 | 170 |
|
| 175 | 171 |
:else
|
| 176 | 172 |
(update-in route-info [:path] conj pattern)))
|