Merge branch 'release_2.5.0'

# Conflicts: # README.md # gwt-test/pom.xml # pom.xml # src/main/resources/META-INF/maven/archetype-metadata.xml # src/main/resources/archetype-resources/pom.xml # src/main/resources/archetype-resources/src/main/java/client/application/home/HomeView.ui.xml
GwtMaterialDesign · Sep 6, 2021 · 2f7134b · 2f7134b
2 parents 0875b47 + 8f6357a
commit 2f7134b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -1,44 +1,46 @@
 # gwt-material-archetype
 Archetype for a web application that uses GWT Material Design
 
-# Current Version - 2.4.2
+# Current Version - 2.5.0
 ### Includes
-- Updated GWT Version to 2.9.0
-- Updated JQuery Version to 3.5.1
-- Updated GMD Version to  2.4.2
+- Updated GWT Version to 2.8.2
+- Updated GWTP Version to 1.5.3
+- Updated GMD Version to  2.5.0
 
 # Usage:
 1. Download the archetype
 2. From the download folder, install the archetype in your local Maven repo by running this command: <code>mvn clean install</code>
-3. Create a new project by running the following command in a folder of your choice: <code>mvn archetype:generate -DarchetypeGroupId=com.github.gwtmaterialdesign -DarchetypeArtifactId=gwt-material-archetype -DarchetypeVersion=2.3.0</code>
+3. Create a new project by running the following command in a folder of your choice: <code>mvn archetype:generate -DarchetypeGroupId=com.github.gwtmaterialdesign -DarchetypeArtifactId=gwt-material-archetype -DarchetypeVersion=2.3.2</code>
 4. Follow the prompts
 
         mvn clean install archetype:update-local-catalog
 
 3. Create a new project by running the following command in a folder of your choice:
-        mvn archetype:generate -DarchetypeGroupId=com.github.gwtmaterialdesign -DarchetypeArtifactId=gwt-material-archetype -DarchetypeVersion=2.4.2
 
+        mvn archetype:generate -DarchetypeGroupId=com.github.gwtmaterialdesign \
+          -DarchetypeArtifactId=gwt-material-archetype \
+          -DarchetypeVersion=2.5.0
 
 4. Follow the prompts. That's it!
 
 5. Optionally you could specify all the parameters in the command line instead of following the prompts:
 
         mvn archetype:generate -DarchetypeGroupId=com.github.gwtmaterialdesign \
           -DarchetypeArtifactId=gwt-material-archetype \
-          -DarchetypeVersion=2.4.2 \
+          -DarchetypeVersion=2.5.0
           -DgroupId=your.company.domain \
           -Dpackage=your.company.domain.myapp \
           -DartifactId=your-project \
           -DprojectName=YourProjectName \
           -DmoduleName=myapp
-          
+
 6. You can also generate a project from Snapshot using the code below:
 
         mvn archetype:generate -DarchetypeGroupId=com.github.gwtmaterialdesign 
          -DarchetypeArtifactId=gwt-material-archetype 
          -DarchetypeRepository=https://oss.sonatype.org/content/repositories/snapshots/
-         -DarchetypeVersion=2.5.0-SNAPSHOT
-     
+         -DarchetypeVersion=2.6.0-SNAPSHOT
+
 # Test/Run
 
 Executing the next line, it should open the `GWT Development Mode` window from which you can select `Launch Default Browser` to open the sample application in a browser.

diff --git a/gwt-test/pom.xml b/gwt-test/pom.xml
@@ -36,7 +36,7 @@
         <gwt.version>2.8.2</gwt.version>
         <gwtp.version>1.6</gwtp.version>
         <gin.version>2.1.2</gin.version>
-        <gwt-material.version>2.4.2</gwt-material.version>
+        <gwt-material.version>2.5.0</gwt-material.version>
 
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>

diff --git a/pom.xml b/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <artifactId>gwt-material-parent</artifactId>
         <groupId>com.github.gwtmaterialdesign</groupId>
-        <version>2.4.2</version>
+        <version>2.5.0</version>
     </parent>
 
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-archetype</artifactId>
-    <version>2.4.2</version>
+    <version>2.5.0</version>
     <packaging>jar</packaging>
 
     <name>Gwt Material Archetype</name>

diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -40,7 +40,7 @@
             <defaultValue>${groupId}</defaultValue>
         </requiredProperty>
         <requiredProperty key="gwt-material-version">
-            <defaultValue>2.4.2</defaultValue>
+            <defaultValue>2.5.0</defaultValue>
         </requiredProperty>
     </requiredProperties>
     <fileSets>

diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
@@ -36,7 +36,7 @@
         <gwt.version>2.8.2</gwt.version>
         <gwtp.version>1.6</gwtp.version>
         <gin.version>2.1.2</gin.version>
-        <gwt-material.version>2.4.2</gwt-material.version>
+        <gwt-material.version>2.5.0</gwt-material.version>
 
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>

diff --git a/src/main/resources/archetype-resources/src/main/java/client/application/home/HomeView.ui.xml b/src/main/resources/archetype-resources/src/main/java/client/application/home/HomeView.ui.xml
@@ -25,7 +25,7 @@
             <m:MaterialPanel style="margin: auto">
                 <m:MaterialImage url="https://gwtmaterialdesign.github.io/gmd-core-demo/launcher-icons/launcher1x.png" alt="logo"/>
                 <m:MaterialLabel text="Welcome to gwt-material World" fontSize="2em"/>
-                <m:MaterialLabel text="Version 2.4.2" />
+                <m:MaterialLabel text="Version 2.5.0" />
             </m:MaterialPanel>
         </m:MaterialPanel>
     </m:MaterialPanel>