Commit graph

4459 commits

Author SHA1 Message Date
Jean Niklas L'orange
c1e1e727ea Merge PR #2157 2016-08-21 20:11:37 +02:00
Jean Niklas L'orange
549e248b09 Merge PR #2152
Conflicts:
	leiningen-core/src/leiningen/core/eval.clj
2016-08-21 19:55:55 +02:00
Chris Price
66fe603c3f Merge pull request #2184 from webappzero/waz-lein-jar-typo
Fix for issue #2183
2016-08-04 07:36:13 -07:00
Jay Martin
4d747bb48d fix typo
Correct name of jar file executed by java command in example.
2016-08-03 16:06:34 -04:00
Jean Niklas L'orange
d165173c41 Merge pull request #2179 from danielcompton/gh-username
Parse GitHub usernames with - in them
2016-07-29 13:07:34 +02:00
Daniel Compton
33eca8dba1 Parse GitHub usernames with - in them
GitHub usernames only allow alphanumeric characters and single hypens.
This commit fixes the regex to allow dashes, and remove _ as _ aren't
valid in Github usernames.
2016-07-29 10:18:14 +12:00
Chris Price
846963b029 Merge pull request #2176 from yatesco/patch-1
refer to '1.1.2'
2016-07-23 06:39:38 -07:00
Colin Yates
d7a4427304 refer to '1.1.2' 2016-07-23 12:29:00 +01:00
Florian Anderiasch
01c451852a Merge pull request #2175 from vredniy/master
tocontrol -> to control in LICENSE files
2016-07-23 00:23:59 +02:00
Dmitry Zudochkin
680f5f0252 tocontrol -> to control in LICENSE files 2016-07-23 01:06:19 +03:00
Chris Price
41febc332c Merge pull request #2164 from cprice404/feature/master/support-reading-proj-from-reader
Add support for reading project from Reader instead of file
2016-07-18 10:35:01 -07:00
Brian Lalonde
e80dff815b Run PowerShell without a profile/execution policy
No $Profile is needed or desired, and the default execution policy is too restrictive.
2016-07-16 12:14:09 -07:00
Brian Lalonde
9ae74a5ed3 Fix proxy issue. 2016-07-16 10:02:49 -07:00
Brian Lalonde
4dcf045650 Port lein.bat to PowerShell
Adds lein.ps1 as a more maintainable, elegant integration for Windows,
with small changes to lein.bat to support it, and lein.cmd as an example
of a minimalist lein.ps1 launcher.
2016-07-16 10:02:49 -07:00
Brian Lalonde
270e7f1c36 Merge remote-tracking branch 'refs/remotes/technomancy/master' 2016-07-16 09:57:46 -07:00
Jean Niklas L'orange
0f6fbaac03 Merge pull request #2172 from winks/new-faqs
Update the FAQ
2016-07-13 19:48:21 +02:00
Florian Anderiasch
523d5eb6f0 Update the FAQ 2016-07-12 23:13:05 +02:00
Chris Price
dda84dc765 Merge pull request #2171 from cprice404/bug/master/2170-update-clojars-cert
Update test for clojars cert expiration date - fixes #2170
2016-07-12 12:59:39 -07:00
Chris Price
869f09eeac Update test for clojars cert expiration date - fixes #2170 2016-07-12 12:43:59 -07:00
Toby Crawley
8fb87da2e7
Provide the current clojars certificate [#2170] 2016-07-12 15:32:56 -04:00
Chris Price
17fa738fd8 Merge pull request #2126 from cprice404/feature/master/2067-support-for-managed-dependencies
(#2067) add support for `managed-dependencies`
2016-07-12 11:33:12 -07:00
Chris Price
eb902a2714 Add support for dependencyManagement section in pom 2016-06-30 16:24:54 -07:00
Chris Price
7ea847d16f Clarify docs, add tests for transitive deps
This commit clarifies some things in the docs based on PR review.
It also adds additional test coverage for managed dependencies;
specifically, a case where two normal dependencies both have
a transitive dependency on the same library, but with different
versions.  The test validates that this conflict is properly
resolved via `:managed-dependencies`.
2016-06-30 10:29:18 -07:00
Chris Price
2fb603b2bf Add managed-dependencies example and docs
This commit adds an example of `:managed-dependencies` to the
sample project, and adds a separate markdown file to provide
more details and examples.
2016-06-27 11:41:59 -07:00
Martin Reck
1939b09bd0 Add an explicit prep call before the test namespaces are calculated.
https://github.com/technomancy/leiningen/issues/1782
2016-06-24 15:46:30 +02:00
Chris Price
2a30d862f6 Add support for reading project from Reader instead of file
In certain cases (e.g. reading a project.clj file out of a jar,
rather than from a file on disk) it is useful for the `read`
and `read-raw` functions to support being passed a `Reader` object,
rather than a File or path.

This commit modifies the `read-raw` function to support being
passed a Reader.  It also modifies the `defproject` macro to
avoid the assumption that `*file*` will always have a non-nil
value, because that assumption causes an NPE in the case where
a Reader is the source of the project definition.
2016-06-23 09:31:20 -07:00
Chris Price
54fda200d7 (#2067) Improve test coverage for managed dependencies
This commit adds some additional dependencies to the test project
file for managed dependencies, and significantly increases the
coverage of the tests.
2016-06-22 14:24:38 -07:00
Chris Price
867b667601 (#2067) Improve comment about call to private pomegranate fn 2016-06-22 11:37:13 -07:00
Chris Price
dd824e572b (#2067) Deprecate 'resolve-dependencies', add managed deps to it
This commit deprecates the `resolve-dependencies` function in
favor of `resolve-managed-dependencies`.  It also conditionally adds
the `:managed-dependencies` key to the execution of the deprecated
function, in hopes of improving backward compatibility for cases
where people are still calling the deprecated version.

It also cleans up a few docstring "TODO"s and adds real docstrings.
2016-06-22 11:22:29 -07:00
Chris Price
27782edb2e (#2067) add support for managed-dependencies
This commit provides initial support for `managed-dependencies`,
where dependency version numbers may be specified in a separate
section called `managed-dependencies`, and those version numbers
will be used for any deps in the main `dependencies` section
that do not explicitly specify a version number.

This is a precursor to being able to specify a "parent" project
that could be used to consolidate version numbers of common
dependencies across a large number of libraries.
2016-06-22 11:20:38 -07:00
Jean Niklas L'orange
49abe11085 Merge pull request #2155 from 3duard0/fix-issue-2082
Fix for issue #2082
2016-06-19 15:41:13 +02:00
Jean Niklas L'orange
eb96ad9a7b Merge pull request #2154 from zackdever/bash-completion-update
Remove 'swank' and add missing commands to bash completion.
2016-06-19 14:31:20 +02:00
Jean Niklas L'orange
773960bc3b Merge pull request #2144 from CannedYerins/master
#2128 Respect :scm :dir in leiningen.vcs/uses-vcs.
2016-06-19 13:16:59 +02:00
Jean Niklas L'orange
d5c37c59d8 Merge pull request #2146 from montoux/fix-2145-jvm-opts-parsing
Fix #2145: extra whitespace added to JVM_OPTS
2016-06-19 12:42:54 +02:00
Jean Niklas L'orange
0e8419a53c Merge pull request #2138 from alexhall/catch-fixture-exceptions
Catch and handle fixture errors during tests
2016-06-19 12:09:26 +02:00
Jean Niklas L'orange
0362964ac0 Fix naming in tutorial, fixes #2130
[ci skip]
2016-06-19 11:05:17 +02:00
Eduardo Seabra Silva
674eb86498 Fix for issue #2156
Usage of with-out-str with eval/sh should be replaced by utils/with-system-out-str
as eval/sh is writing output to System/out.
2016-06-10 01:32:22 -03:00
Eduardo Seabra Silva
8f32541f1b Fix issue #2091 2016-06-09 00:52:56 -03:00
Eduardo Seabra Silva
3b57068121 Fix issue #2082 2016-06-09 00:52:37 -03:00
Zack Dever
5862e78409 Remove 'swank' and add missing commands to bash completion.
Added: change, do, plugin, release, show-profiles, update-in, vcs
2016-06-03 12:06:39 -07:00
Toby Crawley
0bf4ffee5d
Get lein partially working under Java 9
This includes three changes:

* Exclude the dynapath that comes in from bultitude and pomegranate, and
  depend directly on a newer version that operates properly under Java 9
* Ensure we have a modifiable classloader before asking pomegranate to
  modify it. Before Java 9, the AppClassLoader was a URLClassLoader, and
  therefore modifiable. This is no longer the case with Java 9.
* Remove duplicated classpath init code from `eval-in :leiningen`, and
  replace it with a call to `project/init-lein-classpath`. This required
  making the latter function public.

These changes allow some lein functionality to work under Java 9 - there
is a Java 9 issue with data.xml that needs to be fixed before lein's
tests can all pass (http://dev.clojure.org/jira/browse/DXML-32).
2016-05-27 17:28:30 -04:00
Stephen Nelson
f1fc34ee00 Fix #2145: extra whitespace added to JVM_OPTS
Instead of using String.split then recombining arguments to repair broken
quoted arguments, this parser now finds entire arguments using regex matching.
This is more robust, handling extra whitespace (and non-space whitespace)
correctly, while also correctly matching quotations in argument strings and
preserving internal spaces.
2016-05-18 17:44:13 +12:00
Ian Kerins
62cce8db33 Respect :scm :dir in leiningen.vcs/uses-vcs
Fixes #2128.
2016-05-14 20:56:13 -04:00
Alex Hall
61fd4de9db Catch and handle fixture errors during tests 2016-04-29 21:56:23 +00:00
Jean Niklas L'orange
66c7f9a8ea Merge pull request #2135 from dryewo/master
Add support for get-in pprinting to lein-pprint
2016-04-28 09:59:13 +02:00
Dmitrii Balakhonskii
c63301a564 Add support for get-in pprinting 2016-04-27 14:44:40 +02:00
Jean Niklas L'orange
e4d3c1e56c Move away from quoted LEIN_JAR again. 2016-04-25 20:43:32 +02:00
Jean Niklas L'orange
a39a1dc3c9 Merge pull request #2104 from mastersign/mastersign-patch-path-spaces
Quote CLASSPATH while calling Java Fixes #2086
2016-04-25 20:42:28 +02:00
Jean Niklas L'orange
851e608181 Merge pull request #2106 from solatis/patch-1
Fixed character escaping issue
2016-04-25 20:30:28 +02:00
Jean Niklas L'orange
2b5ea893af Merge pull request #2127 from RasterBurn/patch-2
Fix plugin profiles documentation
2016-04-14 13:20:14 +02:00