GNU bug report logs - #32231
[PATCH 0/8] Tomcat related updates

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 32231 in the body.
You can then email your comments to 32231 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: <guix-patches <at> gnu.org>
Subject: [PATCH 0/8] Tomcat related updates
Date: Sat, 21 Jul 2018 10:14:01 +0200

[Message part 1 (text/plain, inline)]

This is series of Tomcat related patches.

* Main purpuse was updating Tomcat to the newest 8.5.x version.
* BTW: Update to 9.x did not work out of the box: I had compilation issues.
* Stripping Timestamps, removing included jars.
* Then I noticed Tomcat is used where just a servlet-api is needed.
* So, I used the existing java-classpathx-servletapi, where possible.
* At some places, a newer version was necessary, I added the JAVAEE version.
* I could not substitute all places, will have to investigate further.
* Currently, Tomcat is just used as a library. It would be nice to add the
  conf and bin files and use it as a real server, even with a Guix service.

Björn Höfling (8):
  gnu: java-guice: Remove jars.
  gnu: java-logback-core: Add file-name field.
  gnu: java: Use java-classpathx-servletapi instead of java-tomcat where
    possible.
  gnu: Add java-javaee-servletapi.
  gnu: java: Use java-javaee-servletapi instead of java-tomcat.
  gnu: java-tomcat: Update to 8.5.32.
  gnu: java-tomcat: Remove bundled jars.
  gnu: java-tomcat: Strip timestamps

 gnu/packages/java.scm  | 46 +++++++++++++++++++++++++++++++++++++++++-----
 gnu/packages/maven.scm |  2 +-
 gnu/packages/web.scm   | 28 +++++++++++++++++++++-------
 3 files changed, 63 insertions(+), 13 deletions(-)

-- 
2.7.4

[Message part 2 (application/pgp-signature, inline)]

Message #8 received at 32231 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: 32231 <at> debbugs.gnu.org
Subject: [PATCH 1/8] gnu: java-guice: Remove jars.
Date: Sat, 21 Jul 2018 10:20:38 +0200

[Message part 1 (text/plain, inline)]

* gnu/packages/java.scm (java-guice)[source]: Add snippet to delete jar-files.
---
 gnu/packages/java.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index bc28428..b8587cc 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -7908,6 +7908,10 @@ the dependency is said to be unsatisfied, and the application is broken.")
               (uri (string-append "https://github.com/google/guice/archive/"
                                   version ".tar.gz"))
               (file-name (string-append name "-" version ".tar.gz"))
+              (modules '((guix build utils)))
+              (snippet
+               `(begin
+                  (for-each delete-file (find-files "." ".*.jar"))))
               (sha256
                (base32
                 "0dwmqjzlavb144ywqqglj3h68hqszkff8ai0a42hyb5il0qh4rbp"))))
-- 
2.7.4

[Message part 2 (application/pgp-signature, inline)]

Message #11 received at 32231 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: 32231 <at> debbugs.gnu.org
Subject: [PATCH 2/8] gnu: java-logback-core: Add file-name field.
Date: Sat, 21 Jul 2018 10:22:36 +0200

[Message part 1 (text/plain, inline)]

* gnu/package/java.scm (java-logback-core)[source]: Add file-name field.
---
 gnu/packages/java.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index b8587cc..7f7cf52 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -10277,6 +10277,7 @@ static code analysis or code manipulation.")))
               (method url-fetch)
               (uri (string-append "https://github.com/qos-ch/logback/archive/v_"
                                   version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
                 "1x6ga74yfgm94cfx98gybakbrlilx8i2gn6dx13l40kasmys06mi"))
-- 
2.7.4

[Message part 2 (application/pgp-signature, inline)]

Message #14 received at 32231 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: 32231 <at> debbugs.gnu.org
Subject: [PATCH 3/8] gnu: java: Use java-classpathx-servletapi instead of
 java-tomcat where possible.
Date: Sat, 21 Jul 2018 10:23:28 +0200

[Message part 1 (text/plain, inline)]

* gnu/package/java.scm (java-commons-jxpath)[inputs]: Remove java-tomcat, add java-classpathx-servletapi.
(java-guice-servlet)[inputs]: Likewise.
---
 gnu/packages/java.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 7f7cf52..d6c88f5 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -4449,7 +4449,7 @@ these scripting language engines.")
        #:tests? #f
        #:source-dir "src/java"))
     (inputs
-     `(("java-tomcat" ,java-tomcat)
+     `(("servlet" ,java-classpathx-servletapi)
        ("java-jdom" ,java-jdom)
        ("java-commons-beanutils" ,java-commons-beanutils)))
     (native-inputs
@@ -7944,7 +7944,7 @@ Java 6 and above.")
        #:tests? #f)); FIXME: not in a java subdir
     (inputs
      `(("guice" ,java-guice)
-       ("servlet" ,java-tomcat)
+       ("servlet"  ,java-classpathx-servletapi)
        ,@(package-inputs java-guice)))))
 
 (define-public java-assertj
-- 
2.7.4

[Message part 2 (application/pgp-signature, inline)]

Message #17 received at 32231 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: 32231 <at> debbugs.gnu.org
Subject: [PATCH 4/8] gnu: Add java-javaee-servletapi.
Date: Sat, 21 Jul 2018 10:23:55 +0200

[Message part 1 (text/plain, inline)]

* gnu/packages/java.scm (java-javaee-servletapi): New variable.
---
 gnu/packages/java.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index d6c88f5..b60aedd 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2537,6 +2537,37 @@ ClasspathX project.  It provides implementations of version 3.0 of the servlet
 API and version 2.1 of the Java ServerPages API.")
     (license license:gpl3+)))
 
+(define-public java-javaee-servletapi
+  (package
+    (name "java-javaee-servletapi")
+    (version "3.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/javaee/servlet-spec/"
+                                  "archive/" version ".zip"))
+              (file-name (string-append name "-" version ".zip"))
+              (sha256
+               (base32
+                "0m6p13vgfb1ihich1jp5j6fqlhkjsrkn32c86bsbkryp38ipwg8w"))))
+    (build-system ant-build-system)
+    (arguments
+     `(#:jar-name "javax-servletapi.jar"
+       ;; no tests
+       #:tests? #f
+       #:source-dir "src/main/java"))
+    (native-inputs
+     `(("unzip" ,unzip)))
+    (home-page "https://javaee.github.io/servlet-spec/")
+    (synopsis "Java servlet API")
+    (description "Java Servlet is the foundation web specification in the
+Java Enterprise Platform.  Developers can build web applications using the
+Servlet API to interact with the request/response workflow.  This project
+provides information on the continued development of the Java Servlet
+specification.")
+    ;; Main code is dual-licensed by Oracle under either GLP2 or CDDL 1.1.
+    ;; Some files are licensed under ASL 2.0.
+    (license (list license:asl2.0 license:gpl2 license:cddl1.1))))
+
 (define-public java-swt
   (package
     (name "java-swt")
-- 
2.7.4

[Message part 2 (application/pgp-signature, inline)]

Message #20 received at 32231 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: 32231 <at> debbugs.gnu.org
Subject: [PATCH 5/8] gnu: java: Use java-javaee-servletapi instead of
 java-tomcat.
Date: Sat, 21 Jul 2018 10:24:25 +0200

[Message part 1 (text/plain, inline)]

* gnu/packages/java.scm(java-eclipse-sisu-inject)[inputs]: Remove java-tomcat, add java-javaee-servletapi.
(logback-core)[inputs]: Likewise.
* gnu/packages/maven.scm (maven-wagon-provider-test)[inputs]: Likewise.
* gnu/packages/web.scm (java-eclipse-jetty-webapp)[inputs]: Likewise.
(java-eclipse-jetty-server)[inputs]: Likewise.
(java-eclipse-jetty-http)[inputs]: Likewise.
(java-eclipse-jetty-jmx)[inputs]: Likewise.
(java-eclipse-jetty-io)[inputs]: Likewise.
---
 gnu/packages/java.scm  |  6 +++---
 gnu/packages/maven.scm |  2 +-
 gnu/packages/web.scm   | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index b60aedd..2ba6d76 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -10144,7 +10144,7 @@ and reporting) project dependencies.  It is characterized by the following:
      `(("java-guice" ,java-guice)
        ("java-guice-servlet" ,java-guice-servlet)
        ("java-javax-inject" ,java-javax-inject)
-       ("java-tomcat" ,java-tomcat)
+       ("java-javaee-servletapi" ,java-javaee-servletapi)
        ("java-junit" ,java-junit)
        ("java-slf4j-api" ,java-slf4j-api)
        ("java-jsr305" ,java-jsr305)
@@ -10339,7 +10339,7 @@ static code analysis or code manipulation.")))
              #t)))))
     (inputs
      `(("java-javax-mail" ,java-javax-mail)
-       ("java-tomcat" ,java-tomcat)
+       ("servlet" ,java-javaee-servletapi)
        ("java-commons-compiler" ,java-commons-compiler)
        ("java-janino" ,java-janino)))
     (native-inputs
@@ -10383,7 +10383,7 @@ This module lays the groundwork for the other two modules.")
                                             (find-files (assoc-ref inputs input)
                                                         ".*.jar"))
                                           '("java-logback-core" "java-slf4j-api"
