@eui/cli 15.4.1 → 15.4.2

package/lib/skeletons/web-maven/src/main/webapp/index.jsp

@@ -1,30 +1,30 @@
-<%@ page pageEncoding="UTF-8" import="java.io.File" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<%
-    try {
-        File indexFile = new File(request.getServletContext().getResource("/index.html").getFile());
-        long lastModified = indexFile.lastModified();
-        // Ignore the milliseconds; there may be small differences because the time that is stored by the browser is in seconds (apparently):
-        if ((lastModified - request.getDateHeader("If-Modified-Since")) / 1000 <= 0) {
-            response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
-        } else {
-            response.setDateHeader("Last-Modified", lastModified);
-%>
-<c:set var="baseHref" value="${fn:substring(url, 0, fn:length(url) - fn:length(pageContext.request.requestURI))}${pageContext.request.contextPath}" />
-<c:set var="srcAttribute">src="${baseHref}/</c:set>
-<c:set var="hrefAttribute">href="${baseHref}/</c:set>
-<c:import url="index.html" var="html" charEncoding="UTF-8" />
-<c:set var="html" value="${fn:replace(html, '<base href=\"/\">', '<base href=\"\">')}" />
-<c:set var="html" value="${fn:replace(html, 'src=\"', srcAttribute)}" />
-<c:set var="html" value="${fn:replace(html, 'href=\"', hrefAttribute)}" />
-${html}
-<%
-        }
-    } catch (Exception e) {
-%>
-No index.html file present.<br/>
-You may have forgotten to build the Angular application before deploying to the server...
-<%
-    }
+<%@ page pageEncoding="UTF-8" import="java.io.File" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%
+    try {
+        File indexFile = new File(request.getServletContext().getResource("/index.html").getFile());
+        long lastModified = indexFile.lastModified();
+        // Ignore the milliseconds; there may be small differences because the time that is stored by the browser is in seconds (apparently):
+        if ((lastModified - request.getDateHeader("If-Modified-Since")) / 1000 <= 0) {
+            response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
+        } else {
+            response.setDateHeader("Last-Modified", lastModified);
+%>
+<c:set var="baseHref" value="${fn:substring(url, 0, fn:length(url) - fn:length(pageContext.request.requestURI))}${pageContext.request.contextPath}" />
+<c:set var="srcAttribute">src="${baseHref}/</c:set>
+<c:set var="hrefAttribute">href="${baseHref}/</c:set>
+<c:import url="index.html" var="html" charEncoding="UTF-8" />
+<c:set var="html" value="${fn:replace(html, '<base href=\"/\">', '<base href=\"\">')}" />
+<c:set var="html" value="${fn:replace(html, 'src=\"', srcAttribute)}" />
+<c:set var="html" value="${fn:replace(html, 'href=\"', hrefAttribute)}" />
+${html}
+<%
+        }
+    } catch (Exception e) {
+%>
+No index.html file present.<br/>
+You may have forgotten to build the Angular application before deploying to the server...
+<%
+    }
 %>

package/lib/skeletons/web-spring-boot/myapp-web/pom.xml

@@ -1,77 +1,77 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>@app.name@-web</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-    <packaging>war</packaging>
-
-	<parent>
-		<groupId>@app.group.id@.@app.name@</groupId>
-		<artifactId>@app.name@</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
-	</parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>4.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>3.1.0</version>
-                <executions>
-                    <execution>
-                        <id>npm_package_install</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>yarn</executable>
-                            <workingDirectory>src/main/angular</workingDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>ng_build</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>yarn</executable>
-                            <workingDirectory>src/main/angular</workingDirectory>
-                            <arguments>
-                                <argument>build-prod</argument>
-                                <argument>--prod</argument>
-                                <argument>--aot</argument>
-                                <argument>--base-href</argument>
-                                <argument>/@app.name@/</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.4.0</version>
-                <configuration>
-                    <webResources>
-                        <resource>
-                            <directory>src/main/angular/dist</directory>
-                        </resource>
-                    </webResources>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>@app.name@-web</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+	<parent>
+		<groupId>@app.group.id@.@app.name@</groupId>
+		<artifactId>@app.name@</artifactId>
+        <version>0.1.0-SNAPSHOT</version>
+	</parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>4.0.1</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>npm_package_install</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>yarn</executable>
+                            <workingDirectory>src/main/angular</workingDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>ng_build</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>yarn</executable>
+                            <workingDirectory>src/main/angular</workingDirectory>
+                            <arguments>
+                                <argument>build-prod</argument>
+                                <argument>--prod</argument>
+                                <argument>--aot</argument>
+                                <argument>--base-href</argument>
+                                <argument>/@app.name@/</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.4.0</version>
+                <configuration>
+                    <webResources>
+                        <resource>
+                            <directory>src/main/angular/dist</directory>
+                        </resource>
+                    </webResources>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

package/lib/skeletons/web-spring-boot/myapp-web-rest/pom.xml

