Commit ffd24dbe authored by Elana Hashman's avatar Elana Hashman

Minimize and fix up patches

parent c026e7b1
From: Elana Hashman <ehashman@debian.org>
Date: Wed, 20 Dec 2017 23:40:22 +0000
Subject: Update maven repo location
Date: Thu, 21 Dec 2017 18:09:35 +0000
Subject: Build in offline mode with local repo
---
project.clj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
project.clj | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/project.clj b/project.clj
index 08fb110..606d727 100644
index fc32d11..606d727 100644
--- a/project.clj
+++ b/project.clj
@@ -38,4 +38,4 @@
@@ -36,4 +36,6 @@
:offline (comp (partial not-any? identity)
(juxt :online :disabled))}
:source-paths ["leiningen-core/src" "src"]
:eval-in :leiningen
:offline? true
- :local-repo "/usr/share/maven-repo")
- :eval-in :leiningen)
+ :eval-in :leiningen
+ :offline? true
+ :local-repo "debian/maven-repo")
From: Elana Hashman <ehashman@debian.org>
Date: Sat, 14 Oct 2017 11:30:57 -0400
Subject: Build offline with Debian maven repo
---
leiningen-core/project.clj | 4 +++-
project.clj | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/leiningen-core/project.clj b/leiningen-core/project.clj
index e078065..47da4d8 100644
--- a/leiningen-core/project.clj
+++ b/leiningen-core/project.clj
@@ -20,4 +20,6 @@
:scm {:dir ".."}
:dev-resources-path "dev-resources"
:aliases {"bootstrap" ["with-profile" "base"
- "do" "install," "classpath" ".lein-bootstrap"]})
+ "do" "install," "classpath" ".lein-bootstrap"]}
+ :offline? true
+ :local-repo "/usr/share/maven-repo")
diff --git a/project.clj b/project.clj
index 967e7ee..ab7bb5b 100644
--- a/project.clj
+++ b/project.clj
@@ -35,4 +35,6 @@
:offline (comp (partial not-any? identity)
(juxt :online :disabled))}
:source-paths ["leiningen-core/src" "src"]
- :eval-in :leiningen)
+ :eval-in :leiningen
+ :offline? true
+ :local-repo "/usr/share/maven-repo")
From: Elana Hashman <ehashman@debian.org>
Date: Wed, 20 Dec 2017 21:23:33 +0000
Subject: Patch deps
---
leiningen-core/project.clj | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/leiningen-core/project.clj b/leiningen-core/project.clj
index b44b31f..94552a0 100644
--- a/leiningen-core/project.clj
+++ b/leiningen-core/project.clj
@@ -8,14 +8,14 @@
[bultitude "0.2.8" :exclusions [org.tcrawley/dynapath]]
[org.flatland/classlojure "0.7.1"]
[robert/hooke "1.3.0"]
- [com.cemerick/pomegranate "0.4.0"
+ [com.cemerick/pomegranate "1.0.0"
:exclusions [org.tcrawley/dynapath
org.codehaus.plexus/plexus-utils]]
[org.tcrawley/dynapath "1.0.0"]
[org.apache.maven.wagon/wagon-http "2.12"
:exclusions [org.apache.maven.wagon/wagon-provider-api]]
[com.hypirion/io "0.3.1"]
- [org.slf4j/slf4j-nop "1.7.22"] ; wagon-http uses slf4j
+ [org.slf4j/slf4j-nop "1.7.25"] ; wagon-http uses slf4j
;; we pull this in transitively but want a newer version
[org.clojure/tools.macro "0.1.5"]]
:scm {:dir ".."}
0001-Build-offline-with-Debian-maven-repo.patch
0002-Patch-deps.patch
0003-Update-maven-repo-location.patch
0004-Fix-source-directory-in-POM.patch
0005-Update-LEIN_JAR-location-to-match-installed-jar.patch
0001-Build-in-offline-mode-with-local-repo.patch
0002-Fix-source-directory-in-POM.patch
0003-Update-LEIN_JAR-location-to-match-installed-jar.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment