diff --git a/pom.xml b/pom.xml index 43ff471..5a91fcc 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ com.bernardomg.maven.archetypes spring-mvc-angular-archetype - 1.0.1 + 1.0.2 maven-archetype Spring MVC with Angular Maven Archetype @@ -169,7 +169,7 @@ - 2.0.10 + 2.0.11 https://dl.bintray.com/bernardo-mg/maven/ https://bintray.com/bernardo-mg/maven/spring-mvc-angular-maven-archetype/view http://mvnrepository.com/artifact/com.bernardomg.maven.archetypes/spring-mvc-angular-archetype diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 7f740b1..f270523 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -18,5 +18,10 @@ Corrected docs. + + + Updated Maven skin after finding a breaking bug. + + \ No newline at end of file diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml index 5695134..a7a85fc 100644 --- a/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -11,7 +11,7 @@ A Spring MVC project using Angular for the views. - 2020 + 2021 bmg diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml index 0f1733f..5b9aadc 100644 --- a/src/main/resources/archetype-resources/pom.xml +++ b/src/main/resources/archetype-resources/pom.xml @@ -355,7 +355,7 @@ 1.10.13 1.5.1 1.2 - 2.2 + 2.2 29.0-jre 1.4.200 2.2 @@ -390,7 +390,7 @@ - 2.0.10 + 2.0.11 @@ -715,7 +715,7 @@ org.glassfish.web el-impl - ${glassfish.el} + ${glassfish.el.version} provided diff --git a/src/main/resources/archetype-resources/src/main/java/controller/HomeController.java b/src/main/resources/archetype-resources/src/main/java/controller/HomeController.java deleted file mode 100644 index f8700bf..0000000 --- a/src/main/resources/archetype-resources/src/main/java/controller/HomeController.java +++ /dev/null @@ -1,63 +0,0 @@ -/** - * The MIT License (MIT) - *

- * Copyright (c) ${currentYear} the original author or authors. - *

- * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - *

- * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package ${package}.controller; - -import org.springframework.http.MediaType; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * Controller for the home view. - * - * @author Bernardo Martínez Garrido - */ -@Controller -@RequestMapping("/(?!static)**") -public class HomeController { - - /** - * Name for the welcome view. - */ - private static final String VIEW_WELCOME = "index"; - - /** - * Default constructor. - */ - public HomeController() { - super(); - } - - /** - * Shows the welcome view. - * - * @return the welcome view - */ - @GetMapping(produces = MediaType.TEXT_HTML_VALUE) - public String showWelcome() { - return VIEW_WELCOME; - } - -} diff --git a/src/main/resources/archetype-resources/src/main/resources/messages/application.properties b/src/main/resources/archetype-resources/src/main/resources/messages/application.properties deleted file mode 100644 index 2aa00c2..0000000 --- a/src/main/resources/archetype-resources/src/main/resources/messages/application.properties +++ /dev/null @@ -1,18 +0,0 @@ -# General application messages -application.title=${projectName} - -button.submit=Submit - -label.add=Add -label.exception=Exception -label.list=Listing -label.list.ajax=Listing (AJAX) -label.pdf=PDF Report -label.name=Name - -title.data=Data Options -title.entity.form=Add an Entity -title.entity.form.data=Entity Data -title.entity.list=Entities - -error.pageNotFound=Page not found