readme fixes

.all-contributorsrc

@@ -1786,24 +1786,6 @@
       "contributions": [
         "code"
       ]
-    },
-    {
-      "login": "ShivanshCharak",
-      "name": "ShivanshCharak",
-      "avatar_url": "https://avatars.githubusercontent.com/u/96943825?v=4",
-      "profile": "https://github.com/ShivanshCharak",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "HattoriHenzo",
-      "name": "HattoriHenzo",
-      "avatar_url": "https://avatars.githubusercontent.com/u/5141285?v=4",
-      "profile": "https://github.com/HattoriHenzo",
-      "contributions": [
-        "code"
-      ]
     }
   ],
   "contributorsPerLine": 7,

.gitignore

@@ -12,7 +12,6 @@ tmp/
 local.properties
 .loadpath
 .recommenders
-.DS_Store
 
 #######  Java annotation processor (APT) ########
 .factorypath

.mvn/wrapper/maven-wrapper.properties

@@ -1,18 +1,25 @@
-# Licensed to the Apache Software Foundation (ASF) under one
+#
-# or more contributor license agreements.  See the NOTICE file
+# The MIT License
-# distributed with this work for additional information
+# Copyright © 2014-2021 Ilkka Seppälä
-# regarding copyright ownership.  The ASF licenses this file
+#
-# to you under the Apache License, Version 2.0 (the
+# Permission is hereby granted, free of charge, to any person obtaining a copy
-# "License"); you may not use this file except in compliance
+# of this software and associated documentation files (the "Software"), to deal
-# with the License.  You may obtain a copy of the License at
+# in the Software without restriction, including without limitation the rights
-# 
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-#   http://www.apache.org/licenses/LICENSE-2.0
+# copies of the Software, and to permit persons to whom the Software is
-# 
+# furnished to do so, subject to the following conditions:
-# Unless required by applicable law or agreed to in writing,
+#
-# software distributed under the License is distributed on an
+# The above copyright notice and this permission notice shall be included in
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# all copies or substantial portions of the Software.
-# KIND, either express or implied.  See the License for the
+#
-# specific language governing permissions and limitations
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# under the License.
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
+# 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.
+#
+
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

README.md