-                                            "java-commons-compiler" "java-tomcat"
+                                            "java-commons-compiler" "servlet"
                                             "groovy")))
                        ":"))
              (apply invoke "groovyc" "-d" "build/classes" "-j"
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index a3e5687..34fbce0 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -428,7 +428,7 @@ artifact and repository handling code.")
        ("java-eclipse-jetty-server-9.2" ,java-eclipse-jetty-server-9.2)
        ("java-eclipse-jetty-servlet-9.2" ,java-eclipse-jetty-servlet-9.2)
        ("java-slf4j-api" ,java-slf4j-api)
-       ("java-tomcat" ,java-tomcat)
+       ("java-javaee-servletapi" ,java-javaee-servletapi)
        ("maven-wagon-provider-api" ,maven-wagon-provider-api)))
     (synopsis "Test classes from maven-wagon")
     (description "Maven Wagon is a transport abstraction that is used in Maven's
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index b76f111..e2ca538 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5938,7 +5938,7 @@ or embedded instantiation.  This package provides utility classes.")
              #t)))))
     (inputs
      `(("slf4j" ,java-slf4j-api)
-       ("servlet" ,java-tomcat)
+       ("servlet" ,java-javaee-servletapi)
        ("util" ,java-eclipse-jetty-util)))
     (synopsis "Jetty :: IO Utility")
     (description "The Jetty Web Server provides an HTTP server and Servlet
@@ -5981,7 +5981,7 @@ or embedded instantiation.  This package provides IO-related utility classes."))
              #t)))))
     (inputs
      `(("slf4j" ,java-slf4j-api)
-       ("servlet" ,java-tomcat)
+       ("servlet" ,java-javaee-servletapi)
        ("io" ,java-eclipse-jetty-io)
        ("util" ,java-eclipse-jetty-util)))
     (synopsis "Jetty :: Http Utility")
@@ -6016,7 +6016,7 @@ or embedded instantiation.  This package provides HTTP-related utility classes."
              #t)))))
     (inputs
      `(("slf4j" ,java-slf4j-api)
-       ("servlet" ,java-tomcat)
+       ("servlet" ,java-javaee-servletapi)
        ("util" ,java-eclipse-jetty-util)))
     (synopsis "Jetty :: JMX Management")
     (description "The Jetty Web Server provides an HTTP server and Servlet
@@ -6097,7 +6097,7 @@ or embedded instantiation.  This package provides the JMX management.")))
              #t)))))
     (inputs
      `(("slf4j" ,java-slf4j-api)
-       ("servlet" ,java-tomcat)
+       ("servlet" ,java-javaee-servletapi)
        ("http" ,java-eclipse-jetty-http)
        ("io" ,java-eclipse-jetty-io)
        ("jmx" ,java-eclipse-jetty-jmx)
@@ -6293,7 +6293,7 @@ container.")))
        ("java-eclipse-jetty-servlet" ,java-eclipse-jetty-servlet)
        ("java-eclipse-jetty-security" ,java-eclipse-jetty-security)
        ("java-eclipse-jetty-xml" ,java-eclipse-jetty-xml)
-       ("java-tomcat" ,java-tomcat)))
+       ("java-tomcat" ,java-javaee-servletapi)))
     (native-inputs
      `(("java-eclipse-jetty-io" ,java-eclipse-jetty-io)
        ,@(package-native-inputs java-eclipse-jetty-util)))))
-- 
2.7.4

[Message part 2 (application/pgp-signature, inline)]

Message #23 received at 32231 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: 32231 <at> debbugs.gnu.org
Subject: [PATCH 6/8] gnu: java-tomcat: Update to 8.5.32.
Date: Sat, 21 Jul 2018 10:24:49 +0200

[Message part 1 (text/plain, inline)]

* gnu/packages/web.scm (java-tomcat): Update to 8.5.32.
---
 gnu/packages/web.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index e2ca538..008154d 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5712,14 +5712,14 @@ encoder/decoder based on the draft-12 specification for UBJSON.")
 (define-public java-tomcat
   (package
     (name "java-tomcat")
-    (version "8.5.28")
+    (version "8.5.32")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://apache/tomcat/tomcat-8/v"
                                   version "/src/apache-tomcat-" version "-src.tar.gz"))
               (sha256
                (base32
-                "0q2bc3sajrmcx3z3vhhwp78y47ryc2ky8ssbdmfk24zvqdb76hvl"))))
+                "1qjsr6zmkdciakya4jqz0ssnsk02qlmmd898c05rasfwcrpj0xi6"))))
     (build-system ant-build-system)
     (inputs
      `(("java-eclipse-jdt-core" ,java-eclipse-jdt-core)))
-- 
2.7.4

[Message part 2 (application/pgp-signature, inline)]

Message #26 received at 32231 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: 32231 <at> debbugs.gnu.org
Subject: [PATCH 7/8] gnu: java-tomcat: Remove bundled jars.
Date: Sat, 21 Jul 2018 10:25:10 +0200

[Message part 1 (text/plain, inline)]

* gnu/packages/web.scm (java-tomcat)[source]: Add snippet to remove bundled jars.
---
 gnu/packages/web.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 008154d..a3290a3 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5719,7 +5719,13 @@ encoder/decoder based on the draft-12 specification for UBJSON.")
                                   version "/src/apache-tomcat-" version "-src.tar.gz"))
               (sha256
                (base32
-                "1qjsr6zmkdciakya4jqz0ssnsk02qlmmd898c05rasfwcrpj0xi6"))))
+                "1qjsr6zmkdciakya4jqz0ssnsk02qlmmd898c05rasfwcrpj0xi6"))
+              (modules '((guix build utils)))
+              ;; Delete bundled jars.
+              (snippet
+               '(begin
+                  (for-each delete-file (find-files "." "\\.jar$"))
+                  #t))))
     (build-system ant-build-system)
     (inputs
      `(("java-eclipse-jdt-core" ,java-eclipse-jdt-core)))
-- 
2.7.4

[Message part 2 (application/pgp-signature, inline)]

Message #29 received at 32231 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: 32231 <at> debbugs.gnu.org
Subject: [PATCH 8/8] gnu: java-tomcat: Strip timestamps
Date: Sat, 21 Jul 2018 10:25:32 +0200

[Message part 1 (text/plain, inline)]

* gnu/package/web.scm (java-tomcat)[arguments]: Add phase 'strip timestamps.
Makes build deterministic.
---
 gnu/packages/web.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index a3290a3..565198f 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5747,6 +5747,14 @@ encoder/decoder based on the draft-12 specification for UBJSON.")
                (("depends=\"validate\"") "depends=\"build-prepare\"")
                ((",download-validate") ""))
              #t))
+         (add-after 'unpack 'strip-timestamps
+           (lambda _
+             (substitute* "build.xml"
+               (("<filter token=\"YEAR\" value=.*")
+                "<filter token=\"YEAR\" value=\"1970\"/>")
+               (("<filter token=\"VERSION_BUILT\" value=.*")
+                "<filter token=\"VERSION_BUILT\" value=\"Jan 1 1970 00:00:00 UTC\"/>"))
+             #t))
          (add-after 'unpack 'generate-properties
            (lambda _
              ;; This could have been passed to make-flags, but getcwd returns
-- 
2.7.4

[Message part 2 (application/pgp-signature, inline)]

Message #34 received at 32231-done <at> debbugs.gnu.org (full text, mbox):

From: Julien Lepiller <julien <at> lepiller.eu>
To: 32231-done <at> debbugs.gnu.org
Subject: Re: [bug#32231] [PATCH 0/8] Tomcat related updates
Date: Wed, 25 Jul 2018 00:30:43 +0200

[Message part 1 (text/plain, inline)]

Le Sat, 21 Jul 2018 10:14:01 +0200,
Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de> a écrit :

> This is series of Tomcat related patches.
> 

Pushed as 9936ffe77d5f69185f68c52d44ec21c9f94600e6 -
49a8684d9f20656aaa9094c02164cbf2f67b290b

Thank you!

[Message part 2 (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.