[Git][clojure-team/trapperkeeper-webserver-jetty9-clojure][debian/main] releasing package trapperkeeper-webserver-jetty9-clojure version 4.4.1-2

[Louis-Philippe Véronneau (@pollo)]

Louis-Philippe Véronneau pushed to branch debian/main at Debian Clojure Maintainers / trapperkeeper-webserver-jetty9-clojure


Commits:
3e57951e by Louis-Philippe Véronneau at 2023-01-13T12:02:25-05:00
releasing package trapperkeeper-webserver-jetty9-clojure version 4.4.1-2

- - - - -


2 changed files:

- debian/changelog
- debian/patches/0006_Lein_Local.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+trapperkeeper-webserver-jetty9-clojure (4.4.1-2) unstable; urgency=medium
+
+  * Team upload.
+  * d/patches/0006: remove Java version restriction. (Closes: #1026645)
+
+ -- Louis-Philippe Véronneau <pollo at debian.org>  Fri, 13 Jan 2023 12:00:07 -0500
+
 trapperkeeper-webserver-jetty9-clojure (4.4.1-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/0006_Lein_Local.patch
=====================================
@@ -7,10 +7,10 @@ Patch project.clj to build locally using lein.
  project.clj | 90 ++++++++++++++++++++++++++++++-------------------------------
  1 file changed, 44 insertions(+), 46 deletions(-)
 
-diff --git a/project.clj b/project.clj
-index c9e5b7a..655f84f 100644
---- a/project.clj
-+++ b/project.clj
+Index: trapperkeeper-webserver-jetty9-clojure/project.clj
+===================================================================
+--- trapperkeeper-webserver-jetty9-clojure.orig/project.clj
++++ trapperkeeper-webserver-jetty9-clojure/project.clj
 @@ -8,48 +8,48 @@
  
    :min-lein-version "2.9.1"
@@ -94,7 +94,7 @@ index c9e5b7a..655f84f 100644
  
    :deploy-repositories [["releases" {:url "https://clojars.org/repo"
                                       :username :env/clojars_jenkins_username
-@@ -71,24 +71,24 @@
+@@ -71,51 +71,35 @@
                                         "examples/webrouting_app/src"]
                          :java-source-paths ["examples/servlet_app/src/java"
                                              "test/java"]
@@ -127,7 +127,27 @@ index c9e5b7a..655f84f 100644
                          :resource-paths ["dev-resources"]}
  
               :fips [:defaults ; merge in the dev profile
-@@ -115,7 +115,5 @@
+                     {:dependencies [[org.bouncycastle/bcpkix-fips]
+                                     [org.bouncycastle/bc-fips]
+                                     [org.bouncycastle/bctls-fips]]
+-                     :exclusions [[org.bouncycastle/bcpkix-jdk18on]]
+-                     ;; this only ensures that we run with the proper profiles
+-                     ;; during testing. This JVM opt will be set in the puppet module
+-                     ;; that sets up the JVM classpaths during installation.
+-                     :jvm-opts ~(let [version (System/getProperty "java.version")
+-                                      [major minor _] (clojure.string/split version #"\.")
+-                                      unsupported-ex (ex-info "Unsupported major Java version. Expects 8 or 11."
+-                                                       {:major major
+-                                                        :minor minor})]
+-                                  (condp = (java.lang.Integer/parseInt major)
+-                                    1 (if (= 8 (java.lang.Integer/parseInt minor))
+-                                        ["-Djava.security.properties==dev-resources/jdk8-fips-security"]
+-                                        (throw unsupported-ex))
+-                                    11 ["-Djava.security.properties==dev-resources/jdk11-fips-security"]
+-                                    (throw unsupported-ex)))}]
++                     :exclusions [[org.bouncycastle/bcpkix-jdk18on]]}]
+ 
+              :testutils {:source-paths ^:replace ["test/clj"]
                           :java-source-paths ^:replace ["test/java"]}}
  
    :main puppetlabs.trapperkeeper.main



View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-webserver-jetty9-clojure/-/commit/3e57951ed461d5b0baa11a66052d2e7e57d8d638

-- 
View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-webserver-jetty9-clojure/-/commit/3e57951ed461d5b0baa11a66052d2e7e57d8d638
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20230113/a516ca81/attachment.htm>