@@ -10,7 +10,7 @@
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=coverage)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns)
 [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-198-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-196-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 <br/>
@@ -321,15 +321,14 @@ This project is licensed under the terms of the MIT license.
   <tr>
     <td align="center"><a href="https://www.linkedin.com/in/abhinav-vashisth-06613b208/"><img src="https://avatars.githubusercontent.com/u/89785800?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Abhinav Vashisth</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=vashisthabhinav" title="Documentation">📖</a></td>
     <td align="center"><a href="http://no website"><img src="https://avatars.githubusercontent.com/u/47126749?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kevin</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/pulls?q=is%3Apr+reviewed-by%3AKevinyl3" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/iluwatar/java-design-patterns/commits?author=Kevinyl3" title="Code">💻</a></td>
+    <td align="center"><a href="http://no website"><img src="https://avatars.githubusercontent.com/u/47126749?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kevin</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/pulls?q=is%3Apr+reviewed-by%3AKevinyl3" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/Shrirang97"><img src="https://avatars.githubusercontent.com/u/28738668?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shrirang</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/pulls?q=is%3Apr+reviewed-by%3AShrirang97" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/iluwatar/java-design-patterns/commits?author=Shrirang97" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/interactwithankush"><img src="https://avatars.githubusercontent.com/u/18613127?v=4?s=100" width="100px;" alt=""/><br /><sub><b>interactwithankush</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=interactwithankush" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/yuhangbin"><img src="https://avatars.githubusercontent.com/u/17566866?v=4?s=100" width="100px;" alt=""/><br /><sub><b>CharlieYu</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=yuhangbin" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/Leisterbecker"><img src="https://avatars.githubusercontent.com/u/20650323?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Leisterbecker</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=Leisterbecker" title="Code">💻</a></td>
-    <td align="center"><a href="http://rosaecrucis.cn"><img src="https://avatars.githubusercontent.com/u/35420129?v=4?s=100" width="100px;" alt=""/><br /><sub><b>DragonDreamer</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=castleKing1997" title="Code">💻</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://github.com/ShivanshCharak"><img src="https://avatars.githubusercontent.com/u/96943825?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ShivanshCharak</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=ShivanshCharak" title="Code">💻</a></td>
+    <td align="center"><a href="http://rosaecrucis.cn"><img src="https://avatars.githubusercontent.com/u/35420129?v=4?s=100" width="100px;" alt=""/><br /><sub><b>DragonDreamer</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=castleKing1997" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/HattoriHenzo"><img src="https://avatars.githubusercontent.com/u/5141285?v=4?s=100" width="100px;" alt=""/><br /><sub><b>HattoriHenzo</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=HattoriHenzo" title="Code">💻</a></td>
   </tr>
 </table>
 

acyclic-visitor/src/main/java/com/iluwatar/acyclicvisitor/Hayes.java

@@ -29,7 +29,7 @@ import lombok.extern.slf4j.Slf4j;
  * Hayes class implements its accept method.
  */
 @Slf4j
-public class Hayes implements Modem {
+public class Hayes extends Modem {
 
   /**
    * Accepts all visitors but honors only HayesVisitor.

acyclic-visitor/src/main/java/com/iluwatar/acyclicvisitor/Modem.java

@@ -24,9 +24,8 @@
 package com.iluwatar.acyclicvisitor;
 
 /**
- * //Modem abstract class.
+ * Modem abstract class.
- * converted to an interface
  */
-public interface Modem {
+public abstract class Modem {
-  void accept(ModemVisitor modemVisitor);
+  public abstract void accept(ModemVisitor modemVisitor);
 }

acyclic-visitor/src/main/java/com/iluwatar/acyclicvisitor/Zoom.java

@@ -29,7 +29,7 @@ import lombok.extern.slf4j.Slf4j;
  * Zoom class implements its accept method.
  */
 @Slf4j
-public class Zoom implements Modem {
+public class Zoom extends Modem {
 
   /**
    * Accepts all visitors but honors only ZoomVisitor.

composite-view/README.md

@@ -10,26 +10,28 @@ tags:
 - Presentation
 ---
 
-## Name
-**Composite View**
-
 ## Intent
+
 The purpose of the Composite View Pattern is to increase re-usability and flexibility when creating views for websites/webapps. 
 This pattern seeks to decouple the content of the page from its layout, allowing changes to be made to either the content
 or layout of the page without impacting the other. This pattern also allows content to be easily reused across different views easily.
 
 ## Explanation
-Real World Example
+
+Real-world example
+
 > A news site wants to display the current date and news to different users
 > based on that user's preferences. The news site will substitute in different news feed
 > components depending on the user's interest, defaulting to local news.
 
-In Plain Words
+In plain words
+
 > Composite View Pattern is having a main view being composed of smaller subviews.
 > The layout of this composite view is based on a template. A View-manager then decides which
 > subviews to include in this template.
 
-Wikipedia Says
+Wikipedia says
+
 > Composite views that are composed of multiple atomic subviews. Each component of 
 > the template may be included dynamically into the whole and the layout of the page may be managed independently of the content.
 > This solution provides for the creation of a composite view based on the inclusion and substitution of 
@@ -42,6 +44,7 @@ Since this is a web development pattern, a server is required to demonstrate it.
 This example uses Tomcat 10.0.13 to run the servlet, and this programmatic example will only work with Tomcat 10+.
 
 Firstly there is `AppServlet` which is an `HttpServlet` that runs on Tomcat 10+.
+
 ```java
 public class AppServlet extends HttpServlet {
   private String msgPartOne = "<h1>This Server Doesn't Support";
@@ -91,12 +94,13 @@ public class AppServlet extends HttpServlet {
 
   }
 }
-
 ```
+
 This servlet is not part of the pattern, and simply forwards GET requests to the correct JSP.
 PUT, POST, and DELETE requests are not supported and will simply show an error message.
 
 The view management in this example is done via a javabean class: `ClientPropertiesBean`, which stores user preferences.
+
 ```java
 public class ClientPropertiesBean implements Serializable {
 
@@ -136,11 +140,13 @@ public class ClientPropertiesBean implements Serializable {
   // getters and setters generated by Lombok 
 }
 ```
+
 This javabean has a default constructor, and another that takes an `HttpServletRequest`.
 This second constructor takes the request object, parses out the request parameters which contain the
 user preferences for different types of news.
 
 The template for the news page is in `newsDisplay.jsp`
+
 ```html
 <html>
 <head>
@@ -198,6 +204,7 @@ The template for the news page is in `newsDisplay.jsp`
 </body>
 </html>
 ```
+
 This JSP page is the template. It declares a table with three rows, with one component in the first row,
 two components in the second row, and one component in the third row. 
 
@@ -205,7 +212,9 @@ The scriplets in the file are part of the
 view management strategy that include different atomic subviews based on the user preferences in the Javabean.
 
 Here are two examples of the mock atomic subviews used in the composite:
+
 `businessNews.jsp`
+
 ```html
 <html>
     <head>
@@ -233,7 +242,9 @@ Here are two examples of the mock atomic subviews used in the composite:
     </body>
 </html>
 ```
+
 `localNews.jsp`
+
 ```html
 <html>
     <body>
@@ -259,11 +270,15 @@ Here are two examples of the mock atomic subviews used in the composite:
     </body>
 </html>
 ```
+
 The results are as such:
 
-1) The user has put their name as `Tammy` in the request parameters and no preferences: 
+1) The user has put their name as `Tammy` in the request parameters and no preferences:
+
 ![alt text](etc/images/noparam.PNG)
+
 2) The user has put their name as `Johnny` in the request parameters and has a preference for world, business, and science news:
+
 ![alt text](etc/images/threeparams.PNG)
 
 The different subviews such as `worldNews.jsp`, `businessNews.jsp`, etc. are included conditionally
@@ -304,6 +319,7 @@ that are included in the page dynamically. Most modern Javascript libraries, lik
 with components.
 
 ## Consequences
+
 **Pros**
 * Easy to re-use components
 * Change layout/content without affecting the other
@@ -316,10 +332,11 @@ with components.
 * Increases potential for display errors 
 
 ## Related patterns
+
 * [Composite (GoF)](https://java-design-patterns.com/patterns/composite/)
 * [View Helper](https://www.oracle.com/java/technologies/viewhelper.html)
 
 ## Credits
+
 * [Core J2EE Patterns - Composite View](https://www.oracle.com/java/technologies/composite-view.html)
 * [Composite View Design Pattern – Core J2EE Patterns](https://www.dineshonjava.com/composite-view-design-pattern/)
-

model-view-viewmodel/pom.xml

@@ -41,7 +41,7 @@
     <zk.version>9.0.0</zk.version>
     <guava.version>19.0</guava.version>
     <jetty-maven-plugin.version>9.4.28.v20200408</jetty-maven-plugin.version>
-    <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
+    <maven-war-plugin.version>2.1.1</maven-war-plugin.version>
     <maven-assembly-plugin.version>2.2</maven-assembly-plugin.version>
     <maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
     <packname>-${project.version}-FL-${maven.build.timestamp}</packname>

multiton/README.md

@@ -15,18 +15,18 @@ Registry
 
 ## Intent
 
-Ensure a class only has a limited number of instances and provide a global point of access to them.
+Ensure a class only has limited number of instances and provide a global point of access to them.
 
 ## Explanation
 
-Real-world example
+Real world example
 
 > The Nazgûl, also called ringwraiths or the Nine Riders, are Sauron's most terrible servants. By 
-> definition, there's always nine of them.           
+> definition there's always nine of them.           
 
 In plain words
 
-> Multiton pattern ensures there are a predefined amount of instances available globally.   
+> Multiton pattern ensures there's predefined amount of instances available globally.   
 
 Wikipedia says
 
@@ -81,54 +81,29 @@ public final class Nazgul {
 And here's how we access the `Nazgul` instances.
 
 ```java
-// eagerly initialized multiton
+    LOGGER.info("KHAMUL={}", Nazgul.getInstance(NazgulName.KHAMUL));
-LOGGER.info("Printing out eagerly initialized multiton contents");
+    LOGGER.info("MURAZOR={}", Nazgul.getInstance(NazgulName.MURAZOR));
-LOGGER.info("KHAMUL={}", Nazgul.getInstance(NazgulName.KHAMUL));
+    LOGGER.info("DWAR={}", Nazgul.getInstance(NazgulName.DWAR));
-LOGGER.info("MURAZOR={}", Nazgul.getInstance(NazgulName.MURAZOR));
+    LOGGER.info("JI_INDUR={}", Nazgul.getInstance(NazgulName.JI_INDUR));
-LOGGER.info("DWAR={}", Nazgul.getInstance(NazgulName.DWAR));
+    LOGGER.info("AKHORAHIL={}", Nazgul.getInstance(NazgulName.AKHORAHIL));
-LOGGER.info("JI_INDUR={}", Nazgul.getInstance(NazgulName.JI_INDUR));
+    LOGGER.info("HOARMURATH={}", Nazgul.getInstance(NazgulName.HOARMURATH));
-LOGGER.info("AKHORAHIL={}", Nazgul.getInstance(NazgulName.AKHORAHIL));
+    LOGGER.info("ADUNAPHEL={}", Nazgul.getInstance(NazgulName.ADUNAPHEL));
-LOGGER.info("HOARMURATH={}", Nazgul.getInstance(NazgulName.HOARMURATH));
+    LOGGER.info("REN={}", Nazgul.getInstance(NazgulName.REN));
-LOGGER.info("ADUNAPHEL={}", Nazgul.getInstance(NazgulName.ADUNAPHEL));
+    LOGGER.info("UVATHA={}", Nazgul.getInstance(NazgulName.UVATHA));
-LOGGER.info("REN={}", Nazgul.getInstance(NazgulName.REN));
-LOGGER.info("UVATHA={}", Nazgul.getInstance(NazgulName.UVATHA));
-
-// enum multiton
-LOGGER.info("Printing out enum-based multiton contents");
-LOGGER.info("KHAMUL={}", NazgulEnum.KHAMUL);
-LOGGER.info("MURAZOR={}", NazgulEnum.MURAZOR);
-LOGGER.info("DWAR={}", NazgulEnum.DWAR);
-LOGGER.info("JI_INDUR={}", NazgulEnum.JI_INDUR);
-LOGGER.info("AKHORAHIL={}", NazgulEnum.AKHORAHIL);
-LOGGER.info("HOARMURATH={}", NazgulEnum.HOARMURATH);
-LOGGER.info("ADUNAPHEL={}", NazgulEnum.ADUNAPHEL);
-LOGGER.info("REN={}", NazgulEnum.REN);
-LOGGER.info("UVATHA={}", NazgulEnum.UVATHA);
 ```
 
 Program output:
 
 ```
-20:35:07.413 [main] INFO com.iluwatar.multiton.App - Printing out eagerly initialized multiton contents
+KHAMUL=com.iluwatar.multiton.Nazgul@2b214b94
-20:35:07.417 [main] INFO com.iluwatar.multiton.App - KHAMUL=com.iluwatar.multiton.Nazgul@48cf768c
+MURAZOR=com.iluwatar.multiton.Nazgul@17814b1c
-20:35:07.419 [main] INFO com.iluwatar.multiton.App - MURAZOR=com.iluwatar.multiton.Nazgul@7960847b
+DWAR=com.iluwatar.multiton.Nazgul@7ac9af2a
-20:35:07.419 [main] INFO com.iluwatar.multiton.App - DWAR=com.iluwatar.multiton.Nazgul@6a6824be
+JI_INDUR=com.iluwatar.multiton.Nazgul@7bb004b8
-20:35:07.419 [main] INFO com.iluwatar.multiton.App - JI_INDUR=com.iluwatar.multiton.Nazgul@5c8da962
+AKHORAHIL=com.iluwatar.multiton.Nazgul@78e89bfe
-20:35:07.419 [main] INFO com.iluwatar.multiton.App - AKHORAHIL=com.iluwatar.multiton.Nazgul@512ddf17
+HOARMURATH=com.iluwatar.multiton.Nazgul@652ce654
-20:35:07.419 [main] INFO com.iluwatar.multiton.App - HOARMURATH=com.iluwatar.multiton.Nazgul@2c13da15
+ADUNAPHEL=com.iluwatar.multiton.Nazgul@522ba524
-20:35:07.419 [main] INFO com.iluwatar.multiton.App - ADUNAPHEL=com.iluwatar.multiton.Nazgul@77556fd
+REN=com.iluwatar.multiton.Nazgul@29c5ee1d
-20:35:07.419 [main] INFO com.iluwatar.multiton.App - REN=com.iluwatar.multiton.Nazgul@368239c8
+UVATHA=com.iluwatar.multiton.Nazgul@15cea7b0
-20:35:07.420 [main] INFO com.iluwatar.multiton.App - UVATHA=com.iluwatar.multiton.Nazgul@9e89d68
-20:35:07.420 [main] INFO com.iluwatar.multiton.App - Printing out enum-based multiton contents
-20:35:07.420 [main] INFO com.iluwatar.multiton.App - KHAMUL=KHAMUL
-20:35:07.420 [main] INFO com.iluwatar.multiton.App - MURAZOR=MURAZOR
-20:35:07.420 [main] INFO com.iluwatar.multiton.App - DWAR=DWAR
-20:35:07.420 [main] INFO com.iluwatar.multiton.App - JI_INDUR=JI_INDUR
-20:35:07.421 [main] INFO com.iluwatar.multiton.App - AKHORAHIL=AKHORAHIL
-20:35:07.421 [main] INFO com.iluwatar.multiton.App - HOARMURATH=HOARMURATH
-20:35:07.421 [main] INFO com.iluwatar.multiton.App - ADUNAPHEL=ADUNAPHEL
-20:35:07.421 [main] INFO com.iluwatar.multiton.App - REN=REN
-20:35:07.421 [main] INFO com.iluwatar.multiton.App - UVATHA=UVATHA
 ```
 
 ## Class diagram
@@ -139,5 +114,5 @@ Program output:
 
 Use the Multiton pattern when
 
-* There must be a specific number of instances of a class, and they must be accessible to clients from 
+* There must be specific number of instances of a class, and they must be accessible to clients from 
 a well-known access point.

multiton/src/main/java/com/iluwatar/multiton/App.java

@@ -26,13 +26,13 @@ package com.iluwatar.multiton;
 import lombok.extern.slf4j.Slf4j;
 
 /**
- * Whereas Singleton design pattern introduces single globally accessible object, the Multiton
+ * Whereas Singleton design pattern introduces single globally accessible object the Multiton
  * pattern defines many globally accessible objects. The client asks for the correct instance from
- * the Multiton by passing an enumeration as a parameter.
+ * the Multiton by passing an enumeration as parameter.
  *
  * <p>There is more than one way to implement the multiton design pattern. In the first example
  * {@link Nazgul} is the Multiton and we can ask single {@link Nazgul} from it using {@link
- * NazgulName}. The {@link Nazgul}s are statically initialized and stored in a concurrent hash map.
+ * NazgulName}. The {@link Nazgul}s are statically initialized and stored in concurrent hash map.
  *
  * <p>In the enum implementation {@link NazgulEnum} is the multiton. It is static and mutable
  * because of the way java supports enums.
@@ -47,7 +47,6 @@ public class App {
    */
   public static void main(String[] args) {
     // eagerly initialized multiton
-    LOGGER.info("Printing out eagerly initialized multiton contents");
     LOGGER.info("KHAMUL={}", Nazgul.getInstance(NazgulName.KHAMUL));
     LOGGER.info("MURAZOR={}", Nazgul.getInstance(NazgulName.MURAZOR));
     LOGGER.info("DWAR={}", Nazgul.getInstance(NazgulName.DWAR));
@@ -59,7 +58,6 @@ public class App {
     LOGGER.info("UVATHA={}", Nazgul.getInstance(NazgulName.UVATHA));
 
     // enum multiton
-    LOGGER.info("Printing out enum-based multiton contents");
     LOGGER.info("KHAMUL={}", NazgulEnum.KHAMUL);
     LOGGER.info("MURAZOR={}", NazgulEnum.MURAZOR);
     LOGGER.info("DWAR={}", NazgulEnum.DWAR);

multiton/src/test/java/com/iluwatar/multiton/NazgulTest.java

@@ -48,4 +48,5 @@ public class NazgulTest {
       assertEquals(name, nazgul.getName());
     }
   }
+
 }

mvnw

@@ -36,10 +36,6 @@
 
 if [ -z "$MAVEN_SKIP_RC" ] ; then
 
-  if [ -f /usr/local/etc/mavenrc ] ; then
-    . /usr/local/etc/mavenrc
-  fi
-
   if [ -f /etc/mavenrc ] ; then
     . /etc/mavenrc
   fi
@@ -149,7 +145,7 @@ if [ -z "$JAVACMD" ] ; then
       JAVACMD="$JAVA_HOME/bin/java"
     fi
   else
-    JAVACMD="`\\unset -f command; \\command -v java`"
+    JAVACMD="`which java`"
   fi
 fi
 
@@ -216,9 +212,9 @@ else
       echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
     fi
     if [ -n "$MVNW_REPOURL" ]; then
-      jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     else
-      jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     fi
     while IFS="=" read key value; do
       case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
@@ -237,9 +233,9 @@ else
           echo "Found wget ... using wget"
         fi
         if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+            wget "$jarUrl" -O "$wrapperJarPath"
         else
-            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
         fi
     elif command -v curl > /dev/null; then
         if [ "$MVNW_VERBOSE" = true ]; then
@@ -309,8 +305,6 @@ WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
 exec "$JAVACMD" \
   $MAVEN_OPTS \
-  $MAVEN_DEBUG_OPTS \
   -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-  "-Dmaven.home=${M2_HOME}" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
   ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

mvnw.cmd

@@ -1,21 +1,25 @@
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements.  See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership.  The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License.  You may obtain a copy of the License at
 @REM
-@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM The MIT License
+@REM Copyright © 2014-2021 Ilkka Seppälä
+@REM
+@REM Permission is hereby granted, free of charge, to any person obtaining a copy
+@REM of this software and associated documentation files (the "Software"), to deal
+@REM in the Software without restriction, including without limitation the rights
+@REM to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+@REM copies of the Software, and to permit persons to whom the Software is
+@REM furnished to do so, subject to the following conditions:
+@REM
+@REM The above copyright notice and this permission notice shall be included in
+@REM all copies or substantial portions of the Software.
+@REM
+@REM THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+@REM IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+@REM FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+@REM AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+@REM LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+@REM OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+@REM THE SOFTWARE.
 @REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied.  See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
 
 @REM ----------------------------------------------------------------------------
 @REM Maven Start Up Batch script
@@ -46,8 +50,8 @@ if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
 @REM Execute a user defined script before this one
 if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
 @REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
 :skipRcPre
 
 @setlocal
@@ -120,9 +124,9 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
 set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
 
-FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
     IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
 )
 
@@ -134,7 +138,7 @@ if exist %WRAPPER_JAR% (
     )
 ) else (
     if not "%MVNW_REPOURL%" == "" (
-        SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     )
     if "%MVNW_VERBOSE%" == "true" (
         echo Couldn't find %WRAPPER_JAR%, downloading it ...
@@ -158,13 +162,7 @@ if exist %WRAPPER_JAR% (
 @REM work with both Windows and non-Windows executions.
 set MAVEN_CMD_LINE_ARGS=%*
 
-%MAVEN_JAVA_EXE% ^
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
-  %JVM_CONFIG_MAVEN_PROPS% ^
-  %MAVEN_OPTS% ^
-  %MAVEN_DEBUG_OPTS% ^
-  -classpath %WRAPPER_JAR% ^
-  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
-  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
 if ERRORLEVEL 1 goto error
 goto end
 
@@ -174,15 +172,15 @@ set ERROR_CODE=1
 :end
 @endlocal & set ERROR_CODE=%ERROR_CODE%
 
-if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
 @REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
 :skipRcPost
 
 @REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%"=="on" pause
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
 
-if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
 
-cmd /C exit /B %ERROR_CODE%
+exit /B %ERROR_CODE%

naked-objects/README

@@ -0,0 +1 @@
+This is an Apache Isis application created with the SimpleApp archetype. The usage instructions can be found at http://isis.apache.org/guides/ug.html#_ug_getting-started_simpleapp-archetype

naked-objects/pom.xml

@@ -150,7 +150,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-war-plugin</artifactId>
-          <version>3.3.2</version>
+          <version>2.4</version>
         </plugin>
         <plugin>
           <groupId>org.mortbay.jetty</groupId>