mvnizer 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f37455c3428e18708758e9ed80583b507e31a98246dbce663d626de7ed8c2ea9
-  data.tar.gz: '081ae720fa78692f5c4cbdcb5c699daa48ca2b6d342e60c4c132e6fd1e419224'
+  metadata.gz: 401a8d107ec3b166a1daa899eab158300b091126950d70d1679bdfcc7e8575f6
+  data.tar.gz: adb99073472f4956a3e49b195c95b3d34a0c5f0382120e9823c8449c44751aed
 SHA512:
-  metadata.gz: a4fafe3ee96ff59e71b03d6264e058b7ebac475b49d0978b3c66b3a72d691ab25bcbed7bcc984ff7626e92aef64cc3e416bb376ec8cb1c961e54452b5ac22e36
-  data.tar.gz: b6d721ab08ffeed95eb0da2b7dd5c99b41b49a0ec11a36763a0321a1d9e5a8782fab3297a983f436f51554d140868cee91caa1c0eea8e91898b7c1d0a9084895
+  metadata.gz: e8d512b9a554ff900630965e54b4f3c2443a19c76101ce033a752b9161ce3407b13db77270e41a6bd93042c10a16914921000af3a36ee8555365522108e32582
+  data.tar.gz: f8591a5e87b448c5a9c0f3606c763f22d84ec2a3cb03a673ac466c6542a9528d61c09b6b0d9febd92bd68c7304df081038531a253a72d46ebc4356acb0aba858

data/.ruby-version

@@ -0,0 +1 @@
+3.2.10

data/Dockerfile

@@ -1,54 +1,13 @@
-FROM ubuntu:24.04 # LTS
+FROM ruby:3.2
 
-ARG DEBIAN_FRONTEND=noninteractive
-ARG TZ=Etc/UTC
-
-RUN apt-get update -q && apt-get upgrade -y && \
-    apt-get install -qy --no-install-recommends \
-    build-essential \
-    tzdata \
-    gnupg2 \
-    curl \
-    ca-certificates \
-    procps \
-    libssl-dev \
-    libreadline-dev \
-    zlib1g-dev \
-    libyaml-dev \
-    pkg-config \
-    libffi-dev \
-    libgmp-dev \
-    perl \
-    git \
-    && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /usr/local/src
-RUN curl --proto '=https' --tlsv1.2 -sSfL https://www.openssl.org/source/old/1.1.1/openssl-1.1.1w.tar.gz -o openssl-1.1.1w.tar.gz && \
-    tar -zxf openssl-1.1.1w.tar.gz && \
-    cd openssl-1.1.1w && \
-    ./config --prefix=/opt/openssl-1.1.1w --openssldir=/opt/openssl-1.1.1w shared zlib-dynamic && \
-    make -j$(nproc) && \
-    make install && \
-    rm -rf /usr/local/src/openssl*
-
-RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import - && \
-    curl -sSL https://rvm.io/pkuczynski.asc | gpg --import -
-
-RUN curl -sSL https://get.rvm.io | bash -s stable
-
-SHELL ["/bin/bash", "-l", "-c"]
-
-RUN echo 'source /etc/profile.d/rvm.sh' >> ~/.bashrc && \
-    source /etc/profile.d/rvm.sh && \
-    rvm autolibs disable && \
-    rvm requirements && \
-    rvm install 3.0.7 --with-openssl-dir=/opt/openssl-1.1.1w && \
-    rvm use 3.0.7 --default && \
-    gem install bundler
+RUN bundle config --global frozen 1
 
 WORKDIR /mvnizer
 
+COPY Gemfile Gemfile.lock mvnizer.gemspec ./
+RUN bundle install
+
 # To run:
 #   docker run -t -i -v $(pwd):/mvnizer  mvnizer-build:latest /bin/bash
 
-ENTRYPOINT ["/bin/bash", "-l", "-c"]
+CMD ["/bin/bash"]

data/Gemfile

@@ -10,6 +10,6 @@ gem 'rake-release'
 group :development do
   gem 'rspec', '~> 3.10.0'
   gem 'rspec-mocks', '~> 3.10.0'
-  gem 'fakefs', '~> 0.14'
+  gem 'fakefs', '~> 3.2'
 #  gem 'aruba', '~> 0.14'
 end

data/Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     csv (3.3.5)
     diff-lcs (1.6.2)
-    fakefs (0.20.1)
+    fakefs (3.2.0)
     httparty (0.24.2)
       csv
       mini_mime (>= 1.0.0)
@@ -49,7 +49,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  fakefs (~> 0.14)
+  fakefs (~> 3.2)
   httparty (~> 0.24)
   nokogiri (~> 1.15)
   rake (~> 13.3)

data/README.org

@@ -16,6 +16,15 @@ Bootstraps a Maven project. Because archetypes shouldn't be so complicated.
     $ gem install mvnizer
 #+END_EXAMPLE
 
