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 2018/09/14 14:14:28 UTC
[isis] branch master updated: ISIS-1965: enable flatten plugin
always
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new f5b9a65 ISIS-1965: enable flatten plugin always
f5b9a65 is described below
commit f5b9a651b0a2a674e61cf0776660283a2aff7d19
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Sep 14 15:14:12 2018 +0100
ISIS-1965: enable flatten plugin always
not just if -Drevision=... is set. Otherwise the files installed into the local ~/.m2/repository will still have ${revision} in them.
---
core/applib/pom.xml | 2 +-
core/integtestsupport/pom.xml | 2 +-
core/log4j/pom.xml | 2 +-
core/maven-plugin/pom.xml | 2 +-
core/mavendeps/intellij/pom.xml | 2 +-
core/mavendeps/testing/pom.xml | 2 +-
core/mavendeps/webapp/pom.xml | 2 +-
core/metamodel/pom.xml | 2 +-
core/pom.xml | 2 +-
core/runtime/pom.xml | 2 +-
core/schema/pom.xml | 2 +-
core/security-shiro/pom.xml | 2 +-
core/security/pom.xml | 2 +-
core/specsupport/pom.xml | 2 +-
core/unittestsupport/pom.xml | 2 +-
core/viewer-restfulobjects-applib/pom.xml | 2 +-
core/viewer-restfulobjects-rendering/pom.xml | 2 +-
core/viewer-restfulobjects-server/pom.xml | 2 +-
core/viewer-wicket-applib/pom.xml | 2 +-
core/viewer-wicket-impl/pom.xml | 2 +-
core/viewer-wicket-model/pom.xml | 2 +-
core/viewer-wicket-ui/pom.xml | 2 +-
core/webdocker/pom.xml | 2 +-
core/webserver/pom.xml | 2 +-
core/wrapper/pom.xml | 2 +-
.../application/simpleapp/module-simple/pom.xml | 71 +++++++++++++---------
26 files changed, 68 insertions(+), 53 deletions(-)
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index c137a08..c1faddd 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -133,7 +133,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 0f40299..064eaf4 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -86,7 +86,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index d2d9459..3e606a9 100644
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@ -58,7 +58,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index fa1bf5f..2bc3bfe 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -301,7 +301,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/mavendeps/intellij/pom.xml b/core/mavendeps/intellij/pom.xml
index e37cc5e..5296d29 100644
--- a/core/mavendeps/intellij/pom.xml
+++ b/core/mavendeps/intellij/pom.xml
@@ -43,7 +43,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/mavendeps/testing/pom.xml b/core/mavendeps/testing/pom.xml
index 1ec054c..6211a38 100644
--- a/core/mavendeps/testing/pom.xml
+++ b/core/mavendeps/testing/pom.xml
@@ -89,7 +89,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/mavendeps/webapp/pom.xml b/core/mavendeps/webapp/pom.xml
index 804d6d2..cfdf550 100644
--- a/core/mavendeps/webapp/pom.xml
+++ b/core/mavendeps/webapp/pom.xml
@@ -103,7 +103,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 66557ad..beab5f6 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -128,7 +128,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/pom.xml b/core/pom.xml
index b7aef87..72301a5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -2368,7 +2368,7 @@ ${license.additional-notes}
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 0bfb4c5..1c79759 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -191,7 +191,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index d79220d..129a500 100644
--- a/core/schema/pom.xml
+++ b/core/schema/pom.xml
@@ -133,7 +133,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index b7e301f..4dc2c3c 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -120,7 +120,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/security/pom.xml b/core/security/pom.xml
index 0ce8138..80ee7ff 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -52,7 +52,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index 8316735..fc2d26c 100644
--- a/core/specsupport/pom.xml
+++ b/core/specsupport/pom.xml
@@ -66,7 +66,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 0ba97f1..846d3f9 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -100,7 +100,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index cae5d04..3dd44e2 100644
--- a/core/viewer-restfulobjects-applib/pom.xml
+++ b/core/viewer-restfulobjects-applib/pom.xml
@@ -118,7 +118,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/viewer-restfulobjects-rendering/pom.xml b/core/viewer-restfulobjects-rendering/pom.xml
index 3bd77db..dcac0ac 100644
--- a/core/viewer-restfulobjects-rendering/pom.xml
+++ b/core/viewer-restfulobjects-rendering/pom.xml
@@ -73,7 +73,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index c4ed12d..5edd3d5 100644
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@ -79,7 +79,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/viewer-wicket-applib/pom.xml b/core/viewer-wicket-applib/pom.xml
index 03cc160..9cf5b0a 100644
--- a/core/viewer-wicket-applib/pom.xml
+++ b/core/viewer-wicket-applib/pom.xml
@@ -90,7 +90,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/viewer-wicket-impl/pom.xml b/core/viewer-wicket-impl/pom.xml
index 10f7289..6e84925 100644
--- a/core/viewer-wicket-impl/pom.xml
+++ b/core/viewer-wicket-impl/pom.xml
@@ -107,7 +107,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/viewer-wicket-model/pom.xml b/core/viewer-wicket-model/pom.xml
index a9b0700..2bf2de2 100644
--- a/core/viewer-wicket-model/pom.xml
+++ b/core/viewer-wicket-model/pom.xml
@@ -74,7 +74,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/viewer-wicket-ui/pom.xml b/core/viewer-wicket-ui/pom.xml
index ded72eb..de33702 100644
--- a/core/viewer-wicket-ui/pom.xml
+++ b/core/viewer-wicket-ui/pom.xml
@@ -162,7 +162,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/webdocker/pom.xml b/core/webdocker/pom.xml
index 3e9dd68..d176f90 100644
--- a/core/webdocker/pom.xml
+++ b/core/webdocker/pom.xml
@@ -240,7 +240,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index 94069b9..c300e9f 100644
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@ -60,7 +60,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index 420920c..b487b39 100644
--- a/core/wrapper/pom.xml
+++ b/core/wrapper/pom.xml
@@ -77,7 +77,7 @@
<id>flatten</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flatten</name>
</property>
</activation>
<build>
diff --git a/example/application/simpleapp/module-simple/pom.xml b/example/application/simpleapp/module-simple/pom.xml
index 549cb40..0ac4faf 100644
--- a/example/application/simpleapp/module-simple/pom.xml
+++ b/example/application/simpleapp/module-simple/pom.xml
@@ -106,34 +106,6 @@
</mixins>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.isis.tool</groupId>
- <artifactId>isis-maven-plugin</artifactId>
- <version>${isis.version}</version>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>validate</goal>
- </goals>
- <configuration>
- <appManifest>${isis-maven-plugin.validate.appManifest}</appManifest>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>2.3.1</version>
- </dependency>
- </dependencies>
- </plugin>
</plugins>
</build>
@@ -172,4 +144,47 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>isis-validate</id>
+ <activation>
+ <property>
+ <name>!skip.isis-validate</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.isis.tool</groupId>
+ <artifactId>isis-maven-plugin</artifactId>
+ <version>${isis.version}</version>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ <configuration>
+ <appManifest>${isis-maven-plugin.validate.appManifest}</appManifest>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>