Commit graph

856 commits

Author SHA1 Message Date
Phil Hagelberg
df3f67269f Merge pull request #1676 from timmc/alt-jvm-encoding
Allow $LEIN_JVM_OPTS to override -Dfile.encoding
2014-09-08 09:51:06 -07:00
Tim McCormack
6696f11341 Allow JVM file.encoding to be overridden by anything.
This allows profiles to set a -Dfile.encoding. Later, perhaps in 3.0,
JVM_OPTS should perhaps be moved farther down the list (along with
:jvm-opts?) -- but that could be a breaking change. (Environment is
sometimes set locally, sometimes set globally.)
2014-09-08 09:17:06 -04:00
Nelson Morris
c142b24598 Show pedantic warnings and use profile merging to let deps :tree warn correctly 2014-09-07 20:42:48 -05: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
a9cf70e160 Revert "Apply profiles from middleware in main"
This reverts commit fe1be7d2dc.

Conflicts:
	leiningen-core/src/leiningen/core/main.clj
	leiningen-core/src/leiningen/core/project.clj
2014-09-05 20:28:17 -07:00
Phil Hagelberg
6a7a35d062 Make leiningen.core.project/read init the project.
Add a raw-read alternative that reads without initializing.

This solves a certain chicken/egg problem with wanting to read profiles
from plugins before the plugins had been loaded.
2014-09-05 20:24:20 -07:00
Phil Hagelberg
0a8c0aaee6 Rename :project profile to :downstream. 2014-09-05 20:24:06 -07:00
Phil Hagelberg
e13312d344 Merge remote-tracking branch 'hugoduncan/feature/add-project-profile' into profiles-from-plugins 2014-09-05 19:29:35 -07:00
Phil Hagelberg
ec01608956 Fix loading profiles from plugins.
This does it too late in the process for plugin profiles to be
referenced from :default, but it's a start.
2014-09-05 09:24:33 -07:00
Phil Hagelberg
e9c9ff4883 Document in-plugin profiles. 2014-09-04 19:25:58 -07:00
Jean Niklas L'orange
f95a10d79b Use warn instead of println for warnings.
For classpath in lein-core.
2014-09-04 19:19:56 +02:00
Colin Jones
6fb558ad19 Bump nREPL & REPLy versions (to 0.2.5 & 0.3.5)
closes #1658
2014-09-04 09:42:39 -05:00
Phil Hagelberg
c12f9df081 Allow profiles to be loaded out of plugins.
Still needs testing.

Fixes #1672.
2014-09-02 18:52:35 -07:00
Hugo Duncan
fe1be7d2dc Apply profiles from middleware in main
When loading the project, ensure that profiles contributed by middleware
are correctly applied.
2014-09-01 07:29:23 -04:00
Hugo Duncan
7b8c1521ff Add a :project profile
The :project profile is not un-merged when building a jar or generating
a pom, so can be used to alter the basic layout of a project.

This allows plugins such as cljx and cljsbuild to provide profiles that
the project can choose to use to set source-paths, etc, leading to less
error-prone configuration in common use cases.

Fixes #1665
2014-09-01 07:03:58 -04:00
Hugo Duncan
8389a0b928 Fix pom with non-default :default profile
Unmerge expanded its profiles based on the profiles in the project
map (which don't include :default), rather than profiles in the
:profiles metadata.

The :default keys were also hard coded in the pom generation, so ignored
any additions.

This is in support of https://github.com/lynaghk/cljx/pull/48
2014-08-30 16:56:07 -04:00
Phil Hagelberg
2803647bc4 Move :pedantic setting to default map; displace it.
Fixes #1653.
2014-08-21 10:54:19 -07:00
Nelson Morris
fc6cb17002 Bump pedantic version
I've redone some of the internals of the pedantic library, so it should
be more efficent and has better documentation.

Fixes #1491
2014-08-16 18:01:40 -05:00
Jean Niklas L'orange
d3304f6ea4 Don't read git files if they are unreadable.
Also print warnings if the file is not readable. Fixes #1585.
2014-08-09 01:42:09 +02:00
Phil Hagelberg
6d79dcfedc Bump version number up to 2.4.4-SNAPSHOT. 2014-08-05 16:21:34 -07:00
Phil Hagelberg
983847276d Release 2.4.3 2014-08-05 16:03:18 -07:00
Phil Hagelberg
8b9d66cd7c Allow implicit hooks/middleware to be disabled.
Fixes #1621.
2014-08-05 15:35:00 -07:00
Manfred Moser
e0ad0db0d6 switching to https for the central repo 2014-08-01 16:12:51 -07:00
Hugo Duncan
eaffda3082 Add LEIN_NO_USER_PROFILES to avoid user profiles
When set, this environment var will prevent user level profiles from
loading.
2014-08-01 11:18:43 -04:00
Roger Allen
80f1418110 Fix for issue 1607
Instead of always using a regex to try to match the native-names keys
when doing a get-os or get-arch call, use a get-with-pattern-fallback
function to first try the exact match and only if that fails, use
get-by-pattern.  This prevents matching "x86_64" with "x86" when
"x86_64" is the better match.
2014-07-21 22:52:33 -07:00
Gary Fredericks
94601082e4 Fix the test that's been failing on Travis
The problem was something to do with the project map being too
bare. Switching to `defproject` fixes it.
2014-07-07 13:28:43 -05:00
Phil Hagelberg
8b98d68cdd Default to warning when version ranges are present.
Fixes #1374.
2014-07-04 10:51:24 -07:00
Phil Hagelberg
0621161473 Merge pull request #1584 from MichaelBlume/report-bad-filename
when opening a JarFile, report name of file in any errors
2014-07-02 22:15:51 -07:00
Mike Blume
71e5e95e13 when opening a JarFile, report name of file in any errors
java.util.JarFile. can fail without reporting the name of the file it's
operating on. If you have a jarfile that isn't a valid zip, this can be
confusing.
2014-07-02 16:15:19 -07:00
Phil Hagelberg
3e6d3876ad Better message when task ns exists, but not task function. Fixes #1299. 2014-06-17 13:19:27 -07:00
Phil Hagelberg
4b6eb01cf1 Fix LEIN_FAST_TRAMPOLINE path. Fixes #1562. 2014-06-16 13:05:27 -07:00
Phil Hagelberg
e6b620cabe Fix bad eval test. 2014-06-15 17:24:55 -07:00
Phil Hagelberg
e738fec65c Bump version to 2.4.3-SNAPSHOT. 2014-06-15 17:24:48 -07:00
Phil Hagelberg
f73a9998ff Release 2.4.2 2014-06-15 17:14:10 -07:00
Phil Hagelberg
efc00172b7 Fix leiningen.core.ssl lazy-load. 2014-06-15 17:06:07 -07:00
Phil Hagelberg
b74910600b Fix write-pom-properties to work when outside project dir. 2014-06-15 17:05:13 -07:00
Phil Hagelberg
10d3b098ed Bump version to 2.4.2-SNAPSHOT. 2014-06-15 17:03:58 -07:00
Phil Hagelberg
3f9ecd6cb7 Release 2.4.1 2014-06-15 16:48:22 -07:00
Phil Hagelberg
d1a634fc4e Move make-project-properties to leiningen.core.project. 2014-06-15 16:43:36 -07:00
Phil Hagelberg
12ec7b9200 Write pom.properties in :prep-tasks, not during jar creation. 2014-06-13 16:09:36 -07:00
Phil Hagelberg
b9298323cc Put a newline in between META-INF/services/ entries.
Refs #1561.
2014-06-13 15:44:52 -07:00
Phil Hagelberg
392db32003 Don't load clojars cert in default project map. 2014-06-13 12:16:33 -07:00
Phil Hagelberg
f937116912 Update bundled clojars.pem.
Extracted with: openssl s_client -connect clojars.org:443
2014-06-13 12:14:37 -07:00
Phil Hagelberg
03bd2ee154 Lazy-load leiningen.core.ssl. 2014-06-13 12:14:37 -07:00
Gary Fredericks
04ef2fc621 correct Unnecessary capitalization 2014-06-12 22:45:17 -05:00
Phil Hagelberg
cf488b3edf Merge pull request #1556 from gfredericks/issue-1555
[DO NOT MERGE] Add regression test for #1555
2014-06-11 11:17:47 -07:00
Gary Fredericks
e5351155bf Add regression test for #1555 2014-06-11 12:58:42 -05:00
Phil Hagelberg
da2e50042f Don't meta-merge a project into itself.
Should fix #1555.
2014-06-10 12:13:38 -07:00
Phil Hagelberg
e5a994ab6e Bump to 2.4.1-SNAPSHOT. 2014-06-09 16:33:24 -07:00