Commit graph

459 commits

Author SHA1 Message Date
Chris Price
869f09eeac Update test for clojars cert expiration date - fixes #2170 2016-07-12 12:43:59 -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
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
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
Alex Hall
61fd4de9db Catch and handle fixture errors during tests 2016-04-29 21:56:23 +00:00
Jean Niklas L'orange
540142bc55 Keep whitelist-keys for backwards compatibility 2016-02-17 23:53:40 +01:00
Chris Price
f981ddd247 Honor whitelist settings when javac called via jar - fixes #2089
This commit refactors a few things from the `jar` and
`javac` tasks in order to ensure that the "whitelisted"
settings from the user profile (`:local-repo`, `:mirrors`,
etc.) are honored when the `jar` task launches `javac`.

It also adds a test to validate the new behavior.
2016-02-16 12:15:41 -08:00
Jean Niklas L'orange
51f80c1298 Clojure 1.8.0 2016-01-21 11:08:58 +01:00
Chris Price
ef4e178f81 (#2043) release task: support SNAPSHOTs on qualifiers
Prior to this commit, the `lein release` task was not
really usable for releases that had qualifiers such
as `-alpha1`, `-beta2`, or `-RC1`.

The reason for this is that the code for parsing the
semver could not handle a qualifier like `-alpha1`
AND a `-SNAPSHOT` qualifier at the same time.

The default `:release-tasks` include a `bump-version`
at the `:release` level, and then the release, and
then a `bump-version` at the `:patch` level.  If
you had a version that started out as `1.0.0-alpha1` *or*
`1.0.0-alpha1-SNAPSHOT`, then the `:release` bump
would always set the version to `1.0.0`.  Then the
actual release would occur, and then the `:patch` bump
would take you to `1.0.1-SNAPSHOT`.

With this commit, `qualifier` and `snapshot` are
separated into two separate fields in the version map.
This allows us to modify the `bump-version` behavior
so that it works as one would expect with a qualifier
like `alpha`:

```clj
(is (= (bump-version "1.0.0-alpha1-SNAPSHOT" :release)
       "1.0.0-alpha1"))
(is (= (bump-version "1.0.0-alpha1")
       "1.0.0-alpha2-SNAPSHOT"))
```

This allows the default `:release-tasks` setup to be
used with qualifiers like alpha/beta.

The commit also adds a new `level` that can be passed
to the `change` task: `:qualifier`.  If this level
is passed, then the qualifier will be incremented
instead of the major/minor/patch.  It is a superset
of the existing alpha/beta/RC behavior but works with
arbitrary qualifier strings.
2015-12-24 14:25:46 -08:00
Jean Niklas L'orange
3b0bd543e4 Merge pull request #1988
Conflicts:
	test/leiningen/test/new.clj
2015-09-20 17:25:53 +02:00
Jean Niklas L'orange
a8907c496d Add CHANGELOG.md to tests. 2015-09-20 17:18:40 +02:00
Jean Niklas L'orange
af387e9e7c Merge pull request #1970 from Hardtack/master
Fix #1785
2015-09-20 15:43:35 +02:00
Daniel Compton
eb98e855cf Add option to not sign tags when running "vcs" "tag"
- Add vcs tag commandline argument parser
- Update documentation to show new options

Fixes #1873, fixes #1799
2015-09-11 09:29:53 +12:00
Jeremy Allard
bdc2e3ab33 Change the file-not-found test to be less strict on the output 2015-09-08 01:35:49 -04:00
GunWoo Choi
d9fa141629 Add test for new template with mirror settings 2015-08-30 16:59:55 +09:00
Jean Niklas L'orange
3ba4fde633 Cleanup files after test. 2015-08-08 16:55:39 +02:00
Jean Niklas L'orange
7284785a77 Do not include repl deps as test deps, fixes #1771
While it's a good thought to have them as test dependencies, it just
breaks everything if you transitively depend on it.
2015-08-08 16:48:32 +02:00
Phil Hagelberg
2ea050fc67 Merge pull request #1941 from towler73/master
added fix for components.xml merging.  If the description tag contain…
2015-07-30 08:45:16 +07:00
Brett Morgan
79f0d3a99a added fix for components.xml merging. If the description tag contained embedded html, it needs to be escaped in the resulting merged components.xml. 2015-07-23 11:12:07 -04:00
Stephen Nelson
f413b6d73f Add support for reader conditional files (cljc)
Clojure 1.7.0 will add support for reader conditionals:

http://dev.clojure.org/display/design/Reader+Conditionals

This patch adds reader conditional support to leiningen, in particular for
compilation (including aot and stale files) and testing.
2015-07-19 08:52:49 +12:00
Stephen Nelson
6e0ebc20f7 Upgrade clojure dependency to 1.7.0 2015-07-16 15:11:01 +12:00
Jean Niklas L'orange
4ab6de9b9c Bump nrepl dependency. 2015-07-09 15:32:01 +02:00
Jean Niklas L'orange
ff84da6972 Chas isn't wasting time, I can tell you that. 2015-03-24 21:56:17 +01:00
Jean Niklas L'orange
00e158f6f3 Bump standalone nrepl version as well, ref #1861. 2015-03-21 00:37:46 +01:00
Jean Niklas L'orange
c35a1de4f0 Avoid wrapping shell pipes in writers, fixes #1857
The fix is actually very easy: Instead of piping stuff into a reader,
then feed it to *out*/*err* via a writer, we directly hook them to
System.out and System.err.

The problem is that it kills many tests that rely on `with-out-str`, so
we have to include `with-system-err/out-str` macros to catch
sysout/syserr data, and replace usage where tests fail.
2015-03-21 00:12:26 +01:00
Jean Niklas L'orange
4bc49ec5bf Stringify run args by default, closes #1835.
You can bypass this by using the escape hatch `--quote-args`, which will
quote the arguments before passing them in.
2015-02-21 17:38:48 +01:00
Jean Niklas L'orange
6b8e74eaee Bump nrepl version, fixes #1829. 2015-02-10 20:40:33 +01:00
Tim Pope
6ff23a922b Don't require port for drawbridge URLs 2015-01-20 19:13:01 -05:00
m00nlight
ac302d3125 Add hgignore for programmer prefer mercurial DRCS 2014-12-29 11:16:39 +08:00
Phil Hagelberg
bebce21441 Use main/abort instead of throwing exception in clean. 2014-12-05 09:25:22 -08:00
Jim Crossley
0e20baf378 Account for absolute target paths 2014-12-03 14:31:17 -05:00
Jim Crossley
d3297be9da Add test for cleaning spliced target path 2014-12-03 09:16:43 -05:00
Sebastian Hennebrueder
8ebeed1f27 Check if project data is available where needed for deploy tasks 2014-11-15 09:54:43 -08:00
Hugo Duncan
942cbee34a Fix jar task for :classifiers
The classified jar files were not being generated due to incorrect
arguments in code.
2014-10-24 21:08:55 -04:00
Phil Hagelberg
37f3c2535f Merge pull request #1696 from hugoduncan/fix-profiles-on-aliases
Fix with-profile alias changes
2014-10-11 20:10:02 -07:00
Phil Hagelberg
bc69a1212d Merge pull request #1700 from circlespainter/circlespainter-manifest-sections
Manifest sections support
2014-10-11 20:08:31 -07:00
Hugo Duncan
bb0b132894 Fix inclusion of explicitly added profiles in jar
Closes #1701
2014-09-25 12:48:44 -04:00
Tim McCormack
5b089a024b Merge branch 'test-1676-fie-encoding' 2014-09-23 13:11:57 -04:00
Tim McCormack
225e24b2c5 Add regression test for file.encoding override 2014-09-23 09:29:26 -04:00
circlespainter
3471153cf3 leiningen.test.jar now covers array-of-pairs maps and sections 2014-09-23 03:05:25 +02:00
Hugo Duncan
c2cc98e660 Add tests for with-profile 2014-09-16 09:16:13 -04:00
Tim McCormack
ef4e459824 Use SimpleDateFormat instead of #inst (flaky)
#inst was failing when run as `lein test`, but not if I ran
`lein test leiningen.test.keys`. Something's screwy with
data-readers.
2014-09-15 17:02:40 -04:00
Jean Niklas L'orange
9e980b0f8a Bump nREPL version to 0.2.6 2014-09-15 01:26:18 +02:00
Hugo Duncan
2da05e6356 Add profile metadata
Adds :leaky and :pom-scope metadata for profiles.  The :dev, :test,
:base and :provided profiles are implemented in terms of these.

Profiles with :leaky metadata affect the pom and jar creation.

Profiles with a :pom-scope metadata of :test or :provided also affect
the dependencies of a pom.
2014-09-09 13:27:49 -04:00
Phil Hagelberg
c8806ff12e Revert addition of :downstream profile.
We need to revisit this in a way that doesn't involve hard-coding
profile names into the jar and pom tasks. The question of whether the
profile should be visible to downstream consumers should be determined
by data that's part of the profile (or metadata).
2014-09-08 10:05:21 -07:00
Phil Hagelberg
58df6c31ad Merge branch 'profiles-from-plugins' 2014-09-06 10:54:47 -07:00
Phil Hagelberg
577e34919b Merge remote-tracking branch 'hugoduncan/fix-unmerge-with-meta-profiles' into profiles-from-plugins
Conflicts:
	src/leiningen/pom.clj
2014-09-05 20:47:02 -07:00
Phil Hagelberg
360e63d6b0 Fix a test. 2014-09-05 20:43:13 -07:00
Phil Hagelberg
0a8c0aaee6 Rename :project profile to :downstream. 2014-09-05 20:24:06 -07:00