Updated Branches: refs/heads/master 27c4ee323 -> 4999830a8
ISIS-188: making all components use core as their parent * and thus, removed isis-parent pom completely Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4999830a Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4999830a Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4999830a Branch: refs/heads/master Commit: 4999830a8176efa2f59dbc6ab2440765d510d76e Parents: 27c4ee3 Author: Dan Haywood <[email protected]> Authored: Wed Dec 12 00:30:58 2012 +0000 Committer: Dan Haywood <[email protected]> Committed: Wed Dec 12 00:30:58 2012 +0000 ---------------------------------------------------------------------- component/objectstore/jdo/pom.xml | 7 +- component/objectstore/nosql/pom.xml | 9 +- component/objectstore/sql/pom.xml | 11 +- component/objectstore/xml/pom.xml | 7 +- component/profilestore/sql/pom.xml | 10 +- component/profilestore/xml/pom.xml | 7 +- component/progmodel/groovy/pom.xml | 7 +- component/progmodel/wrapper/pom.xml | 7 +- component/security/file/pom.xml | 7 +- component/security/ldap/pom.xml | 7 +- component/security/sql/pom.xml | 7 +- component/viewer/bdd/pom.xml | 57 +- component/viewer/dnd/pom.xml | 7 +- component/viewer/html/pom.xml | 7 +- component/viewer/junit/pom.xml | 9 +- component/viewer/restfulobjects/pom.xml | 7 +- component/viewer/scimpi/pom.xml | 7 +- component/viewer/wicket/pom.xml | 7 +- core/pom.xml | 26 +- core/tck/pom.xml | 1 - example/archetype/quickstart/pom.xml | 11 +- example/domain-service/email-service/pom.xml | 11 +- isis-parent/pom.xml | 1691 --------------------- pom.xml | 14 +- site-skin/pom.xml | 7 +- tool/maven-plugin/pom.xml | 8 +- 26 files changed, 157 insertions(+), 1799 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/4999830a/component/objectstore/jdo/pom.xml ---------------------------------------------------------------------- diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml index 260de06..c030178 100644 --- a/component/objectstore/jdo/pom.xml +++ b/component/objectstore/jdo/pom.xml @@ -15,14 +15,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.isis</groupId> - <artifactId>isis-parent</artifactId> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis</artifactId> <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../isis-parent/pom.xml</relativePath> + <relativePath>../../../core/pom.xml</relativePath> </parent> <groupId>org.apache.isis.objectstore</groupId> <artifactId>isis-jdo-objectstore</artifactId> + <version>0.3.1-SNAPSHOT</version> <name>Isis JDO ObjectStore</name> http://git-wip-us.apache.org/repos/asf/isis/blob/4999830a/component/objectstore/nosql/pom.xml ---------------------------------------------------------------------- diff --git a/component/objectstore/nosql/pom.xml b/component/objectstore/nosql/pom.xml index d7251a1..940b2e0 100644 --- a/component/objectstore/nosql/pom.xml +++ b/component/objectstore/nosql/pom.xml @@ -21,14 +21,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.isis</groupId> - <artifactId>isis-parent</artifactId> - <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../isis-parent/pom.xml</relativePath> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis</artifactId> + <version>0.3.1-SNAPSHOT</version> + <relativePath>../../../core/pom.xml</relativePath> </parent> <groupId>org.apache.isis.objectstore</groupId> <artifactId>isis-nosql-objectstore</artifactId> + <version>0.3.1-SNAPSHOT</version> <name>Isis NOSQL ObjectStore</name> http://git-wip-us.apache.org/repos/asf/isis/blob/4999830a/component/objectstore/sql/pom.xml ---------------------------------------------------------------------- diff --git a/component/objectstore/sql/pom.xml b/component/objectstore/sql/pom.xml index 7365102..337e4ff 100644 --- a/component/objectstore/sql/pom.xml +++ b/component/objectstore/sql/pom.xml @@ -13,14 +13,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.isis</groupId> - <artifactId>isis-parent</artifactId> - <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../isis-parent/pom.xml</relativePath> - </parent> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis</artifactId> + <version>0.3.1-SNAPSHOT</version> + <relativePath>../../../core/pom.xml</relativePath> + </parent> <groupId>org.apache.isis.objectstore</groupId> <artifactId>isis-sql-objectstore</artifactId> + <version>0.3.1-SNAPSHOT</version> <name>Isis SQL ObjectStore</name> http://git-wip-us.apache.org/repos/asf/isis/blob/4999830a/component/objectstore/xml/pom.xml ---------------------------------------------------------------------- diff --git a/component/objectstore/xml/pom.xml b/component/objectstore/xml/pom.xml index 89812c1..4c9cf1e 100644 --- a/component/objectstore/xml/pom.xml +++ b/component/objectstore/xml/pom.xml @@ -21,14 +21,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.isis</groupId> - <artifactId>isis-parent</artifactId> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis</artifactId> <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../isis-parent/pom.xml</relativePath> + <relativePath>../../../core/pom.xml</relativePath> </parent> <groupId>org.apache.isis.objectstore</groupId> <artifactId>isis-xml-objectstore</artifactId> + <version>0.3.1-SNAPSHOT</version> <name>Isis XML ObjectStore</name> http://git-wip-us.apache.org/repos/asf/isis/blob/4999830a/component/profilestore/sql/pom.xml ---------------------------------------------------------------------- diff --git a/component/profilestore/sql/pom.xml b/component/profilestore/sql/pom.xml index 013ec92..794345b 100755 --- a/component/profilestore/sql/pom.xml +++ b/component/profilestore/sql/pom.xml @@ -21,15 +21,17 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.isis</groupId> - <artifactId>isis-parent</artifactId> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis</artifactId> <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../isis-parent/pom.xml</relativePath> + <relativePath>../../../core/pom.xml</relativePath> </parent> <groupId>org.apache.isis.profilestore</groupId> <artifactId>isis-sql-profilestore</artifactId> - <name>Isis SQL ProfileStore</name> + <version>0.3.1-SNAPSHOT</version> + + <name>Isis SQL ProfileStore</name> <properties> <siteBaseDir>.</siteBaseDir> http://git-wip-us.apache.org/repos/asf/isis/blob/4999830a/component/profilestore/xml/pom.xml ---------------------------------------------------------------------- diff --git a/component/profilestore/xml/pom.xml b/component/profilestore/xml/pom.xml index fae426e..51bb35f 100644 --- a/component/profilestore/xml/pom.xml +++ b/component/profilestore/xml/pom.xml @@ -21,14 +21,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.isis</groupId> - <artifactId>isis-parent</artifactId> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis</artifactId> <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../isis-parent/pom.xml</relativePath> + <relativePath>../../../core/pom.xml</relativePath> </parent> <groupId>org.apache.isis.profilestore</groupId> <artifactId>isis-xml-profilestore</artifactId> + <version>0.3.1-SNAPSHOT</version> <name>Isis XML ProfileStore</name> http://git-wip-us.apache.org/repos/asf/isis/blob/4999830a/component/progmodel/groovy/pom.xml ---------------------------------------------------------------------- diff --git a/component/progmodel/groovy/pom.xml b/component/progmodel/groovy/pom.xml index 26dc2ef..020e36d 100644 --- a/component/progmodel/groovy/pom.xml +++ b/component/progmodel/groovy/pom.xml @@ -22,14 +22,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.isis</groupId> - <artifactId>isis-parent</artifactId> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis</artifactId> <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../isis-parent/pom.xml</relativePath> + <relativePath>../../../core/pom.xml</relativePath> </parent> <groupId>org.apache.isis.progmodel</groupId> <artifactId>isis-groovy-progmodel</artifactId> + <version>0.3.1-SNAPSHOT</version> <name>Isis Groovy ProgModel</name> http://git-wip-us.apache.org/repos/asf/isis/blob/4999830a/component/progmodel/wrapper/pom.xml ---------------------------------------------------------------------- diff --git a/component/progmodel/wrapper/pom.xml b/component/progmodel/wrapper/pom.xml index 052a4ed..55057d3 100644 --- a/component/progmodel/wrapper/pom.xml +++ b/component/progmodel/wrapper/pom.xml @@ -21,15 +21,16 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.isis</groupId> - <artifactId>isis-parent</artifactId> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis</artifactId> <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../isis-parent/pom.xml</relativePath> + <relativePath>../../../core/pom.xml</relativePath> </parent> <groupId>org.apache.isis.progmodel</groupId> <artifactId>isis-wrapper-progmodel</artifactId> + <version>0.3.1-SNAPSHOT</version> <name>Isis Wrapper ProgModel</name> http://git-wip-us.apache.org/repos/asf/isis/blob/4999830a/component/security/file/pom.xml ---------------------------------------------------------------------- diff --git a/component/security/file/pom.xml b/component/security/file/pom.xml index 7e3d9d8..fb683c8 100644 --- a/component/security/file/pom.xml +++ b/component/security/file/pom.xml @@ -21,14 +21,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.isis</groupId> - <artifactId>isis-parent</artifactId> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis</artifactId> <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../isis-parent/pom.xml</relativePath> + <relativePath>../../../core/pom.xml</relativePath> </parent> <groupId>org.apache.isis.security</groupId> <artifactId>isis-file-security</artifactId> + <version>0.3.1-SNAPSHOT</version> <name>Isis File Security</name> http://git-wip-us.apache.org/repos/asf/isis/blob/4999830a/component/security/ldap/pom.xml ---------------------------------------------------------------------- diff --git a/component/security/ldap/pom.xml b/component/security/ldap/pom.xml index 6c2df8c..2a188d5 100644 --- a/component/security/ldap/pom.xml +++ b/component/security/ldap/pom.xml @@ -21,14 +21,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.isis</groupId> - <artifactId>isis-parent</artifactId> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis</artifactId> <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../isis-parent/pom.xml</relativePath> + <relativePath>../../../core/pom.xml</relativePath> </parent> <groupId>org.apache.isis.security</groupId> <artifactId>isis-ldap-security</artifactId> + <version>0.3.1-SNAPSHOT</version> <name>Isis LDAP Security</name> http://git-wip-us.apache.org/repos/asf/isis/blob/4999830a/component/security/sql/pom.xml ---------------------------------------------------------------------- diff --git a/component/security/sql/pom.xml b/component/security/sql/pom.xml index e14f075..6577231 100755 --- a/component/security/sql/pom.xml +++ b/component/security/sql/pom.xml @@ -21,14 +21,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.isis</groupId> - <artifactId>isis-parent</artifactId> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis</artifactId> <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../isis-parent/pom.xml</relativePath> + <relativePath>../../../core/pom.xml</relativePath> </parent> <groupId>org.apache.isis.security</groupId> <artifactId>isis-sql-security</artifactId> + <version>0.3.1-SNAPSHOT</version> <name>Isis SQL Security</name> http://git-wip-us.apache.org/repos/asf/isis/blob/4999830a/component/viewer/bdd/pom.xml ---------------------------------------------------------------------- diff --git a/component/viewer/bdd/pom.xml b/component/viewer/bdd/pom.xml index f87b14f..3083e83 100644 --- a/component/viewer/bdd/pom.xml +++ b/component/viewer/bdd/pom.xml @@ -21,14 +21,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.isis</groupId> - <artifactId>isis-parent</artifactId> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis</artifactId> <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../isis-parent/pom.xml</relativePath> + <relativePath>../../../core/pom.xml</relativePath> </parent> <groupId>org.apache.isis.viewer</groupId> <artifactId>isis-bdd-viewer</artifactId> + <version>0.3.1-SNAPSHOT</version> <name>Isis BDD Viewer</name> @@ -53,6 +54,56 @@ <artifactId>docbkx-maven-plugin</artifactId> <inherited>false</inherited> </plugin> + + + <plugin> + <artifactId>maven-remote-resources-plugin</artifactId> + <executions> + <execution> + <id>process-remote-resources</id> + <goals> + <goal>process</goal> + </goals> + <configuration> + <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> + <appendedResourcesDirectory>${basedir}/${siteBaseDir}/src/main/appended-resources</appendedResourcesDirectory> + <supplementalModels> + <supplementalModel>supplemental-models.xml</supplementalModel> + </supplementalModels> + <resourceBundles> + <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle> + </resourceBundles> + <properties> + <projectTimespan>2010~2012</projectTimespan> + <postDepListText> +The above (auto-generated) list aggregates the dependencies (either directly +or transitively) of all the modules that make up Apache Isis. You can use +mvn dependency:list or mvn dependency:tree to view dependencies by submodule. + +In addition, Isis includes a copy of JQuery core. This is licensed under +the MIT license [1]. + +Note also that the BDD Viewer module [org.apache.isis.viewer:isis-viewer-bdd-concordion] +has an optional dependency on Concordion [2], which in turn depends upon +XOM [3]. XOM is licensed under LGPL, which is a non-eligible 'category-X' +license [4]. This transitive dependency to XOM has therefore been excluded. + +To use Isis' BDD Viewer, end-users must explicitly add in the XOM dependency +in their own POMs. The application generated by the Isis quickstart +archetype includes this explicit dependency. + +[1] http://jquery.org/license/ +[2] http://concordion.org +[3] http://www.xom.nu/ +[4] http://www.apache.org/legal/resolved.html#category-x + </postDepListText> + </properties> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> </build> http://git-wip-us.apache.org/repos/asf/isis/blob/4999830a/component/viewer/dnd/pom.xml ---------------------------------------------------------------------- diff --git a/component/viewer/dnd/pom.xml b/component/viewer/dnd/pom.xml index eb76d4f..97f6037 100644 --- a/component/viewer/dnd/pom.xml +++ b/component/viewer/dnd/pom.xml @@ -21,14 +21,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.isis</groupId> - <artifactId>isis-parent</artifactId> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis</artifactId> <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../isis-parent/pom.xml</relativePath> + <relativePath>../../../core/pom.xml</relativePath> </parent> <groupId>org.apache.isis.viewer</groupId> <artifactId>isis-dnd-viewer</artifactId> + <version>0.3.1-SNAPSHOT</version> <name>Isis Drag-n-Drop Viewer</name> <packaging>pom</packaging> http://git-wip-us.apache.org/repos/asf/isis/blob/4999830a/component/viewer/html/pom.xml ---------------------------------------------------------------------- diff --git a/component/viewer/html/pom.xml b/component/viewer/html/pom.xml index cfdbe89..a650b2d 100644 --- a/component/viewer/html/pom.xml +++ b/component/viewer/html/pom.xml @@ -21,14 +21,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.isis</groupId> - <artifactId>isis-parent</artifactId> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis</artifactId> <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../isis-parent/pom.xml</relativePath> + <relativePath>../../../core/pom.xml</relativePath> </parent> <groupId>org.apache.isis.viewer</groupId> <artifactId>isis-html-viewer</artifactId> + <version>0.3.1-SNAPSHOT</version> <name>Isis Html Viewer</name> <packaging>pom</packaging> http://git-wip-us.apache.org/repos/asf/isis/blob/4999830a/component/viewer/junit/pom.xml ---------------------------------------------------------------------- diff --git a/component/viewer/junit/pom.xml b/component/viewer/junit/pom.xml index a3e658e..8dd2d1c 100644 --- a/component/viewer/junit/pom.xml +++ b/component/viewer/junit/pom.xml @@ -21,14 +21,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.isis</groupId> - <artifactId>isis-parent</artifactId> - <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../isis-parent/pom.xml</relativePath> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis</artifactId> + <version>0.3.1-SNAPSHOT</version> + <relativePath>../../../core/pom.xml</relativePath> </parent> <groupId>org.apache.isis.viewer</groupId> <artifactId>isis-junit-viewer</artifactId> + <version>0.3.1-SNAPSHOT</version> <name>Isis JUnit Viewer</name> <packaging>pom</packaging> http://git-wip-us.apache.org/repos/asf/isis/blob/4999830a/component/viewer/restfulobjects/pom.xml ---------------------------------------------------------------------- diff --git a/component/viewer/restfulobjects/pom.xml b/component/viewer/restfulobjects/pom.xml index 92e4ba8..11bf6cc 100644 --- a/component/viewer/restfulobjects/pom.xml +++ b/component/viewer/restfulobjects/pom.xml @@ -22,14 +22,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.isis</groupId> - <artifactId>isis-parent</artifactId> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis</artifactId> <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../isis-parent/pom.xml</relativePath> + <relativePath>../../../core/pom.xml</relativePath> </parent> <groupId>org.apache.isis.viewer</groupId> <artifactId>isis-restfulobjects-viewer</artifactId> + <version>0.3.1-SNAPSHOT</version> <name>Isis RestfulObjects Viewer</name> http://git-wip-us.apache.org/repos/asf/isis/blob/4999830a/component/viewer/scimpi/pom.xml ---------------------------------------------------------------------- diff --git a/component/viewer/scimpi/pom.xml b/component/viewer/scimpi/pom.xml index 7d2ca35..7dc535f 100644 --- a/component/viewer/scimpi/pom.xml +++ b/component/viewer/scimpi/pom.xml @@ -21,14 +21,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.isis</groupId> - <artifactId>isis-parent</artifactId> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis</artifactId> <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../isis-parent/pom.xml</relativePath> + <relativePath>../../../core/pom.xml</relativePath> </parent> <groupId>org.apache.isis.viewer</groupId> <artifactId>isis-scimpi-viewer</artifactId> + <version>0.3.1-SNAPSHOT</version> <name>Isis Scimpi Viewer</name> http://git-wip-us.apache.org/repos/asf/isis/blob/4999830a/component/viewer/wicket/pom.xml ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml index 8e246ee..0520dd7 100644 --- a/component/viewer/wicket/pom.xml +++ b/component/viewer/wicket/pom.xml @@ -22,14 +22,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.isis</groupId> - <artifactId>isis-parent</artifactId> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis</artifactId> <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../isis-parent/pom.xml</relativePath> + <relativePath>../../../core/pom.xml</relativePath> </parent> <groupId>org.apache.isis.viewer</groupId> <artifactId>isis-wicket-viewer</artifactId> + <version>0.3.1-SNAPSHOT</version> <name>Isis Wicket Viewer</name> http://git-wip-us.apache.org/repos/asf/isis/blob/4999830a/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 6e82d26..90dd2fc 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -49,7 +49,7 @@ <coreBaseRelDir>.</coreBaseRelDir> <!-- to disable enforcer plugin via profile, if required --> - <isis-parent.enforcer.validate>true</isis-parent.enforcer.validate> + <isis.enforcer.validate>true</isis.enforcer.validate> <!-- used by docbkx-maven-plugin for DocBook guide; override as required --> @@ -843,14 +843,6 @@ <plugin> <artifactId>maven-remote-resources-plugin</artifactId> - <!-- required while Isis is in the incubator --> - <dependencies> - <dependency> - <groupId>org.apache</groupId> - <artifactId>apache-incubator-disclaimer-resource-bundle</artifactId> - <version>1.1</version> - </dependency> - </dependencies> <executions> <execution> <id>process-remote-resources</id> @@ -865,8 +857,6 @@ </supplementalModels> <resourceBundles> <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle> - <!-- required while Isis is in the incubator --> - <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle> </resourceBundles> <properties> <projectTimespan>2010~2012</projectTimespan> @@ -878,19 +868,7 @@ mvn dependency:list or mvn dependency:tree to view dependencies by submodule. In addition, Isis includes a copy of JQuery core. This is licensed under the MIT license [1]. -Note also that the BDD Viewer module [org.apache.isis.viewer:bdd-concordion] -has an optional dependency on Concordion [2], which in turn depends upon -XOM [3]. XOM is licensed under LGPL, which is a non-eligible 'category-X' -license [4]. This transitive dependency to XOM has therefore been excluded. - -To use Isis' BDD Viewer, end-users must explicitly add in the XOM dependency -in their own POMs. The application generated by the Isis quickstart -archetype includes this explicit dependency. - [1] http://jquery.org/license/ -[2] http://concordion.org -[3] http://www.xom.nu/ -[4] http://www.apache.org/legal/resolved.html#category-x </postDepListText> </properties> </configuration> @@ -1691,7 +1669,7 @@ archetype includes this explicit dependency. <activation> <property> <!-- set by default --> - <name>isis-parent.enforcer.validate</name> + <name>isis.enforcer.validate</name> <value>true</value> </property> </activation> http://git-wip-us.apache.org/repos/asf/isis/blob/4999830a/core/tck/pom.xml ---------------------------------------------------------------------- diff --git a/core/tck/pom.xml b/core/tck/pom.xml index 7eaa788..c01f48e 100644 --- a/core/tck/pom.xml +++ b/core/tck/pom.xml @@ -26,7 +26,6 @@ <version>0.3.1-SNAPSHOT</version> </parent> - <groupId>org.apache.isis.core</groupId> <artifactId>isis-tck</artifactId> <name>Isis Core TCK App</name> http://git-wip-us.apache.org/repos/asf/isis/blob/4999830a/example/archetype/quickstart/pom.xml ---------------------------------------------------------------------- diff --git a/example/archetype/quickstart/pom.xml b/example/archetype/quickstart/pom.xml index f34fe43..fb978bd 100644 --- a/example/archetype/quickstart/pom.xml +++ b/example/archetype/quickstart/pom.xml @@ -4,17 +4,20 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.isis</groupId> - <artifactId>isis-parent</artifactId> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis</artifactId> <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../isis-parent/pom.xml</relativePath> + <relativePath>../../../core/pom.xml</relativePath> </parent> + <groupId>org.apache.isis.examle</groupId> <artifactId>quickstart-archetype</artifactId> - <packaging>maven-archetype</packaging> + <version>0.3.1-SNAPSHOT</version> <name>Apache Isis Quickstart Archetype</name> + <packaging>maven-archetype</packaging> + <build> <extensions> <extension> http://git-wip-us.apache.org/repos/asf/isis/blob/4999830a/example/domain-service/email-service/pom.xml ---------------------------------------------------------------------- diff --git a/example/domain-service/email-service/pom.xml b/example/domain-service/email-service/pom.xml index 8b8e7ac..3cec4bc 100644 --- a/example/domain-service/email-service/pom.xml +++ b/example/domain-service/email-service/pom.xml @@ -22,16 +22,17 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.isis</groupId> - <artifactId>isis-parent</artifactId> - <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../isis-parent/pom.xml</relativePath> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis</artifactId> + <version>0.3.1-SNAPSHOT</version> + <relativePath>../../../core/pom.xml</relativePath> </parent> - <name>Email service</name> <groupId>org.apache.isis.example.domainservice</groupId> <artifactId>email-domainservice</artifactId> <version>0.3.1-SNAPSHOT</version> + + <name>Email service</name> <!-- used in Site generation for relative references. --> <url>http://isis.apache.org/${relativeUrl}</url>
