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 2014/12/17 23:40:31 UTC
[1/3] isis git commit: ISIS-284: moved isis-maven-plugin definitions
into profile (aim being to avoid suspected catch-22 build issue with
dependencies with SNAPSHOTs).
Repository: isis
Updated Branches:
refs/heads/master f76185ded -> c7fb77052
ISIS-284: moved isis-maven-plugin definitions into profile (aim being to avoid suspected catch-22 build issue with dependencies with SNAPSHOTs).
To activate (for todoapp or simpleapp), use:
mvn clean install -P isis
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/43971c2f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/43971c2f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/43971c2f
Branch: refs/heads/master
Commit: 43971c2f049ea7c3ccd634389c83c00578ef45cc
Parents: f76185d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Dec 17 22:38:56 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Dec 17 22:38:56 2014 +0000
----------------------------------------------------------------------
example/application/simpleapp/dom/pom.xml | 74 ++++++++++++++-----------
example/application/todoapp/dom/pom.xml | 75 ++++++++++++++------------
2 files changed, 84 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/43971c2f/example/application/simpleapp/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/pom.xml b/example/application/simpleapp/dom/pom.xml
index 6b8dbdb..c6235c1 100644
--- a/example/application/simpleapp/dom/pom.xml
+++ b/example/application/simpleapp/dom/pom.xml
@@ -48,38 +48,6 @@
</resources>
<plugins>
<plugin>
- <groupId>org.apache.isis.tool</groupId>
- <artifactId>isis-maven-plugin</artifactId>
- <version>1.8.0-SNAPSHOT</version>
- <configuration>
- <isisConfigDir>..\webapp\src\main\webapp\WEB-INF</isisConfigDir>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.example.application</groupId>
- <artifactId>todoapp-dom</artifactId>
- <version>1.8.0-SNAPSHOT</version>
- </dependency>
- <!--
- ... workaround to avoid conflict with plexus-default
- (not sure why exclusions in the isis-maven-plugin aren't sufficient, though ...
- -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>16.0.1</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>validate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-maven-plugin</artifactId>
<version>${datanucleus-maven-plugin.version}</version>
@@ -156,4 +124,46 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>isis</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.isis.tool</groupId>
+ <artifactId>isis-maven-plugin</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
+ <configuration>
+ <isisConfigDir>..\webapp\src\main\webapp\WEB-INF</isisConfigDir>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.example.application</groupId>
+ <artifactId>todoapp-dom</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
+ </dependency>
+ <!--
+ ... workaround to avoid conflict with plexus-default
+ (not sure why exclusions in the isis-maven-plugin aren't sufficient, though ...
+ -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>16.0.1</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/43971c2f/example/application/todoapp/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/todoapp/dom/pom.xml b/example/application/todoapp/dom/pom.xml
index c58f4c8..fda6c71 100644
--- a/example/application/todoapp/dom/pom.xml
+++ b/example/application/todoapp/dom/pom.xml
@@ -48,39 +48,6 @@
</resources>
<plugins>
<plugin>
- <groupId>org.apache.isis.tool</groupId>
- <artifactId>isis-maven-plugin</artifactId>
- <version>1.8.0-SNAPSHOT</version>
- <configuration>
- <isisConfigDir>..\webapp\src\main\webapp\WEB-INF</isisConfigDir>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.example.application</groupId>
- <artifactId>todoapp-dom</artifactId>
- <version>1.8.0-SNAPSHOT</version>
- </dependency>
- <!--
- ... workaround to avoid conflict with plexus-default
- (not sure why exclusions in the isis-maven-plugin aren't sufficient, though ...
- -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>16.0.1</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>validate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-maven-plugin</artifactId>
<version>${datanucleus-maven-plugin.version}</version>
@@ -157,4 +124,46 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>isis</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.isis.tool</groupId>
+ <artifactId>isis-maven-plugin</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
+ <configuration>
+ <isisConfigDir>..\webapp\src\main\webapp\WEB-INF</isisConfigDir>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.example.application</groupId>
+ <artifactId>todoapp-dom</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
+ </dependency>
+ <!--
+ ... workaround to avoid conflict with plexus-default
+ (not sure why exclusions in the isis-maven-plugin aren't sufficient, though ...
+ -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>16.0.1</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
[3/3] isis git commit: ISIS-928: recreating todoapp archetype
Posted by da...@apache.org.
ISIS-928: recreating todoapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c7fb7705
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c7fb7705
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c7fb7705
Branch: refs/heads/master
Commit: c7fb77052718b5fb51bac7d253067d7ee03a5639
Parents: 185b7af
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Dec 17 22:39:45 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Dec 17 22:39:45 2014 +0000
----------------------------------------------------------------------
.../resources/archetype-resources/dom/pom.xml | 75 +++++++++++---------
.../projects/basic/archetype.properties | 2 +-
2 files changed, 43 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c7fb7705/example/archetype/todoapp/src/main/resources/archetype-resources/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/pom.xml b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/pom.xml
index 740c4c8..b7589e6 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/pom.xml
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/pom.xml
@@ -45,39 +45,6 @@
</resources>
<plugins>
<plugin>
- <groupId>org.apache.isis.tool</groupId>
- <artifactId>isis-maven-plugin</artifactId>
- <version>1.8.0-SNAPSHOT</version>
- <configuration>
- <isisConfigDir>..\webapp\src\main\webapp\WEB-INF</isisConfigDir>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.example.application</groupId>
- <artifactId>todoapp-dom</artifactId>
- <version>1.8.0-SNAPSHOT</version>
- </dependency>
- <!--
- ... workaround to avoid conflict with plexus-default
- (not sure why exclusions in the isis-maven-plugin aren't sufficient, though ...
- -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>16.0.1</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>validate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-maven-plugin</artifactId>
<version>${datanucleus-maven-plugin.version}</version>
@@ -148,4 +115,46 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>isis</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.isis.tool</groupId>
+ <artifactId>isis-maven-plugin</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
+ <configuration>
+ <isisConfigDir>..\webapp\src\main\webapp\WEB-INF</isisConfigDir>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.example.application</groupId>
+ <artifactId>todoapp-dom</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
+ </dependency>
+ <!--
+ ... workaround to avoid conflict with plexus-default
+ (not sure why exclusions in the isis-maven-plugin aren't sufficient, though ...
+ -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>16.0.1</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/c7fb7705/example/archetype/todoapp/src/test/resources/projects/basic/archetype.properties
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/todoapp/src/test/resources/projects/basic/archetype.properties
index 038d8a8..dc26e49 100644
--- a/example/archetype/todoapp/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/todoapp/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Wed Dec 17 18:14:56 GMT 2014
+#Wed Dec 17 22:39:38 GMT 2014
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
[2/3] isis git commit: ISIS-928: recreating simpleapp archetype
Posted by da...@apache.org.
ISIS-928: 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/185b7af8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/185b7af8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/185b7af8
Branch: refs/heads/master
Commit: 185b7af8b71329c650912c3cd7d9765a2add290f
Parents: 43971c2
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Dec 17 22:39:30 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Dec 17 22:39:30 2014 +0000
----------------------------------------------------------------------
.../resources/archetype-resources/dom/pom.xml | 74 +++++++++++---------
.../projects/basic/archetype.properties | 2 +-
2 files changed, 43 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/185b7af8/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
index 6a10ffe..6abf41e 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
@@ -45,38 +45,6 @@
</resources>
<plugins>
<plugin>
- <groupId>org.apache.isis.tool</groupId>
- <artifactId>isis-maven-plugin</artifactId>
- <version>1.8.0-SNAPSHOT</version>
- <configuration>
- <isisConfigDir>..\webapp\src\main\webapp\WEB-INF</isisConfigDir>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.example.application</groupId>
- <artifactId>todoapp-dom</artifactId>
- <version>1.8.0-SNAPSHOT</version>
- </dependency>
- <!--
- ... workaround to avoid conflict with plexus-default
- (not sure why exclusions in the isis-maven-plugin aren't sufficient, though ...
- -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>16.0.1</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>validate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-maven-plugin</artifactId>
<version>${datanucleus-maven-plugin.version}</version>
@@ -147,4 +115,46 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>isis</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.isis.tool</groupId>
+ <artifactId>isis-maven-plugin</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
+ <configuration>
+ <isisConfigDir>..\webapp\src\main\webapp\WEB-INF</isisConfigDir>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.example.application</groupId>
+ <artifactId>todoapp-dom</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
+ </dependency>
+ <!--
+ ... workaround to avoid conflict with plexus-default
+ (not sure why exclusions in the isis-maven-plugin aren't sufficient, though ...
+ -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>16.0.1</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/185b7af8/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 cc2c384..4e187a2 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 @@
-#Wed Dec 17 18:14:43 GMT 2014
+#Wed Dec 17 22:39:23 GMT 2014
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it