+* Developing Mvnizer
+
+  To work on Mvnizer itself, you can use the provided Dockerfile.
+
+#+BEGIN_EXAMPLE
+  $ docker build -t mvnizer-dev .
+  $ docker run -it -v $(pwd):/usr/src/app mvnizer-dev
+#+END_EXAMPLE
+
 * Commands
 
 ** Project Creation
@@ -56,9 +65,9 @@ The version *must* be of the form =major.minor.patch-classifier=.
     - =--logger= :: this adds logging dependencies to the project.  The jar added are defined as the =logging_deps= of the configuration file.  The default are:
 
     #+begin_src
-logging_deps: [ "org.slf4j:slf4j-api:1.7.36:jar",
-                "org.slf4j:slf4j-simple:1.7.36:jar",
-                "ch.qos.logback:logback-core:1.2.11:jar" ]
+logging_deps: [ "org.slf4j:slf4j-api:2.0.17:jar",
+                "org.slf4j:slf4j-simple:2.0.17:jar",
+                "ch.qos.logback:logback-core:1.5.26:jar" ]
     #+end_src
 
 *** WAR Project
@@ -68,7 +77,7 @@ logging_deps: [ "org.slf4j:slf4j-api:1.7.36:jar",
     When running the Jetty plugin, /e.g./:
 
 #+BEGIN_EXAMPLE
-mvn org.eclipse.jetty:jetty-maven-plugin:9.4.12.v20180830:run-war
+mvn org.eclipse.jetty:jetty-maven-plugin:11.0.26:run-war
 #+END_EXAMPLE
 
     The example can then be accessed at http://localhost:8080/hello

data/conf/default.yml

@@ -1,8 +1,8 @@
 group_id: com.example
 version: 0.0.1-SNAPSHOT
 type: jar
-dependencies: [ "org.junit.jupiter:junit-jupiter-engine:5.8.2:jar:test" ]
-plugins: [ ":maven-compiler-plugin:3.10.0" ]
-logging_deps: [ "org.slf4j:slf4j-api:1.7.36:jar",
-                "org.slf4j:slf4j-simple:1.7.36:jar",
-                "ch.qos.logback:logback-core:1.2.11:jar" ]
+dependencies: [ "org.junit.jupiter:junit-jupiter-engine:5.14.2:jar:test" ]
+plugins: [ ":maven-compiler-plugin:3.14.1" ]
+logging_deps: [ "org.slf4j:slf4j-api:2.0.17:jar",
+                "org.slf4j:slf4j-simple:2.0.17:jar",
+                "ch.qos.logback:logback-core:1.5.26:jar" ]

data/lib/mvnizer/commands/new_war_project.rb

@@ -6,7 +6,7 @@ module Mvnizer
 
         create_dir("#{project.artifact_id}/src/main/webapp/WEB-INF")
 
-        # web.xml is optional in Servlet 3.0
+        # web.xml is optional in Servlet 5.0
         # Do we keep its generation here?
         generate_file(File.join(TEMPLATE_DIR, "web.xml.erb"),
                       "#{project.artifact_id}/src/main/webapp/WEB-INF/web.xml",
@@ -26,7 +26,7 @@ module Mvnizer
       end
 
       def get_dependencies
-        ["javax:javaee-web-api:6.0:jar:provided"]
+        ["jakarta.platform:jakarta.jakartaee-web-api:9.1.0:jar:provided"]
       end
     end
   end

data/lib/mvnizer/task_helper.rb

@@ -34,7 +34,7 @@ module Mvnizer
     # can be given as +pom_location+.  By default, this function
     # looks up the pom in the current directory.
     def add_dependency(dependency, pom_location = File.join(Dir.pwd, "pom.xml"))
-      raise FileNotFoundError, "The pom.xml file cannot be found." unless File.exists?(pom_location)
+      raise FileNotFoundError, "The pom.xml file cannot be found." unless File.exist?(pom_location)
 
       coordinate_parser = CoordinateParser.new
 

data/lib/mvnizer/templates/war/ExampleServlet.java.erb

@@ -1,11 +1,11 @@
 package <%= package_name %>;
 
 import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
 
 @WebServlet("/hello")
 public class ExampleServlet extends HttpServlet {

data/lib/mvnizer/templates/web.xml.erb

@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-         version="3.0">
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
+         version="5.0">
 </web-app>

data/lib/mvnizer/version.rb

@@ -1,5 +1,5 @@
 module Mvnizer
   module Version
-    STRING = '2.0.1'
+    STRING = '2.0.2'
   end
 end

data/mvnizer.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.homepage = "http://github.com/tychobrailleur/mvnizer"
   s.licenses = ["MIT"]
-  s.required_ruby_version = '>= 2.7.0'
+  s.required_ruby_version = '>= 3.2.0'
   s.rubygems_version = "2.7.8"
   s.summary = "Bootstrap a Maven project without the pain of archetypes."
   s.add_dependency "httparty", "~> 0.17"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mvnizer
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Sébastien Le Callonnec
@@ -50,6 +50,7 @@ extra_rdoc_files:
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.org
 - Dockerfile
@@ -103,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="