You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/11/29 17:23:12 UTC

[1/2] isis git commit: ISIS-1538: introduce properties for versions of mavenmixins

Repository: isis
Updated Branches:
  refs/heads/maint-1.13.2 d05bc7615 -> 506babfc7


ISIS-1538: introduce properties for versions of mavenmixins


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a79127e6
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a79127e6
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a79127e6

Branch: refs/heads/maint-1.13.2
Commit: a79127e65ce6711ba0e1ec342b1cfefabc32bda2
Parents: d05bc76
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Nov 29 17:01:06 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Nov 29 17:01:06 2016 +0000

----------------------------------------------------------------------
 .../application/simpleapp/application/pom.xml   |  8 +++----
 .../application/simpleapp/module-simple/pom.xml | 24 ++++++++------------
 example/application/simpleapp/pom.xml           | 12 ++++++++++
 example/application/simpleapp/webapp/pom.xml    | 10 ++++----
 4 files changed, 30 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/a79127e6/example/application/simpleapp/application/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/application/pom.xml b/example/application/simpleapp/application/pom.xml
index 06c3c18..0dd65d9 100644
--- a/example/application/simpleapp/application/pom.xml
+++ b/example/application/simpleapp/application/pom.xml
@@ -77,22 +77,22 @@
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>standard</artifactId>
-                            <version>0.0.1</version>
+                            <version>${danhaywood-mavenmixin-standard.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>enforcerrelaxed</artifactId>
-                            <version>0.0.1</version>
+                            <version>${danhaywood-mavenmixin-enforcerelaxed.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>surefire</artifactId>
-                            <version>0.0.2</version>
+                            <version>${danhaywood-mavenmixin-surefire.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>cucumberreporting</artifactId>
-                            <version>0.0.1</version>
+                            <version>${danhaywood-mavenmixin-cucumberreporting.version}</version>
                         </mixin>
                     </mixins>
                 </configuration>

http://git-wip-us.apache.org/repos/asf/isis/blob/a79127e6/example/application/simpleapp/module-simple/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/module-simple/pom.xml b/example/application/simpleapp/module-simple/pom.xml
index e3a64aa..06d656c 100644
--- a/example/application/simpleapp/module-simple/pom.xml
+++ b/example/application/simpleapp/module-simple/pom.xml
@@ -73,37 +73,37 @@
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>standard</artifactId>
-                            <version>0.0.1</version>
+                            <version>${danhaywood-mavenmixin-standard.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>enforcerrelaxed</artifactId>
-                            <version>0.0.1-SNAPSHOT</version>
+                            <version>${danhaywood-mavenmixin-enforcerelaxed.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>datanucleusenhance</artifactId>
-                            <version>0.0.2</version>
+                            <version>${danhaywood-mavenmixin-datanucleusenhance.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>isisvalidate</artifactId>
-                            <version>0.0.1</version>
+                            <version>${danhaywood-mavenmixin-isisvalidate.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>surefire</artifactId>
-                            <version>0.0.2</version>
+                            <version>${danhaywood-mavenmixin-surefire.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>sourceandjavadoc</artifactId>
-                            <version>0.0.1</version>
+                            <version>${danhaywood-mavenmixin-sourceandjavadoc.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>staticanalysis</artifactId>
-                            <version>0.0.1</version>
+                            <version>${danhaywood-mavenmixin-staticanalysis.version}</version>
                         </mixin>
                     </mixins>
                 </configuration>
@@ -112,15 +112,9 @@
     </build>
 
     <properties>
-        <danhaywood-mavenmixin-isisvalidate>
+        <danhaywood-mavenmixin-isisvalidate.appManifest>
                 domainapp.modules.simple.SimpleModuleManifest
-        </danhaywood-mavenmixin-isisvalidate>
-        <danhaywood-mavenmixin-staticanalysis.checkstyle.configLocation>
-            ${project.parent.basedir}/_checks/checkstyle.xml
-        </danhaywood-mavenmixin-staticanalysis.checkstyle.configLocation>
-        <danhaywood-mavenmixin-staticanalysis.pmd.ruleset>
-            ${project.parent.basedir}/_checks/pmd.xml
-        </danhaywood-mavenmixin-staticanalysis.pmd.ruleset>
+        </danhaywood-mavenmixin-isisvalidate.appManifest>
     </properties>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/isis/blob/a79127e6/example/application/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index da13b64..e47e2b3 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -39,6 +39,18 @@
         <lombok.version>1.16.10</lombok.version>
         <assertj-core.version>3.6.0</assertj-core.version>
 
+        <danhaywood-mavenmixin-cucumberreporting.version>0.0.1</danhaywood-mavenmixin-cucumberreporting.version>
+        <danhaywood-mavenmixin-enforcerelaxed.version>0.0.1</danhaywood-mavenmixin-enforcerelaxed.version>
+        <danhaywood-mavenmixin-datanucleusenhance.version>0.0.3</danhaywood-mavenmixin-datanucleusenhance.version>
+        <danhaywood-mavenmixin-isisswagger.version>0.0.2</danhaywood-mavenmixin-isisswagger.version>
+        <danhaywood-mavenmixin-isisvalidate.version>0.0.1</danhaywood-mavenmixin-isisvalidate.version>
+        <danhaywood-mavenmixin-jettyconsole.version>0.0.1</danhaywood-mavenmixin-jettyconsole.version>
+        <danhaywood-mavenmixin-jettywar.version>0.0.1</danhaywood-mavenmixin-jettywar.version>
+        <danhaywood-mavenmixin-sourceandjavadoc.version>0.0.1</danhaywood-mavenmixin-sourceandjavadoc.version>
+        <danhaywood-mavenmixin-standard.version>0.0.1</danhaywood-mavenmixin-standard.version>
+        <danhaywood-mavenmixin-surefire.version>0.0.2</danhaywood-mavenmixin-surefire.version>
+        <danhaywood-mavenmixin-staticanalysis.version>0.0.1</danhaywood-mavenmixin-staticanalysis.version>
+
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>

http://git-wip-us.apache.org/repos/asf/isis/blob/a79127e6/example/application/simpleapp/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index 8cb3c3c..5e8e7d8 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -96,27 +96,27 @@
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>standard</artifactId>
-                            <version>0.0.1</version>
+                            <version>${danhaywood-mavenmixin-standard.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>enforcerrelaxed</artifactId>
-                            <version>0.0.1</version>
+                            <version>${danhaywood-mavenmixin-enforcerelaxed.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>isisswagger</artifactId>
-                            <version>0.0.2</version>
+                            <version>${danhaywood-mavenmixin-isisswagger.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>jettywar</artifactId>
-                            <version>0.0.1</version>
+                            <version>${danhaywood-mavenmixin-jettywar.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>jettyconsole</artifactId>
-                            <version>0.0.1</version>
+                            <version>${danhaywood-mavenmixin-jettyconsole.version}</version>
                         </mixin>
                     </mixins>
                 </configuration>


[2/2] isis git commit: ISIS-1538: recreating simpleapp archetype

Posted by da...@apache.org.
ISIS-1538: recreating simpleapp archetype


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/506babfc
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/506babfc
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/506babfc

Branch: refs/heads/maint-1.13.2
Commit: 506babfc7447ccbe5ef3bc8cb54093bae31bab3d
Parents: a79127e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Nov 29 17:02:39 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Nov 29 17:02:39 2016 +0000

----------------------------------------------------------------------
 .../archetype-resources/application/pom.xml       |  8 ++++----
 .../application/translations.pot                  |  2 +-
 .../archetype-resources/module-simple/pom.xml     | 18 ++++++++----------
 .../module-simple/translations.pot                |  2 +-
 .../main/resources/archetype-resources/pom.xml    | 12 ++++++++++++
 .../resources/archetype-resources/webapp/pom.xml  | 10 +++++-----
 .../resources/projects/basic/archetype.properties |  2 +-
 7 files changed, 32 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/506babfc/example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml
index ae0cbee..09f1fe8 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml
@@ -72,22 +72,22 @@
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>standard</artifactId>
-                            <version>0.0.1</version>
+                            <version>${danhaywood-mavenmixin-standard.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>enforcerrelaxed</artifactId>
-                            <version>0.0.1</version>
+                            <version>${danhaywood-mavenmixin-enforcerelaxed.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>surefire</artifactId>
-                            <version>0.0.2</version>
+                            <version>${danhaywood-mavenmixin-surefire.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>cucumberreporting</artifactId>
-                            <version>0.0.1</version>
+                            <version>${danhaywood-mavenmixin-cucumberreporting.version}</version>
                         </mixin>
                     </mixins>
                 </configuration>

http://git-wip-us.apache.org/repos/asf/isis/blob/506babfc/example/archetype/simpleapp/src/main/resources/archetype-resources/application/translations.pot
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/translations.pot b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/translations.pot
index ea72a21..4b9de22 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/translations.pot
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/translations.pot
@@ -23,7 +23,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2016-11-28 10:03:12+\n"
+"POT-Creation-Date: 2016-11-29 17:02:03+\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

http://git-wip-us.apache.org/repos/asf/isis/blob/506babfc/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/pom.xml
index e53a5a1..c24dea8 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/pom.xml
@@ -68,37 +68,37 @@
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>standard</artifactId>
-                            <version>0.0.1</version>
+                            <version>${danhaywood-mavenmixin-standard.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>enforcerrelaxed</artifactId>
-                            <version>0.0.1-SNAPSHOT</version>
+                            <version>${danhaywood-mavenmixin-enforcerelaxed.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>datanucleusenhance</artifactId>
-                            <version>0.0.2</version>
+                            <version>${danhaywood-mavenmixin-datanucleusenhance.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>isisvalidate</artifactId>
-                            <version>0.0.1</version>
+                            <version>${danhaywood-mavenmixin-isisvalidate.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>surefire</artifactId>
-                            <version>0.0.2</version>
+                            <version>${danhaywood-mavenmixin-surefire.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>sourceandjavadoc</artifactId>
-                            <version>0.0.1</version>
+                            <version>${danhaywood-mavenmixin-sourceandjavadoc.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>staticanalysis</artifactId>
-                            <version>0.0.1</version>
+                            <version>${danhaywood-mavenmixin-staticanalysis.version}</version>
                         </mixin>
                     </mixins>
                 </configuration>
@@ -107,9 +107,7 @@
     </build>
 
     <properties>
-        <danhaywood-mavenmixin-isisvalidate>domainapp.modules.simple.SimpleModuleManifest</danhaywood-mavenmixin-isisvalidate>
-        <danhaywood-mavenmixin-staticanalysis.checkstyle.configLocation>${project.parent.basedir}/_checks/checkstyle.xml</danhaywood-mavenmixin-staticanalysis.checkstyle.configLocation>
-        <danhaywood-mavenmixin-staticanalysis.pmd.ruleset>${project.parent.basedir}/_checks/pmd.xml</danhaywood-mavenmixin-staticanalysis.pmd.ruleset>
+        <danhaywood-mavenmixin-isisvalidate.appManifest>domainapp.modules.simple.SimpleModuleManifest</danhaywood-mavenmixin-isisvalidate.appManifest>
     </properties>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/isis/blob/506babfc/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/translations.pot
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/translations.pot b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/translations.pot
index b792945..0dd372f 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/translations.pot
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/translations.pot
@@ -23,7 +23,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2016-11-28 10:03:05+\n"
+"POT-Creation-Date: 2016-11-29 17:01:58+\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

http://git-wip-us.apache.org/repos/asf/isis/blob/506babfc/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
index 0cf1d7c..01e0ee3 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
@@ -37,6 +37,18 @@
         <lombok.version>1.16.10</lombok.version>
         <assertj-core.version>3.6.0</assertj-core.version>
 
+        <danhaywood-mavenmixin-cucumberreporting.version>0.0.1</danhaywood-mavenmixin-cucumberreporting.version>
+        <danhaywood-mavenmixin-enforcerelaxed.version>0.0.1</danhaywood-mavenmixin-enforcerelaxed.version>
+        <danhaywood-mavenmixin-datanucleusenhance.version>0.0.3</danhaywood-mavenmixin-datanucleusenhance.version>
+        <danhaywood-mavenmixin-isisswagger.version>0.0.2</danhaywood-mavenmixin-isisswagger.version>
+        <danhaywood-mavenmixin-isisvalidate.version>0.0.1</danhaywood-mavenmixin-isisvalidate.version>
+        <danhaywood-mavenmixin-jettyconsole.version>0.0.1</danhaywood-mavenmixin-jettyconsole.version>
+        <danhaywood-mavenmixin-jettywar.version>0.0.1</danhaywood-mavenmixin-jettywar.version>
+        <danhaywood-mavenmixin-sourceandjavadoc.version>0.0.1</danhaywood-mavenmixin-sourceandjavadoc.version>
+        <danhaywood-mavenmixin-standard.version>0.0.1</danhaywood-mavenmixin-standard.version>
+        <danhaywood-mavenmixin-surefire.version>0.0.2</danhaywood-mavenmixin-surefire.version>
+        <danhaywood-mavenmixin-staticanalysis.version>0.0.1</danhaywood-mavenmixin-staticanalysis.version>
+
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>

http://git-wip-us.apache.org/repos/asf/isis/blob/506babfc/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
index a52e795..461e68d 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
@@ -93,27 +93,27 @@
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>standard</artifactId>
-                            <version>0.0.1</version>
+                            <version>${danhaywood-mavenmixin-standard.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>enforcerrelaxed</artifactId>
-                            <version>0.0.1</version>
+                            <version>${danhaywood-mavenmixin-enforcerelaxed.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>isisswagger</artifactId>
-                            <version>0.0.2</version>
+                            <version>${danhaywood-mavenmixin-isisswagger.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>jettywar</artifactId>
-                            <version>0.0.1</version>
+                            <version>${danhaywood-mavenmixin-jettywar.version}</version>
                         </mixin>
                         <mixin>
                             <groupId>com.danhaywood.mavenmixin</groupId>
                             <artifactId>jettyconsole</artifactId>
-                            <version>0.0.1</version>
+                            <version>${danhaywood-mavenmixin-jettyconsole.version}</version>
                         </mixin>
                     </mixins>
                 </configuration>

http://git-wip-us.apache.org/repos/asf/isis/blob/506babfc/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
index 44a4a9b..ba5c1dd 100644
--- a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Mon Nov 28 11:15:13 GMT 2016
+#Tue Nov 29 17:02:34 GMT 2016
 package=it.pkg
 version=0.1-SNAPSHOT
 groupId=archetype.it