@@ -1,84 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>@app.name@-web-rest</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-	<parent>
-		<groupId>@app.group.id@.@app.name@</groupId>
-		<artifactId>@app.name@</artifactId>
-		<version>0.1.0-SNAPSHOT</version>
-	</parent>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>17</java.version>
-        <springswagger.version>3.0.0</springswagger.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- Add tomcat only if I want to run directly -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.tomcat</groupId>
-                    <artifactId>tomcat-jdbc</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-web</artifactId>
-            <version>${spring-security.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-config</artifactId>
-            <version>${spring-security.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${springswagger.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>${springswagger.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>@app.name@-web-rest</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+	<parent>
+		<groupId>@app.group.id@.@app.name@</groupId>
+		<artifactId>@app.name@</artifactId>
+		<version>0.1.0-SNAPSHOT</version>
+	</parent>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>17</java.version>
+        <springswagger.version>3.0.0</springswagger.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- Add tomcat only if I want to run directly -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.tomcat</groupId>
+                    <artifactId>tomcat-jdbc</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-web</artifactId>
+            <version>${spring-security.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-config</artifactId>
+            <version>${spring-security.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${springswagger.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>${springswagger.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>

package/lib/skeletons/web-spring-boot/myapp-web-rest/src/main/java/myapp/MyappApplication.java

@@ -1,46 +1,46 @@
-package @app.group.id@.@app.name@;
-
-import @app.group.id@.@app.name@.resources.support.HateoasPageableHandlerMethodArgumentResolver;
-import @app.group.id@.@app.name@.resources.support.PageJsonSerializer;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.data.domain.Page;
-import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
-import org.springframework.web.WebApplicationInitializer;
-import org.springframework.web.method.support.HandlerMethodArgumentResolver;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import java.util.List;
-
-@SpringBootApplication
-public class MyappApplication extends SpringBootServletInitializer implements WebApplicationInitializer, WebMvcConfigurer {
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-        return application.sources(MyappApplication.class);
-    }
-
-    @Override
-    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
-        argumentResolvers.add(new HateoasPageableHandlerMethodArgumentResolver());
-    }
-
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**").allowedOrigins("*").allowedMethods("*").allowedHeaders("*").exposedHeaders("Content-Range").allowCredentials(true);
-    }
-
-    @Bean
-    public Jackson2ObjectMapperBuilder objectMapperBuilder() {
-        Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder();
-        builder.serializerByType(Page.class, new PageJsonSerializer());
-        return builder;
-    }
-
-    public static void main(String[] args) {
-        SpringApplication.run(MyappApplication.class, args);
-    }
-}
+package @app.group.id@.@app.name@;
+
+import @app.group.id@.@app.name@.resources.support.HateoasPageableHandlerMethodArgumentResolver;
+import @app.group.id@.@app.name@.resources.support.PageJsonSerializer;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.domain.Page;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
+import org.springframework.web.WebApplicationInitializer;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.List;
+
+@SpringBootApplication
+public class MyappApplication extends SpringBootServletInitializer implements WebApplicationInitializer, WebMvcConfigurer {
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+        return application.sources(MyappApplication.class);
+    }
+
+    @Override
+    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
+        argumentResolvers.add(new HateoasPageableHandlerMethodArgumentResolver());
+    }
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**").allowedOrigins("*").allowedMethods("*").allowedHeaders("*").exposedHeaders("Content-Range").allowCredentials(true);
+    }
+
+    @Bean
+    public Jackson2ObjectMapperBuilder objectMapperBuilder() {
+        Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder();
+        builder.serializerByType(Page.class, new PageJsonSerializer());
+        return builder;
+    }
+
+    public static void main(String[] args) {
+        SpringApplication.run(MyappApplication.class, args);
+    }
+}

package/lib/skeletons/web-spring-boot/myapp-web-rest/src/main/java/myapp/domain/Address.java

@@ -1,65 +1,65 @@
-package @app.group.id@.@app.name@.domain;
-
-import jakarta.persistence.*;
-
-@Entity(name = "t_address")
-public class Address {
-    @Id
-    @SequenceGenerator(name="address_generator", sequenceName="seq_address")
-    @GeneratedValue(generator = "address_generator")
-    @Column(name = "address_id", nullable = false)
-    private Long addressId;
-
-    @Column(nullable = false)
-    private String street;
-
-    @Column(name = "postal_code", nullable = false)
-    private String postalCode;
-
-    @Column(nullable = false)
-    private String city;
-
-    @Column(nullable = false)
-    private String country;
-
-
-    public Long getAddressId() {
-        return addressId;
-    }
-
-    public void setAddressId(Long addressId) {
-        this.addressId = addressId;
-    }
-
-    public String getStreet() {
-        return street;
-    }
-
-    public void setStreet(String street) {
-        this.street = street;
-    }
-
-    public String getPostalCode() {
-        return postalCode;
-    }
-
-    public void setPostalCode(String postalCode) {
-        this.postalCode = postalCode;
-    }
-
-    public String getCity() {
-        return city;
-    }
-
-    public void setCity(String city) {
-        this.city = city;
-    }
-
-    public String getCountry() {
-        return country;
-    }
-
-    public void setCountry(String country) {
-        this.country = country;
-    }
-}
+package @app.group.id@.@app.name@.domain;
+
+import jakarta.persistence.*;
+
+@Entity(name = "t_address")
+public class Address {
+    @Id
+    @SequenceGenerator(name="address_generator", sequenceName="seq_address")
+    @GeneratedValue(generator = "address_generator")
+    @Column(name = "address_id", nullable = false)
+    private Long addressId;
+
+    @Column(nullable = false)
+    private String street;
+
+    @Column(name = "postal_code", nullable = false)
+    private String postalCode;
+
+    @Column(nullable = false)
+    private String city;
+
+    @Column(nullable = false)
+    private String country;
+
+
+    public Long getAddressId() {
+        return addressId;
+    }
+
+    public void setAddressId(Long addressId) {
+        this.addressId = addressId;
+    }
+
+    public String getStreet() {
+        return street;
+    }
+
+    public void setStreet(String street) {
+        this.street = street;
+    }
+
+    public String getPostalCode() {
+        return postalCode;
+    }
+
+    public void setPostalCode(String postalCode) {
+        this.postalCode = postalCode;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+}