From e6cae6dcbde5ab6ac60cfd944df93efe0e16183d Mon Sep 17 00:00:00 2001 From: Ilkka Seppala Date: Mon, 13 Jul 2015 21:16:43 +0300 Subject: [PATCH] #91 Changed version numbers and removed artifact names --- naked-objects/dom/pom.xml | 356 ++++++++------- naked-objects/fixture/pom.xml | 57 ++- naked-objects/integtests/pom.xml | 196 ++++---- naked-objects/pom.xml | 741 +++++++++++++++---------------- naked-objects/webapp/pom.xml | 616 ++++++++++++------------- 5 files changed, 947 insertions(+), 1019 deletions(-) diff --git a/naked-objects/dom/pom.xml b/naked-objects/dom/pom.xml index 8d3d866c6..dcfb0cda5 100644 --- a/naked-objects/dom/pom.xml +++ b/naked-objects/dom/pom.xml @@ -1,194 +1,186 @@ - - 4.0.0 + + + 4.0.0 - - com.iluwatar - naked-objects - 1.0-SNAPSHOT - + + com.iluwatar + naked-objects + 1.1.0 + - naked-objects-dom - Simple App DOM + naked-objects-dom - - - - src/main/resources - - - src/main/java - - ** - - - **/*.java - - - - + + + + src/main/resources + + + src/main/java + + ** + + + **/*.java + + + + - - - org.apache.isis.core - isis-core-applib - + + + org.apache.isis.core + isis-core-applib + - - org.apache.isis.core - isis-core-unittestsupport - test - + + org.apache.isis.core + isis-core-unittestsupport + test + - - - org.objenesis - objenesis - test - + + + org.objenesis + objenesis + test + - - org.assertj - assertj-core - test - + + org.assertj + assertj-core + test + - + - - - enhance - - true - - - 4.0.0-release - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.datanucleus - datanucleus-maven-plugin - [${datanucleus-maven-plugin.version},) - - enhance - - - - - - - - - - - - - - - org.datanucleus - datanucleus-maven-plugin - ${datanucleus-maven-plugin.version} - - false - ${basedir}/log4j.properties - true - ${basedir}/datanucleus.properties - - - - process-classes - - enhance - - - - - - - - - org.datanucleus - datanucleus-core - - - org.datanucleus - datanucleus-jodatime - - - org.datanucleus - datanucleus-api-jdo - - - - - isis-validate - - - - - - org.apache.isis.tool - isis-maven-plugin - 1.9.0-SNAPSHOT - - ../webapp/src/main/webapp/WEB-INF - - - - org.apache.isis.example.application - simpleapp-dom - 1.9.0-SNAPSHOT - - - - com.google.guava - guava - 16.0.1 - - - - - test - - validate - - - - - - - - + + + enhance + + true + + + 4.0.0-release + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.datanucleus + datanucleus-maven-plugin + [${datanucleus-maven-plugin.version},) + + enhance + + + + + + + + + + + + + + + org.datanucleus + datanucleus-maven-plugin + ${datanucleus-maven-plugin.version} + + false + ${basedir}/log4j.properties + true + ${basedir}/datanucleus.properties + + + + process-classes + + enhance + + + + + + + + + org.datanucleus + datanucleus-core + + + org.datanucleus + datanucleus-jodatime + + + org.datanucleus + datanucleus-api-jdo + + + + + isis-validate + + + + + + org.apache.isis.tool + isis-maven-plugin + 1.9.0-SNAPSHOT + + ../webapp/src/main/webapp/WEB-INF + + + + org.apache.isis.example.application + simpleapp-dom + 1.9.0-SNAPSHOT + + + + com.google.guava + guava + 16.0.1 + + + + + test + + validate + + + + + + + + diff --git a/naked-objects/fixture/pom.xml b/naked-objects/fixture/pom.xml index 63ee62d1a..20e6eb4e0 100644 --- a/naked-objects/fixture/pom.xml +++ b/naked-objects/fixture/pom.xml @@ -1,38 +1,31 @@ - - 4.0.0 + + + 4.0.0 - - com.iluwatar - naked-objects - 1.0-SNAPSHOT - + + com.iluwatar + naked-objects + 1.1.0 + - naked-objects-fixture - Simple App Fixtures + naked-objects-fixture - - - ${project.groupId} - naked-objects-dom - - + + + ${project.groupId} + naked-objects-dom + + diff --git a/naked-objects/integtests/pom.xml b/naked-objects/integtests/pom.xml index e627a017e..19c26443c 100644 --- a/naked-objects/integtests/pom.xml +++ b/naked-objects/integtests/pom.xml @@ -1,128 +1,100 @@ - - 4.0.0 + + + 4.0.0 - - com.iluwatar - naked-objects - 1.0-SNAPSHOT - + + com.iluwatar + naked-objects + 1.1.0 + - naked-objects-integtests - Simple App Integration Tests + naked-objects-integtests - - - - src/test/resources - - - src/test/java - - ** - - - **/*.java - - - - - + + + + src/test/resources + + + src/test/java + + ** + + + **/*.java + + + + + - - - ${project.groupId} - naked-objects-fixture - + + + ${project.groupId} + naked-objects-fixture + - - org.apache.isis.core - isis-core-unittestsupport - + + org.apache.isis.core + isis-core-unittestsupport + - - org.apache.isis.core - isis-core-integtestsupport - - - org.apache.isis.core - isis-core-specsupport - + + org.apache.isis.core + isis-core-integtestsupport + + + org.apache.isis.core + isis-core-specsupport + - - org.hamcrest - hamcrest-library - + + org.hamcrest + hamcrest-library + - - org.apache.isis.core - isis-core-wrapper - - - org.apache.isis.core - isis-core-runtime - + + org.apache.isis.core + isis-core-wrapper + + + org.apache.isis.core + isis-core-runtime + - - org.assertj - assertj-core - test - + + org.assertj + assertj-core + test + - - org.hsqldb - hsqldb - + + org.hsqldb + hsqldb + - + - - net.masterthought - cucumber-reporting - 0.0.21 - - - net.masterthought - maven-cucumber-reporting - 0.0.4 - - --> - - - + diff --git a/naked-objects/pom.xml b/naked-objects/pom.xml index 700d487ee..09614e785 100644 --- a/naked-objects/pom.xml +++ b/naked-objects/pom.xml @@ -1,400 +1,399 @@ - - 4.0.0 - - java-design-patterns - com.iluwatar - 1.1.0 - + + + 4.0.0 + + java-design-patterns + com.iluwatar + 1.1.0 + - com.iluwatar - naked-objects - 1.0-SNAPSHOT + naked-objects - Simple App + pom - pom + + 3.0.4 + - - 3.0.4 - + + 1.9.0-SNAPSHOT - - 1.9.0-SNAPSHOT + UTF-8 + UTF-8 + 2.0.0 + - UTF-8 - UTF-8 - 2.0.0 - + + + apache.snapshots + Apache Snapshots + https://repository.apache.org/content/repositories/snapshots/ + + false + + + + + + Cloudbees snapshots + http://repository-estatio.forge.cloudbees.com/snapshot/ + + + + false + + + - - - apache.snapshots - Apache Snapshots - https://repository.apache.org/content/repositories/snapshots/ - - false - - - - - - Cloudbees snapshots - http://repository-estatio.forge.cloudbees.com/snapshot/ - - - - false - - - + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 1.3.1 + + + + [3.2.1,) + + + [1.8.0,) + + + All plugin versions must be + defined! + true + true + + + + + + + validate-enforce + validate + + enforce + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + -parameters + + + + source + compile + + + test + test-compile + + + - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 1.3.1 - - - - [3.2.1,) - - - [1.8.0,) - - - All plugin versions must be - defined! - true - true - - - - - - - validate-enforce - validate - - enforce - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - -parameters - - - - source - compile - - - test - test-compile - - - + + org.apache.maven.plugins + maven-surefire-plugin + 2.16 + + + **/*Test.java + **/*Test$*.java + **/*Test_*.java + **/*Spec*.java + + + **/Test*.java + **/*ForTesting.java + **/*Abstract*.java + + true + true + ${project.build.directory}/surefire-reports + + - - org.apache.maven.plugins - maven-surefire-plugin - 2.16 - - - **/*Test.java - **/*Test$*.java - **/*Test_*.java - **/*Spec*.java - - - **/Test*.java - **/*ForTesting.java - **/*Abstract*.java - - true - true - ${project.build.directory}/surefire-reports - - + + org.apache.maven.plugins + maven-surefire-report-plugin + 2.16 + + false + + + + test + + + - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.16 - - false - - - - test - - - + + maven-clean-plugin + 2.5 + + + maven-resources-plugin + 2.6 + + + maven-jar-plugin + 2.4 + + + maven-install-plugin + 2.5.1 + + + maven-deploy-plugin + 2.8.1 + + + maven-site-plugin + 3.3 + + + maven-war-plugin + 2.4 + - - maven-clean-plugin - 2.5 - - - maven-resources-plugin - 2.6 - - - maven-jar-plugin - 2.4 - - - maven-install-plugin - 2.5.1 - - - maven-deploy-plugin - 2.8.1 - - - maven-site-plugin - 3.3 - - - maven-war-plugin - 2.4 - + + org.mortbay.jetty + maven-jetty-plugin + 6.1.26 + - - org.mortbay.jetty - maven-jetty-plugin - 6.1.26 - + + org.apache.maven.plugins + maven-shade-plugin + 2.2 + - - org.apache.maven.plugins - maven-shade-plugin - 2.2 - + + org.apache.maven.plugins + maven-antrun-plugin + 1.7 + + + + run + + + + + + + org.simplericity.jettyconsole + jetty-console-maven-plugin + 1.56 + - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - - run - - - - - - - org.simplericity.jettyconsole - jetty-console-maven-plugin - 1.56 - + + + org.apache.rat + apache-rat-plugin + 0.10 + + true + true + + **/target/** + **/target-ide/** - - - org.apache.rat - apache-rat-plugin - 0.10 - - true - true - - **/target/** - **/target-ide/** + **/*.project + **/.classpath + **/.settings/** + **/*.launch + **/ide/eclipse/launch/** + **/ide/intellij/launch/** + src/site/resources/ide/eclipse/** - **/*.project - **/.classpath - **/.settings/** - **/*.launch - **/ide/eclipse/launch/** - **/ide/intellij/launch/** - src/site/resources/ide/eclipse/** + **/rebel.xml + **/*.gitignore + **/*.log + **/*.pdn + **/*.svg + **/*.json + **/*.min.js + **/*.js - **/rebel.xml - **/*.gitignore - **/*.log - **/*.pdn - **/*.svg - **/*.json - **/*.min.js - **/*.js + **/translations.pot + **/translations*.po + + + + AL2 + Apache License 2.0 + + + Licensed to the Apache Software Foundation (ASF) under + one + + + + JQRY + MIT + + + Dual licensed under the MIT or GPL Version 2 licenses. + + + + JMOCK + JMock + + + Copyright (c) 2000-2007, jMock.org + + + + DOCBK + DocBook 4.5 + + + Permission to copy in any form is granted for use + Permission to use, copy, modify and distribute the + DocBook DTD + is hereby granted in perpetuity, provided that the + above copyright + This is the catalog data file for DocBook XML V4.5. It + is provided as + XML Catalog data for DocBook XML V4.5 + DocBook additional general entities V4.5 + XML EXCHANGE TABLE MODEL DECLARATION MODULE + + + + W3C + XHTML + + + Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio), + + + + + + Apache License 2.0 + + + MIT + + + JMock + + + DocBook 4.5 + + + XHTML + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-surefire-report-plugin + + + - **/translations.pot - **/translations*.po - - - - AL2 - Apache License 2.0 - - - Licensed to the Apache Software Foundation (ASF) under one - - - - JQRY - MIT - - - Dual licensed under the MIT or GPL Version 2 licenses. - - - - JMOCK - JMock - - - Copyright (c) 2000-2007, jMock.org - - - - DOCBK - DocBook 4.5 - - - Permission to copy in any form is granted for use - Permission to use, copy, modify and distribute the DocBook DTD - is hereby granted in perpetuity, provided that the above copyright - This is the catalog data file for DocBook XML V4.5. It is provided as - XML Catalog data for DocBook XML V4.5 - DocBook additional general entities V4.5 - XML EXCHANGE TABLE MODEL DECLARATION MODULE - - - - W3C - XHTML - - - Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio), - - - - - - Apache License 2.0 - - - MIT - - - JMock - - - DocBook 4.5 - - - XHTML - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-surefire-report-plugin - - - + + - - + + org.apache.isis.core + isis + ${isis.version} + pom + import + - - org.apache.isis.core - isis - ${isis.version} - pom - import - + + org.apache.isis.viewer + isis-viewer-wicket + ${isis.version} + pom + import + - - org.apache.isis.viewer - isis-viewer-wicket - ${isis.version} - pom - import - - - - org.assertj - assertj-core - ${assertj-core.version} - + + org.assertj + assertj-core + ${assertj-core.version} + - - - ${project.groupId} - naked-objects-dom - 1.0-SNAPSHOT - - - ${project.groupId} - naked-objects-fixture - 1.0-SNAPSHOT - - - ${project.groupId} - naked-objects-webapp - 1.0-SNAPSHOT - + + + ${project.groupId} + naked-objects-dom + 1.1.0 + + + ${project.groupId} + naked-objects-fixture + 1.1.0 + + + ${project.groupId} + naked-objects-webapp + 1.1.0 + - - + + - - - m2e - - - m2e.version - - - - target-ide - - - + + + m2e + + + m2e.version + + + + target-ide + + + - - dom - fixture - integtests - webapp - + + dom + fixture + integtests + webapp + \ No newline at end of file diff --git a/naked-objects/webapp/pom.xml b/naked-objects/webapp/pom.xml index 1d2aa3222..7e90194d0 100644 --- a/naked-objects/webapp/pom.xml +++ b/naked-objects/webapp/pom.xml @@ -1,352 +1,324 @@ - - 4.0.0 + + + 4.0.0 - - com.iluwatar - naked-objects - 1.0-SNAPSHOT - + + com.iluwatar + naked-objects + 1.1.0 + - naked-objects-webapp - Simple App Webapp + naked-objects-webapp - This module runs both the Wicket viewer and the Restfulobjects viewer in a single webapp configured to run using the datanucleus object store. + This module runs both the Wicket viewer and the Restfulobjects viewer in a single webapp configured to run using the datanucleus object store. - war + war - - .. - - - - - - org.mortbay.jetty - maven-jetty-plugin - + + .. + - - - org.simplericity.jettyconsole - jetty-console-maven-plugin - - - - createconsole - - - ${basedir}/src/main/jettyconsole/isis-banner.png - ${project.build.directory}/${project.build.finalName}-jetty-console.jar - - package - - - + + + + org.mortbay.jetty + maven-jetty-plugin + - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - validate - - maven-version - - - - + + + org.simplericity.jettyconsole + jetty-console-maven-plugin + + + + createconsole + + + ${basedir}/src/main/jettyconsole/isis-banner.png + ${project.build.directory}/${project.build.finalName}-jetty-console.jar + + package + + + - - maven-war-plugin - - simpleapp - - - false - - - ${maven.build.timestamp} - ${agent.name} - ${user.name} - Maven ${maven.version} - ${java.version} - ${os.name} - ${project.version} - - - WEB-INF/lib/isis-core-webserver*.jar, - WEB-INF/lib/javax.servlet-api-*.jar, - WEB-INF/lib/javax.websocket-api-*.jar, - WEB-INF/lib/jetty-all-*.jar - - + + org.codehaus.mojo + build-helper-maven-plugin + 1.8 + + + validate + + maven-version + + + + - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.codehaus.mojo - build-helper-maven-plugin - [1.5,) - - maven-version - - - - - - - - - - - - - + + maven-war-plugin + + simpleapp + + + false + + + ${maven.build.timestamp} + ${agent.name} + ${user.name} + Maven ${maven.version} + ${java.version} + ${os.name} + ${project.version} + + + WEB-INF/lib/isis-core-webserver*.jar, + WEB-INF/lib/javax.servlet-api-*.jar, + WEB-INF/lib/javax.websocket-api-*.jar, + WEB-INF/lib/jetty-all-*.jar + + - - - - - ${project.groupId} - naked-objects-dom - - - - org.datanucleus - datanucleus-enhancer - - - - - ${project.groupId} - naked-objects-fixture - - - - org.datanucleus - datanucleus-enhancer - - - - - - - org.apache.isis.viewer - isis-viewer-wicket-impl - - - org.apache.isis.core - isis-core-viewer-restfulobjects-server - - - org.apache.isis.core - isis-core-security-shiro - + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.codehaus.mojo + build-helper-maven-plugin + [1.5,) + + maven-version + + + + + + + + + + + + + + + + + + + ${project.groupId} + naked-objects-dom + + + + org.datanucleus + datanucleus-enhancer + + + + + ${project.groupId} + naked-objects-fixture + + + + org.datanucleus + datanucleus-enhancer + + + + + + + org.apache.isis.viewer + isis-viewer-wicket-impl + + + org.apache.isis.core + isis-core-viewer-restfulobjects-server + + + org.apache.isis.core + isis-core-security-shiro + - - - org.apache.isis.core - isis-core-runtime - - - org.apache.isis.core - isis-core-wrapper - - - org.apache.isis.core - isis-core-security - + + + org.apache.isis.core + isis-core-runtime + + + org.apache.isis.core + isis-core-wrapper + + + org.apache.isis.core + isis-core-security + - - - org.apache.isis.core - isis-core-webserver - runtime - true - + + + org.apache.isis.core + isis-core-webserver + runtime + true + - - org.apache.geronimo.specs - geronimo-servlet_3.0_spec - + + org.apache.geronimo.specs + geronimo-servlet_3.0_spec + - - - org.hsqldb - hsqldb - + + + org.hsqldb + hsqldb + - + - - + + - - org.lazyluke - log4jdbc-remix - - - org.slf4j - slf4j-api - - - + + org.lazyluke + log4jdbc-remix + + + org.slf4j + slf4j-api + + + - + - - - self-host - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - - - - - - - - - - - - intellij - - - idea.version - - - - - org.apache.geronimo.specs - geronimo-servlet_3.0_spec - - compile - - - - - jrebel - - - target - dom.simple,org.apache.isis.objectstore.jdo.applib - warn - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - - - - + + + self-host + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + + + + + + + + + + + + intellij + + + idea.version + + + + + org.apache.geronimo.specs + geronimo-servlet_3.0_spec + + compile + + + + + jrebel + + + target + dom.simple,org.apache.isis.objectstore.jdo.applib + warn + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + +