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/07/06 11:46:29 UTC
[isis] branch maint-1.16.2 updated (56ed13e -> a0857dc)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch maint-1.16.2
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 56ed13e ISIS-1916: adds missing annotation for HelloWorldObjects archetype
new a77b2ae ISIS-1965: uses , adds .gitlab-ci.yml
new 210fd1e ISIS-1965: fixes invalid .gitlab-ci.yml
new f4825d6 ISIS-1965: fixes for simpleapp Docker image build
new a0857dc ISIS-1965: updates apps to use repo.incode.cloud rather than cloudbees
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitlab-ci.yml | 70 +++++
adocs/documentation/pom.xml | 19 +-
adocs/template/document.html.erb | 4 +-
.../simpleapp => core}/.m2/settings.xml | 9 +-
core/applib/pom.xml | 2 +-
core/integtestsupport/pom.xml | 18 +-
core/log4j/pom.xml | 2 +-
core/maven-plugin/pom.xml | 2 +-
core/mavendeps/intellij/pom.xml | 5 +-
core/mavendeps/testing/pom.xml | 2 +-
core/mavendeps/webapp/pom.xml | 2 +-
core/metamodel/pom.xml | 2 +-
core/pom.xml | 204 ++++++++++----
core/runtime/pom.xml | 60 ++---
core/schema/pom.xml | 2 +-
core/security-shiro/pom.xml | 96 +++----
core/security/pom.xml | 46 ++--
core/specsupport/pom.xml | 2 +-
core/unittestsupport/pom.xml | 117 ++++-----
core/viewer-restfulobjects-applib/pom.xml | 44 ++--
core/viewer-restfulobjects-rendering/pom.xml | 23 +-
core/viewer-restfulobjects-server/pom.xml | 20 +-
core/viewer-wicket-applib/pom.xml | 106 ++++----
core/viewer-wicket-impl/pom.xml | 131 ++++-----
core/viewer-wicket-model/pom.xml | 88 +++----
core/viewer-wicket-ui/pom.xml | 197 +++++++-------
core/webserver/pom.xml | 59 +++--
core/wrapper/pom.xml | 58 ++--
example/application/helloworld/pom.xml | 292 ++++++++++++++++-----
example/application/simpleapp/.gitlab-ci.yml | 25 +-
example/application/simpleapp/.m2/settings.xml | 2 +-
example/application/simpleapp/application/pom.xml | 2 +-
.../application/simpleapp/module-simple/pom.xml | 11 +-
example/application/simpleapp/pom.xml | 195 +++++++++++++-
example/application/simpleapp/webapp/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
pom.xml | 8 +-
37 files changed, 1208 insertions(+), 721 deletions(-)
create mode 100644 .gitlab-ci.yml
copy {example/application/simpleapp => core}/.m2/settings.xml (57%)
[isis] 03/04: ISIS-1965: fixes for simpleapp Docker image build
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f4825d62f383f7e224067e12dc63f29ea251fb7a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jul 6 00:10:42 2018 +0100
ISIS-1965: fixes for simpleapp Docker image build
---
example/application/helloworld/pom.xml | 2 +-
example/application/simpleapp/.gitlab-ci.yml | 25 +++++++++++-----------
example/application/simpleapp/.m2/settings.xml | 2 +-
example/application/simpleapp/application/pom.xml | 2 +-
.../application/simpleapp/module-simple/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 2 +-
example/application/simpleapp/webapp/pom.xml | 2 +-
7 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index 853ea99..131b08c 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -31,7 +31,7 @@
<artifactId>helloworld</artifactId>
<version>${revision}</version>
- <name>HelloWorld</name>
+ <name>Apache Isis App -HelloWorld</name>
<packaging>war</packaging>
diff --git a/example/application/simpleapp/.gitlab-ci.yml b/example/application/simpleapp/.gitlab-ci.yml
index 8b1e37a..7d4a33b 100644
--- a/example/application/simpleapp/.gitlab-ci.yml
+++ b/example/application/simpleapp/.gitlab-ci.yml
@@ -3,15 +3,16 @@
# - DOCKER_REGISTRY_USERNAME
# - DOCKER_REGISTRY_PASSWORD
# - DOCKER_REGISTRY_EMAIL
-#
-# Adjust "DOCKER_REGISTRY_REPOSITORY" variable (below) to be the name of the repository in the specified registry.
-#
+# - DOCKER_REGISTRY_NAME # eg "registry-1.docker.io" (for docker hub)
+ # or "docker-dev.incode.cloud" (eg a cloud-based nexus)
+# - DOCKER_REGISTRY_URL # eg "https://index.docker.io/v1/" (for docker hub)
+ # or "https://repo.incode.cloud/repository/docker-dev/" (eg a cloud-based nexus)
#
image: maven:3.5.3-jdk-8
before_script:
- - export REVISION=$(date +%Y%m%d.%H%M).$CI_COMMIT_REF_SLUG.$(echo $CI_COMMIT_SHA | cut -c1-7)
+ - export REVISION=$(date +%Y%m%d.%H%M).$CI_COMMIT_REF_SLUG.$(echo $CI_COMMIT_SHA | cut -c1-8)
services:
- docker:dind
@@ -19,11 +20,8 @@ services:
variables:
DOCKER_HOST: tcp://docker:2375
DOCKER_DRIVER: overlay2
- MAVEN_CLI_OPTS: "-s .m2/settings.xml --batch-mode"
MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dskip.cloudbees-estatio-repositories -Dskip.sonatype-snapshots -Dskip.apache-snapshots"
- DOCKER_REGISTRY_ID: "docker-hub"
- DOCKER_REGISTRY_URL: "https://index.docker.io/v1/"
- DOCKER_REGISTRY_REPOSITORY: "simpleapp"
+ APP_NAME: "simpleapp"
stages:
- build-package-push
@@ -33,13 +31,14 @@ build-package-push:
script:
- echo "REVISION=$REVISION"
- >
- mvn $MAVEN_CLI_OPTS \
- clean install \
+ mvn --batch-mode \
+ install \
-Drevision=$REVISION \
-Dmavenmixin-docker \
- -Ddocker-plugin.imageName=$DOCKER_REGISTRY_USERNAME/$DOCKER_REGISTRY_REPOSITORY
+ -Ddocker-plugin.imageName=$DOCKER_REGISTRY_NAME/$DOCKER_REGISTRY_USERNAME/$APP_NAME
- >
- mvn $MAVEN_CLI_OPTS \
+ mvn -s .m2/settings.xml \
+ --batch-mode \
docker:push@push-image-tagged \
-pl webapp \
-Drevision=$REVISION \
@@ -47,6 +46,6 @@ build-package-push:
-Dskip.isis-swagger \
-Dmavenmixin-docker \
-Ddocker-plugin.imageName=$DOCKER_REGISTRY_USERNAME/$DOCKER_REGISTRY_REPOSITORY \
- -Ddocker-plugin.serverId=$DOCKER_REGISTRY_ID \
+ -Ddocker-plugin.serverId=docker-registry \
-Ddocker.registryUrl=$DOCKER_REGISTRY_URL
diff --git a/example/application/simpleapp/.m2/settings.xml b/example/application/simpleapp/.m2/settings.xml
index d481ccb..6038b0e 100644
--- a/example/application/simpleapp/.m2/settings.xml
+++ b/example/application/simpleapp/.m2/settings.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<servers>
<server>
- <id>${env.DOCKER_REGISTRY_ID}</id>
+ <id>docker-registry</id>
<username>${env.DOCKER_REGISTRY_USERNAME}</username>
<password>${env.DOCKER_REGISTRY_PASSWORD}</password>
<configuration>
diff --git a/example/application/simpleapp/application/pom.xml b/example/application/simpleapp/application/pom.xml
index 46d779d..164f0c5 100644
--- a/example/application/simpleapp/application/pom.xml
+++ b/example/application/simpleapp/application/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>simpleapp-application</artifactId>
- <name>SimpleApp Application</name>
+ <name>Apache Isis App - SimpleApp Application</name>
<description>This defines the application (manifest) and runs application-level fixtures and integration (smoke) tests</description>
diff --git a/example/application/simpleapp/module-simple/pom.xml b/example/application/simpleapp/module-simple/pom.xml
index 87e9c35..088fab8 100644
--- a/example/application/simpleapp/module-simple/pom.xml
+++ b/example/application/simpleapp/module-simple/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>simpleapp-module-simple</artifactId>
- <name>SimpleApp Simple Module</name>
+ <name>Apache Isis App - SimpleApp Simple Module</name>
<properties>
<isis-maven-plugin.validate.appManifest>
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 7ec10e8..c428976 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -31,7 +31,7 @@
<artifactId>simpleapp</artifactId>
<version>${revision}</version>
- <name>SimpleApp Parent</name>
+ <name>Apache Isis App - SimpleApp Parent</name>
<packaging>pom</packaging>
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index b7b6701..2ded58a 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>simpleapp-webapp</artifactId>
- <name>SimpleApp Webapp</name>
+ <name>Apache Isis App - SimpleApp Webapp</name>
<description>This assemblies and runs both the Wicket viewer and the Restfulobjects viewer in a single webapp configured to run using the datanucleus object store.</description>
[isis] 02/04: ISIS-1965: fixes invalid .gitlab-ci.yml
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 210fd1e37fc2c56641e899f2fab943546eb53c49
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jul 5 23:05:54 2018 +0100
ISIS-1965: fixes invalid .gitlab-ci.yml
---
.gitlab-ci.yml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b4b2ca..e69e8d5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,10 +22,6 @@ before_script:
services:
- docker:dind
-only:
- - master
- - maint-1.16.2
-
variables:
DOCKER_HOST: tcp://docker:2375
DOCKER_DRIVER: overlay2
[isis] 04/04: ISIS-1965: updates apps to use repo.incode.cloud
rather than cloudbees
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a0857dccf7a6bfbfa324c773ad9ec9d09dad450a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jul 6 12:45:47 2018 +0100
ISIS-1965: updates apps to use repo.incode.cloud rather than cloudbees
Also:
- bumps version of lombok
---
core/pom.xml | 41 ++--
example/application/helloworld/pom.xml | 218 ++++++++++++++++-----
example/application/simpleapp/pom.xml | 179 ++++++++++++++++-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
4 files changed, 369 insertions(+), 71 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 03f0ce8..5b1e55e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -2248,17 +2248,36 @@ ${license.additional-notes}
</build>
</profile>
<profile>
- <!--
- this profile allows builds to be deployed to an inhouse nexus repo.
- export NEXUS_USERNAME=...
- export NEXUS_PASSWORD=...
- export NEXUS_REPO_URL=...
- export REVISION=...
- mvn clean deploy \
- -Drevision=$REVISION \
- -Dnexus-deploy \
- -s .m2/settings.xml \
- -Dnexus-deploy.repositoryUrl=$NEXUS_REPO_URL
+
+ <!--
+ this profile allows builds to be deployed to an inhouse nexus repo.
+
+ export NEXUS_USERNAME=...
+ export NEXUS_PASSWORD=...
+ export NEXUS_REPO_URL=http://incode-binaries.westeurope.azurecontainer.io:8081/repository/maven2-incode-interims/
+
+ export REVISION=...
+
+ mvn clean deploy \
+ -Drevision=$REVISION \
+ -Dnexus-deploy \
+ -s .m2/settings.xml \
+ -Dnexus-deploy.repositoryUrl=$NEXUS_REPO_URL
+
+ with .m2/settings.xml as:
+
+ <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+ <servers>
+ <server>
+ <id>nexus-deploy.serverId</id>
+ <username>${env.NEXUS_USERNAME}</username>
+ <password>${env.NEXUS_PASSWORD}</password>
+ </server>
+ </servers>
+ </settings>
+
-->
<id>nexus-deploy</id>
<activation>
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index 131b08c..85563a9 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -31,7 +31,7 @@
<artifactId>helloworld</artifactId>
<version>${revision}</version>
- <name>Apache Isis App -HelloWorld</name>
+ <name>Apache Isis App - HelloWorld</name>
<packaging>war</packaging>
@@ -120,57 +120,6 @@
</plugins>
</build>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshots</name>
- <url>https://repository.apache.org/content/repositories/snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>cloudbees.estatio.snapshots</id>
- <url>http://repository-estatio.forge.cloudbees.com/snapshot/</url>
- <name>CloudBees Snapshots (and Interim Releases)</name>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
- <layout>default</layout>
- </repository>
- <repository>
- <id>sonatype-snapshots</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>cloudbees.estatio.snapshots</id>
- <name>CloudBees Snapshots (and Interim Releases)</name>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </releases>
- <url>http://repository-estatio.forge.cloudbees.com/snapshot/</url>
- <layout>default</layout>
- </pluginRepository>
- </pluginRepositories>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -236,6 +185,171 @@
</plugins>
</build>
</profile>
+
+ <!-- TODO: move up to incode-build -->
+ <profile>
+ <id>incode-cloud-maven</id>
+ <activation>
+ <property>
+ <name>!skip.incode-cloud-maven</name>
+ </property>
+ </activation>
+ <repositories>
+ <repository>
+ <id>incode-cloud-maven</id>
+ <url>https://repo.incode.cloud/repository/maven/</url>
+ <name>Incode Cloud (maven)</name>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </snapshots>
+ <layout>default</layout>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>incode-cloud-maven</id>
+ <name>Incode Cloud (maven)</name>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </releases>
+ <url>https://repo.incode.cloud/repository/maven/</url>
+ <layout>default</layout>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+
+ <!-- TODO: move up to incode-build -->
+ <profile>
+ <id>incode-cloud-maven-dev</id>
+ <activation>
+ <property>
+ <name>incode-cloud-maven-dev</name>
+ </property>
+ </activation>
+ <repositories>
+ <repository>
+ <id>incode-cloud-maven-dev</id>
+ <url>https://repo.incode.cloud/repository/maven-dev/</url>
+ <name>Incode Cloud (maven-dev)</name>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </snapshots>
+ <layout>default</layout>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>incode-cloud-maven-dev</id>
+ <name>Incode Cloud (maven-dev)</name>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </releases>
+ <url>https://repo.incode.cloud/repository/maven-dev/</url>
+ <layout>default</layout>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+
+ <!-- TODO: move up to incode-build -->
+ <profile>
+ <id>incode-cloud-maven-test</id>
+ <activation>
+ <property>
+ <name>incode-cloud-maven-test</name>
+ </property>
+ </activation>
+ <repositories>
+ <repository>
+ <id>incode-cloud-maven-test</id>
+ <url>https://repo.incode.cloud/repository/maven-test/</url>
+ <name>Incode Cloud (maven-test)</name>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </snapshots>
+ <layout>default</layout>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>incode-cloud-maven-test</id>
+ <name>Incode Cloud (maven-test)</name>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </releases>
+ <url>https://repo.incode.cloud/repository/maven-test/</url>
+ <layout>default</layout>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+
+ <!-- TODO: move up to incode-build -->
+ <profile>
+ <id>incode-cloud-maven-prod</id>
+ <activation>
+ <property>
+ <name>incode-cloud-maven-prod</name>
+ </property>
+ </activation>
+ <repositories>
+ <repository>
+ <id>incode-cloud-maven-prod</id>
+ <url>https://repo.incode.cloud/repository/maven-prod/</url>
+ <name>Incode Cloud (maven-prod)</name>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </snapshots>
+ <layout>default</layout>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>incode-cloud-maven-prod</id>
+ <name>Incode Cloud (maven-prod)</name>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </releases>
+ <url>https://repo.incode.cloud/repository/maven-prod/</url>
+ <layout>default</layout>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+
</profiles>
</project>
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index c428976..d9db1b4 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -40,7 +40,7 @@
<isis.version>${revision}</isis.version>
- <lombok.version>1.16.20</lombok.version>
+ <lombok.version>1.18.0</lombok.version>
<compiler-plugin.source>1.8</compiler-plugin.source>
<compiler-plugin.target>1.8</compiler-plugin.target>
@@ -150,6 +150,12 @@
</dependency>
</dependencies>
+ <modules>
+ <module>module-simple</module>
+ <module>application</module>
+ <module>webapp</module>
+ </modules>
+
<profiles>
<profile>
<id>m2e</id>
@@ -173,12 +179,171 @@
</plugins>
</build>
</profile>
- </profiles>
- <modules>
- <module>module-simple</module>
- <module>application</module>
- <module>webapp</module>
- </modules>
+ <!-- TODO: move up to incode-build -->
+ <profile>
+ <id>incode-cloud-maven</id>
+ <activation>
+ <property>
+ <name>!skip.incode-cloud-maven</name>
+ </property>
+ </activation>
+ <repositories>
+ <repository>
+ <id>incode-cloud-maven</id>
+ <url>https://repo.incode.cloud/repository/maven/</url>
+ <name>Incode Cloud (maven)</name>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </snapshots>
+ <layout>default</layout>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>incode-cloud-maven</id>
+ <name>Incode Cloud (maven)</name>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </releases>
+ <url>https://repo.incode.cloud/repository/maven/</url>
+ <layout>default</layout>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+
+ <!-- TODO: move up to incode-build -->
+ <profile>
+ <id>incode-cloud-maven-dev</id>
+ <activation>
+ <property>
+ <name>incode-cloud-maven-dev</name>
+ </property>
+ </activation>
+ <repositories>
+ <repository>
+ <id>incode-cloud-maven-dev</id>
+ <url>https://repo.incode.cloud/repository/maven-dev/</url>
+ <name>Incode Cloud (maven-dev)</name>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </snapshots>
+ <layout>default</layout>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>incode-cloud-maven-dev</id>
+ <name>Incode Cloud (maven-dev)</name>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </releases>
+ <url>https://repo.incode.cloud/repository/maven-dev/</url>
+ <layout>default</layout>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+
+ <!-- TODO: move up to incode-build -->
+ <profile>
+ <id>incode-cloud-maven-test</id>
+ <activation>
+ <property>
+ <name>incode-cloud-maven-test</name>
+ </property>
+ </activation>
+ <repositories>
+ <repository>
+ <id>incode-cloud-maven-test</id>
+ <url>https://repo.incode.cloud/repository/maven-test/</url>
+ <name>Incode Cloud (maven-test)</name>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </snapshots>
+ <layout>default</layout>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>incode-cloud-maven-test</id>
+ <name>Incode Cloud (maven-test)</name>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </releases>
+ <url>https://repo.incode.cloud/repository/maven-test/</url>
+ <layout>default</layout>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+
+ <!-- TODO: move up to incode-build -->
+ <profile>
+ <id>incode-cloud-maven-prod</id>
+ <activation>
+ <property>
+ <name>incode-cloud-maven-prod</name>
+ </property>
+ </activation>
+ <repositories>
+ <repository>
+ <id>incode-cloud-maven-prod</id>
+ <url>https://repo.incode.cloud/repository/maven-prod/</url>
+ <name>Incode Cloud (maven-prod)</name>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </snapshots>
+ <layout>default</layout>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>incode-cloud-maven-prod</id>
+ <name>Incode Cloud (maven-prod)</name>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </releases>
+ <url>https://repo.incode.cloud/repository/maven-prod/</url>
+ <layout>default</layout>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+
+ </profiles>
</project>
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 4a5bac4..cfe5d95 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
@@ -38,7 +38,7 @@
<isis.version>1.16.2</isis.version>
- <lombok.version>1.16.20</lombok.version>
+ <lombok.version>1.18.0</lombok.version>
<compiler-plugin.source>1.8</compiler-plugin.source>
<compiler-plugin.target>1.8</compiler-plugin.target>
[isis] 01/04: ISIS-1965: uses , adds .gitlab-ci.yml
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a77b2aed6aead8b77ae12d9d169db572f94fb765
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jul 5 22:58:00 2018 +0100
ISIS-1965: uses , adds .gitlab-ci.yml
---
.gitlab-ci.yml | 74 ++++++++
adocs/documentation/pom.xml | 19 +-
adocs/template/document.html.erb | 4 +-
core/.m2/settings.xml | 12 ++
core/applib/pom.xml | 2 +-
core/integtestsupport/pom.xml | 18 +-
core/log4j/pom.xml | 2 +-
core/maven-plugin/pom.xml | 2 +-
core/mavendeps/intellij/pom.xml | 5 +-
core/mavendeps/testing/pom.xml | 2 +-
core/mavendeps/webapp/pom.xml | 2 +-
core/metamodel/pom.xml | 2 +-
core/pom.xml | 185 +++++++++++++------
core/runtime/pom.xml | 60 +++----
core/schema/pom.xml | 2 +-
core/security-shiro/pom.xml | 96 +++++-----
core/security/pom.xml | 46 ++---
core/specsupport/pom.xml | 2 +-
core/unittestsupport/pom.xml | 117 ++++++------
core/viewer-restfulobjects-applib/pom.xml | 44 ++---
core/viewer-restfulobjects-rendering/pom.xml | 23 +--
core/viewer-restfulobjects-server/pom.xml | 20 ++-
core/viewer-wicket-applib/pom.xml | 106 +++++------
core/viewer-wicket-impl/pom.xml | 131 +++++++-------
core/viewer-wicket-model/pom.xml | 88 +++++----
core/viewer-wicket-ui/pom.xml | 197 +++++++++++----------
core/webserver/pom.xml | 59 +++---
core/wrapper/pom.xml | 58 +++---
example/application/helloworld/pom.xml | 74 +++++---
.../application/simpleapp/module-simple/pom.xml | 9 +-
example/application/simpleapp/pom.xml | 14 +-
pom.xml | 8 +-
32 files changed, 846 insertions(+), 637 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..0b4b2ca
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,74 @@
+#
+# requires the following gitlab secret variables
+#
+# - NEXUS_USERNAME
+# - NEXUS_PASSWORD
+# - NEXUS_REPO_URL
+# - DOCKER_REGISTRY_USERNAME
+# - DOCKER_REGISTRY_PASSWORD
+# - DOCKER_REGISTRY_EMAIL
+# - DOCKER_REGISTRY_NAME # eg "registry-1.docker.io" (for docker hub)
+ # or "docker-dev.incode.cloud" (eg a cloud-based nexus)
+# - DOCKER_REGISTRY_URL # eg "https://index.docker.io/v1/" (for docker hub)
+ # or "https://repo.incode.cloud/repository/docker-dev/" (eg a cloud-based nexus)
+#
+
+image: maven:3.5.3-jdk-8
+
+before_script:
+ - export BASELINE=1.16.2
+ - export REVISION=$BASELINE.$(date +%Y%m%d)-$(date +%H%M)-$(echo $CI_COMMIT_SHA | cut -c1-8)
+
+services:
+ - docker:dind
+
+only:
+ - master
+ - maint-1.16.2
+
+variables:
+ DOCKER_HOST: tcp://docker:2375
+ DOCKER_DRIVER: overlay2
+ APP_NAME: "simpleapp"
+
+stages:
+ - build-package-push
+
+build-package-push:
+ stage: build-package-push
+ script:
+ - echo "REVISION=$REVISION"
+ - cd core
+ - >
+ mvn -s .m2/settings.xml \
+ --batch-mode \
+ clean deploy \
+ -Drevision=$REVISION \
+ -Dnexus-deploy \
+ -Dnexus-deploy.repositoryUrl=$NEXUS_REPO_URL \
+ $CORE_ADDITIONAL_OPTS
+ - cd ..
+ - cd example/application/$APP_NAME
+ - >
+ mvn --batch-mode \
+ install \
+ -Drevision=$REVISION \
+ -Disis.version=$REVISION \
+ -Dmavenmixin-docker \
+ -Ddocker-plugin.imageName=$DOCKER_REGISTRY_NAME/$DOCKER_REGISTRY_USERNAME/$APP_NAME
+ - >
+ mvn -s .m2/settings.xml \
+ --batch-mode \
+ docker:push@push-image-tagged \
+ -pl webapp \
+ -Drevision=$REVISION \
+ -Disis.version=$REVISION \
+ -DskipTests \
+ -Dskip.isis-swagger \
+ -Dmavenmixin-docker \
+ -Ddocker-plugin.imageName=$DOCKER_REGISTRY_NAME/$DOCKER_REGISTRY_USERNAME/$APP_NAME \
+ -Ddocker-plugin.serverId=docker-registry \
+ -Ddocker.registryUrl=$DOCKER_REGISTRY_URL
+ - cd ../../..
+
+
diff --git a/adocs/documentation/pom.xml b/adocs/documentation/pom.xml
index 960a2e4..ec06654 100644
--- a/adocs/documentation/pom.xml
+++ b/adocs/documentation/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.isis.docs</groupId>
<artifactId>isis-documentation</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Isis Docs</name>
@@ -52,17 +52,18 @@
<build.dir>${project.basedir}/target/site</build.dir>
- <isis-site-latest.dir>../../../isis-site/latest</isis-site-latest.dir>
- <isis-site-content.dir>../../../isis-site/content</isis-site-content.dir>
- <isis-site-search.dir>../../../isis-site/search</isis-site-search.dir>
+ <!-- expected isis-site to be checked out to /c/ASF/isis/isis-site, vs /c/github/apache/isis -->
+ <isis-site-latest.dir>../../../../../ASF/isis/isis-site/latest</isis-site-latest.dir>
+ <isis-site-content.dir>../../../../../ASF/isis/isis-site/content</isis-site-content.dir>
+ <isis-site-search.dir>../../../../../ASF/isis/isis-site/search</isis-site-search.dir>
<message>updating content (built from adocs/documentation in isis.git repo)</message>
</properties>
- <scm>
- <connection>scm:git:https://git-wip-us.apache.org/repos/asf/isis.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/isis.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf/isis.git</url>
- <tag>HEAD</tag>
+ <scm>
+ <connection>scm:git:https://github.com/apache/isis.git</connection>
+ <developerConnection>scm:git:https://github.com/apache/isis.git</developerConnection>
+ <url>https://github.com/apache/isis.git</url>
+ <tag>HEAD</tag>
</scm>
<repositories>
diff --git a/adocs/template/document.html.erb b/adocs/template/document.html.erb
index efc68e6..f4c7966 100644
--- a/adocs/template/document.html.erb
+++ b/adocs/template/document.html.erb
@@ -172,7 +172,7 @@
<li role="separator" class="divider"></li>
<li class="dropdown-header">Other Resources</li>
<li><a href="https://issues.apache.org/jira/browse/ISIS">ASF JIRA</a></li>
- <li><a href="http://stackoverflow.com/questions/tagged/isis">Stack Overflow</a></li>
+ <li><a href="https://stackoverflow.com/questions/tagged/isis">Stack Overflow</a></li>
<li><a href="<%= (attr :_basedir) %>help.html">Wiki, Fisheye etc.</a></li>
</ul>
</li>
@@ -180,7 +180,7 @@
<li class="dropdown hidden-sm hidden-md">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">@ASF<span class="caret"></span></a>
<ul class="dropdown-menu">
- <li><a href="http://www.apache.org/">Apache Homepage</a></li>
+ <li><a href="https://www.apache.org/">Apache Homepage</a></li>
<li><a href="https://www.apache.org/events/current-event">Events</a></li>
<li><a href="https://www.apache.org/licenses/">Licenses</a></li>
<li><a href="https://www.apache.org/security/">Security</a></li>
diff --git a/core/.m2/settings.xml b/core/.m2/settings.xml
new file mode 100644
index 0000000..a2c42ef
--- /dev/null
+++ b/core/.m2/settings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+ <servers>
+ <server>
+ <id>nexus-deploy.serverId</id>
+ <username>${env.NEXUS_USERNAME}</username>
+ <password>${env.NEXUS_PASSWORD}</password>
+ </server>
+ </servers>
+</settings>
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index aa53e3b..291196b 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>isis-core-applib</artifactId>
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 4da3b4a..8da1fd2 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -18,16 +18,16 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
+ <version>${revision}</version>
+ </parent>
- <artifactId>isis-core-integtestsupport</artifactId>
- <name>Apache Isis Integration Testing Support</name>
+ <artifactId>isis-core-integtestsupport</artifactId>
+ <name>Apache Isis Integration Testing Support</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.core.integtestsupport</jar-plugin.automaticModuleName>
@@ -79,5 +79,5 @@
<artifactId>log4j</artifactId>
</dependency>
- </dependencies>
+ </dependencies>
</project>
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index ba12672..e405bfc 100644
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>isis-core-log4j</artifactId>
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 3a46de9..5620e29 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<groupId>org.apache.isis.tool</groupId>
diff --git a/core/mavendeps/intellij/pom.xml b/core/mavendeps/intellij/pom.xml
index f6bd385..49a55c3 100644
--- a/core/mavendeps/intellij/pom.xml
+++ b/core/mavendeps/intellij/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -38,7 +38,4 @@
Deprecated - profile moved to isis-mavendeps-webapp
</description>
- <profiles>
- </profiles>
-
</project>
diff --git a/core/mavendeps/testing/pom.xml b/core/mavendeps/testing/pom.xml
index 1011014..670ed17 100644
--- a/core/mavendeps/testing/pom.xml
+++ b/core/mavendeps/testing/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/mavendeps/webapp/pom.xml b/core/mavendeps/webapp/pom.xml
index 3b5b254..a9f0341 100644
--- a/core/mavendeps/webapp/pom.xml
+++ b/core/mavendeps/webapp/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 38d3180..35bc1ca 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>isis-core-metamodel</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 0d1caa7..03f0ce8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
<packaging>pom</packaging>
@@ -45,11 +45,9 @@
<inceptionYear>2010</inceptionYear>
- <prerequisites>
- <maven>3.0.4</maven>
- </prerequisites>
-
<properties>
+ <revision>1.16.3-SNAPSHOT</revision>
+
<jar-plugin.automaticModuleName>org.apache.isis.core</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/core</git-plugin.propertiesDir>
@@ -64,6 +62,8 @@
<compileTarget>1.7</compileTarget>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <surefire-plugin.argLine>-Xms1024m -Xmx1024m</surefire-plugin.argLine>
+
<dependency.locations.enabled>false</dependency.locations.enabled>
<coreBaseDir>${project.build.directory}/..</coreBaseDir>
<checkstyle.configLocation>${coreBaseDir}/codequality/checkstyle.xml</checkstyle.configLocation>
@@ -135,8 +135,6 @@
<swagger-core.version>1.5.9</swagger-core.version>
<webjars-servlet-2.x.version>1.5</webjars-servlet-2.x.version>
- <!-- using 2.3.2 throws strange error about not finding org.hsqldb.jdbcDriver -->
- <!-- using 2.3.3 throws SQL exception in simpleapp integtests -->
<hsqldb.version>2.3.4</hsqldb.version>
<log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
<resteasy-jaxrs.version>3.0.24.Final</resteasy-jaxrs.version>
@@ -987,17 +985,20 @@
<configuration>
<rules>
<requireMavenVersion>
- <version>[3.0.4,)</version>
+ <version>[3.5.0,)</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[1.8.0,)</version>
</requireJavaVersion>
+ <!--
+ seemingly not compatible with use of ${revision} placeholders
<requirePluginVersions>
<message>All plugin versions must be
defined!</message>
<banLatest>true</banLatest>
<banRelease>true</banRelease>
</requirePluginVersions>
+ -->
<DependencyConvergence />
</rules>
</configuration>
@@ -1124,7 +1125,7 @@ ${license.additional-notes}
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
- <!-- overriddes the default ('clean verify') -->
+ <!-- overrides the default ('clean verify') -->
<preparationGoals>clean install</preparationGoals>
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
@@ -1138,6 +1139,35 @@ ${license.additional-notes}
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <updatePomFile>true</updatePomFile>
+ <pomElements>
+ <dependencyManagement>resolve</dependencyManagement>
+ <dependencies>resolve</dependencies>
+ </pomElements>
+ </configuration>
+ <executions>
+ <execution>
+ <id>flatten</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>flatten.clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
@@ -1150,12 +1180,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1164,14 +1194,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1180,14 +1210,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1196,7 +1226,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-log4j</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -1205,14 +1235,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1221,76 +1251,76 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-wrapper</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</dependency>
<!-- webserver -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-webserver</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</dependency>
<!-- specsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</dependency>
<!-- integtestsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</dependency>
<!-- Restful Objects viewer -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1299,12 +1329,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</dependency>
@@ -1312,41 +1342,41 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-applib</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-model</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-model</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-ui</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-ui</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-impl</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-impl</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -1355,26 +1385,26 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.tool</groupId>
<artifactId>isis-maven-plugin</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</dependency>
<!-- Maven dependencies -->
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-intellij</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-testing</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-webapp</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
<type>pom</type>
</dependency>
@@ -1391,6 +1421,8 @@ ${license.additional-notes}
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
+
+ <!-- Axon -->
<dependency>
<groupId>org.axonframework</groupId>
<artifactId>axon-core</artifactId>
@@ -1888,8 +1920,8 @@ ${license.additional-notes}
<!-- Web development -->
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
<version>${jetty.version}</version>
<exclusions>
<exclusion>
@@ -1899,10 +1931,10 @@ ${license.additional-notes}
</exclusions>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <version>${jetty.version}</version>
- </dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
<!-- Testing libraries (not scope=test because used by isis-core-integtest) -->
@@ -2005,6 +2037,7 @@ ${license.additional-notes}
<version>${geronimo-jcdi_1.0_spec.version}</version>
</dependency>
+ <!-- JAX-RS API -->
<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
@@ -2012,7 +2045,7 @@ ${license.additional-notes}
</dependency>
- <!-- javax APIs -->
+ <!-- VALIDATION API -->
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
@@ -2074,7 +2107,7 @@ ${license.additional-notes}
</dependencyManagement>
<dependencies>
- <!-- compile dependencies -->
+ <!-- COMPILE DEPENDENCIES -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -2088,8 +2121,7 @@ ${license.additional-notes}
<artifactId>slf4j-api</artifactId>
</dependency>
-
- <!-- test dependencies -->
+ <!-- TEST DEPENDENCIES -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -2163,6 +2195,7 @@ ${license.additional-notes}
</plugins>
</build>
</profile>
+
<profile>
<id>m2e</id>
<activation>
@@ -2175,7 +2208,6 @@ ${license.additional-notes}
</build>
</profile>
-
<profile>
<id>deploy-local</id>
<activation>
@@ -2216,6 +2248,49 @@ ${license.additional-notes}
</build>
</profile>
<profile>
+ <!--
+ this profile allows builds to be deployed to an inhouse nexus repo.
+ export NEXUS_USERNAME=...
+ export NEXUS_PASSWORD=...
+ export NEXUS_REPO_URL=...
+ export REVISION=...
+ mvn clean deploy \
+ -Drevision=$REVISION \
+ -Dnexus-deploy \
+ -s .m2/settings.xml \
+ -Dnexus-deploy.repositoryUrl=$NEXUS_REPO_URL
+ -->
+ <id>nexus-deploy</id>
+ <activation>
+ <property>
+ <name>nexus-deploy</name>
+ </property>
+ </activation>
+ <properties>
+ <nexus-deploy.repositoryUrl>http://localhost:8081/repository/builds</nexus-deploy.repositoryUrl>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.8</version>
+ <extensions>true</extensions>
+ <configuration>
+ <serverId>nexus-deploy.serverId</serverId>
+ <skipStaging>true</skipStaging>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <distributionManagement>
+ <repository>
+ <id>nexus-deploy.serverId</id>
+ <url>${nexus-deploy.repositoryUrl}</url>
+ </repository>
+ </distributionManagement>
+ </profile>
+ <profile>
<id>owasp</id>
<activation>
<property>
@@ -2289,8 +2364,8 @@ ${license.additional-notes}
</profiles>
<modules>
- <module>applib</module>
<module>schema</module>
+ <module>applib</module>
<module>log4j</module>
<module>metamodel</module>
<module>runtime</module>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 7a3cc0e..178c739 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -21,13 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
- </parent>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
+ <version>${revision}</version>
+ </parent>
- <artifactId>isis-core-runtime</artifactId>
- <name>Apache Isis Runtime</name>
+ <artifactId>isis-core-runtime</artifactId>
+ <name>Apache Isis Runtime</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.core.runtime</jar-plugin.automaticModuleName>
@@ -35,7 +35,7 @@
</properties>
<build>
- <resources>
+ <resources>
<resource>
<directory>src/main/java</directory>
<filtering>false</filtering>
@@ -46,18 +46,18 @@
<exclude>**/*.java</exclude>
</excludes>
</resource>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>isis-version.properties</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- </resource>
- </resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>isis-version.properties</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -67,15 +67,15 @@
</configuration>
</plugin>
</plugins>
- </build>
+ </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-applib</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-applib</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
@@ -88,10 +88,10 @@
<artifactId>isis-core-log4j</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index 8bd803c..bb3baa4 100644
--- a/core/schema/pom.xml
+++ b/core/schema/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>isis-core-schema</artifactId>
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index 4bbab72..9d228e7 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -18,28 +18,27 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
+ <version>${revision}</version>
+ </parent>
- <artifactId>isis-core-security-shiro</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <artifactId>isis-core-security-shiro</artifactId>
- <name>Apache Isis Security Shiro</name>
+ <name>Apache Isis Security Shiro</name>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.security.shiro</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/security/shiro</git-plugin.propertiesDir>
- </properties>
+ <properties>
+ <jar-plugin.automaticModuleName>org.apache.isis.security.shiro</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/security/shiro</git-plugin.propertiesDir>
+ </properties>
- <build>
- <pluginManagement>
- <plugins>
+ <build>
+ <pluginManagement>
+ <plugins>
<!-- Apache Release Audit Tool -->
<plugin>
<groupId>org.apache.rat</groupId>
@@ -59,44 +58,45 @@
<exclude>**/.settings/**</exclude>
</excludes>
</configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
<dependencyManagement>
<!-- for benefit of application developers, using scope=import -->
<dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-security-shiro</artifactId>
- <version>1.16.3-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-security-shiro</artifactId>
+ <version>${revision}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-runtime</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-runtime</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-unittestsupport</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
@@ -113,5 +113,5 @@
<scope>provided</scope>
</dependency>
- </dependencies>
+ </dependencies>
</project>
diff --git a/core/security/pom.xml b/core/security/pom.xml
index 63dabe8..6bf4155 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -20,30 +20,30 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
+ <version>${revision}</version>
+ </parent>
- <artifactId>isis-core-security</artifactId>
- <name>Apache Isis Security + Bypass</name>
+ <artifactId>isis-core-security</artifactId>
+ <name>Apache Isis Security + Bypass</name>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.core.security</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/core/security</git-plugin.propertiesDir>
- </properties>
+ <properties>
+ <jar-plugin.automaticModuleName>org.apache.isis.core.security</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/core/security</git-plugin.propertiesDir>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-runtime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-runtime</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index e46771c..1bf20da 100644
--- a/core/specsupport/pom.xml
+++ b/core/specsupport/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>isis-core-specsupport</artifactId>
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 3ef9ca5..06b3a3f 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -18,16 +18,16 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
+ <version>${revision}</version>
+ </parent>
- <artifactId>isis-core-unittestsupport</artifactId>
- <name>Apache Isis Unit Test Support</name>
+ <artifactId>isis-core-unittestsupport</artifactId>
+ <name>Apache Isis Unit Test Support</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.core.unittestsupport</jar-plugin.automaticModuleName>
@@ -35,65 +35,64 @@
</properties>
<description>
- Support for writing unit tests; should be added as a dependency
- with scope=test only
- </description>
+ Support for writing unit tests; should be added as a dependency with scope=test only
+ </description>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.picocontainer</groupId>
- <artifactId>picocontainer</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ </dependency>
- <dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- <version>${jdo-api.version}</version>
- <optional>true</optional>
- </dependency>
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
+ <optional>true</optional>
+ </dependency>
- <dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
- <!--<version>1.4</version>-->
- </dependency>
+ <dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ <!--<version>1.4</version>-->
+ </dependency>
- <dependency>
- <groupId>org.reflections</groupId>
- <artifactId>reflections</artifactId>
- <exclusions>
- <exclusion>
- <!--
- part of JDK 6+
- the version here does not provide getUserData(), setUserData(),
- as needed by xmlsnapshot functionality in isis-core-runtime.
- -->
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>org.reflections</groupId>
+ <artifactId>reflections</artifactId>
+ <exclusions>
+ <exclusion>
+ <!--
+ part of JDK 6+
+ the version here does not provide getUserData(), setUserData(),
+ as needed by xmlsnapshot functionality in isis-core-runtime.
+ -->
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- </dependencies>
+ </dependencies>
</project>
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index e3f3626..6c0910b 100644
--- a/core/viewer-restfulobjects-applib/pom.xml
+++ b/core/viewer-restfulobjects-applib/pom.xml
@@ -18,12 +18,12 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
@@ -35,32 +35,21 @@
</properties>
<dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
<dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
- <scope>test</scope>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
@@ -87,19 +76,32 @@
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
+ <artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
</dependency>
- </dependencies>
+ <!-- TEST DEPENDENCIES -->
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-metamodel</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-unittestsupport</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
<repositories>
<!-- The artifact in the maven repository has been moved and causes a build failure. Using this setting gets the artifact allowing the build to work. This fix should hopefully be temporary -->
diff --git a/core/viewer-restfulobjects-rendering/pom.xml b/core/viewer-restfulobjects-rendering/pom.xml
index 2e87f2d..3550092 100644
--- a/core/viewer-restfulobjects-rendering/pom.xml
+++ b/core/viewer-restfulobjects-rendering/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
@@ -37,12 +37,6 @@
<dependencies>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxb-provider</artifactId>
@@ -52,10 +46,10 @@
<artifactId>resteasy-jackson-provider</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-metamodel</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
@@ -64,6 +58,13 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
</dependency>
+
+ <!-- TEST DEPENDENCIES -->
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-unittestsupport</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index d4cedcb..39820cd 100644
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
@@ -37,17 +37,16 @@
<dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>webjars-servlet-2.x</artifactId>
+ </dependency>
<!-- the javax:* equivalents of these are excluded in
dependencyManagement of resteasy-jaxrs, so
@@ -66,9 +65,12 @@
<artifactId>geronimo-activation_1.1_spec</artifactId>
</dependency>
+
+ <!-- TEST DEPENDENCIES -->
<dependency>
- <groupId>org.webjars</groupId>
- <artifactId>webjars-servlet-2.x</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-unittestsupport</artifactId>
+ <scope>test</scope>
</dependency>
- </dependencies>
+ </dependencies>
</project>
diff --git a/core/viewer-wicket-applib/pom.xml b/core/viewer-wicket-applib/pom.xml
index 94cbfd1..9733614 100644
--- a/core/viewer-wicket-applib/pom.xml
+++ b/core/viewer-wicket-applib/pom.xml
@@ -19,69 +19,69 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <parent>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
+ <version>${revision}</version>
</parent>
- <artifactId>isis-core-viewer-wicket-applib</artifactId>
- <name>Apache Isis Wicket Viewer Applib</name>
+ <artifactId>isis-core-viewer-wicket-applib</artifactId>
+ <name>Apache Isis Wicket Viewer Applib</name>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.viewer.wicket.applib</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/viewer/wicket/applib</git-plugin.propertiesDir>
- </properties>
+ <properties>
+ <jar-plugin.automaticModuleName>org.apache.isis.viewer.wicket.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/viewer/wicket/applib</git-plugin.propertiesDir>
+ </properties>
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </build>
- <dependencies>
+ <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-applib</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-applib</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-unittestsupport</artifactId>
+ <scope>test</scope>
+ </dependency>
- <!-- LOGGING DEPENDENCIES - LOG4J -->
+ <!-- LOGGING DEPENDENCIES - LOG4J -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
- </dependencies>
+ </dependencies>
</project>
diff --git a/core/viewer-wicket-impl/pom.xml b/core/viewer-wicket-impl/pom.xml
index 2a81f03..bd754fa 100644
--- a/core/viewer-wicket-impl/pom.xml
+++ b/core/viewer-wicket-impl/pom.xml
@@ -19,85 +19,86 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
+ <version>${revision}</version>
+ </parent>
- <name>Apache Isis Wicket Viewer Implementation</name>
+ <name>Apache Isis Wicket Viewer Implementation</name>
- <artifactId>isis-core-viewer-wicket-impl</artifactId>
+ <artifactId>isis-core-viewer-wicket-impl</artifactId>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.viewer.wicket.impl</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/viewer/wicket/impl</git-plugin.propertiesDir>
- </properties>
+ <properties>
+ <jar-plugin.automaticModuleName>org.apache.isis.viewer.wicket.impl</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/viewer/wicket/impl</git-plugin.propertiesDir>
+ </properties>
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-viewer-wicket-ui</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-viewer-wicket-ui</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-runtime</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-auth-roles</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-auth-roles</artifactId>
+ </dependency>
<dependency>
+ <groupId>de.agilecoders.wicket</groupId>
+ <artifactId>wicket-bootstrap-core</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>net.ftlines.wicket-source</groupId>
<artifactId>wicket-source</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice-parent</artifactId>
- <version>${guice.version}</version>
- <type>pom</type>
- </dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice-parent</artifactId>
+ <version>${guice.version}</version>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>de.agilecoders.wicket</groupId>
- <artifactId>wicket-bootstrap-core</artifactId>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-unittestsupport</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/core/viewer-wicket-model/pom.xml b/core/viewer-wicket-model/pom.xml
index b9fd8dc..eaa291c 100644
--- a/core/viewer-wicket-model/pom.xml
+++ b/core/viewer-wicket-model/pom.xml
@@ -19,55 +19,53 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
+ <version>${revision}</version>
+ </parent>
- <artifactId>isis-core-viewer-wicket-model</artifactId>
- <name>Apache Isis Wicket Viewer Model</name>
+ <artifactId>isis-core-viewer-wicket-model</artifactId>
+ <name>Apache Isis Wicket Viewer Model</name>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.viewer.wicket.model</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/viewer/wicket/model</git-plugin.propertiesDir>
- </properties>
+ <properties>
+ <jar-plugin.automaticModuleName>org.apache.isis.viewer.wicket.model</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/viewer/wicket/model</git-plugin.propertiesDir>
+ </properties>
- <dependencies>
+ <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-viewer-wicket-applib</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-extensions</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-viewer-wicket-applib</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-extensions</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-runtime</artifactId>
+ </dependency>
+
+ <!-- TEST DEPENDENCIES -->
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-unittestsupport</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-metamodel</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/core/viewer-wicket-ui/pom.xml b/core/viewer-wicket-ui/pom.xml
index 4a2b89e..bc4d0fd 100644
--- a/core/viewer-wicket-ui/pom.xml
+++ b/core/viewer-wicket-ui/pom.xml
@@ -17,94 +17,90 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
- </parent>
-
- <artifactId>isis-core-viewer-wicket-ui</artifactId>
- <name>Apache Isis Wicket Viewer UI Components</name>
-
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.viewer.wicket.ui</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/viewer/wicket/ui</git-plugin.propertiesDir>
- </properties>
-
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>yuicompressor-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-viewer-wicket-model</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-devutils</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-extensions</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-auth-roles</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-guice</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wicketstuff</groupId>
- <artifactId>wicketstuff-select2</artifactId>
- </dependency>
-
- <dependency>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
+ <version>${revision}</version>
+ </parent>
+
+ <artifactId>isis-core-viewer-wicket-ui</artifactId>
+ <name>Apache Isis Wicket Viewer UI Components</name>
+
+ <properties>
+ <jar-plugin.automaticModuleName>org.apache.isis.viewer.wicket.ui</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/viewer/wicket/ui</git-plugin.propertiesDir>
+ </properties>
+
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>yuicompressor-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-viewer-wicket-model</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-metamodel</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-devutils</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-extensions</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-auth-roles</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-guice</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-select2</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.webjars</groupId>
<artifactId>select2</artifactId>
</dependency>
@@ -143,14 +139,21 @@
<!-- LOGGING DEPENDENCIES - LOG4J -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <!-- TEST DEPENDENCIES -->
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-unittestsupport</artifactId>
+ <scope>test</scope>
+ </dependency>
- </dependencies>
+ </dependencies>
</project>
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index 2a4a720..d81a7c2 100644
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@ -17,41 +17,42 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
+ <version>${revision}</version>
</parent>
- <artifactId>isis-core-webserver</artifactId>
- <name>Apache Isis WebServer</name>
+ <artifactId>isis-core-webserver</artifactId>
+ <name>Apache Isis WebServer</name>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.core.webserver</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/core/webserver</git-plugin.propertiesDir>
- </properties>
+ <properties>
+ <jar-plugin.automaticModuleName>org.apache.isis.core.webserver</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/core/webserver</git-plugin.propertiesDir>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-runtime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
<scope>provided</scope>
- </dependency>
- </dependencies>
+ </dependency>
+ </dependencies>
</project>
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index 4603bc4..c9a18c7 100644
--- a/core/wrapper/pom.xml
+++ b/core/wrapper/pom.xml
@@ -1,4 +1,3 @@
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,18 +16,19 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.3-SNAPSHOT</version>
- </parent>
+ <version>${revision}</version>
+ </parent>
- <artifactId>isis-core-wrapper</artifactId>
+ <artifactId>isis-core-wrapper</artifactId>
- <name>Apache Isis Wrapper Service</name>
+ <name>Apache Isis Wrapper Service</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.core.wrapper</jar-plugin.automaticModuleName>
@@ -37,38 +37,38 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-runtime</artifactId>
</dependency>
+
+
+ <!-- TEST DEPENDENCIES -->
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
-
<dependency>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-runtime</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
-
<dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-unittestsupport</artifactId>
+ <scope>test</scope>
</dependency>
-
- </dependencies>
-
+ </dependencies>
</project>
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index 087fae9..853ea99 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -24,19 +24,20 @@
<parent>
<groupId>org.incode</groupId>
<artifactId>incode-build</artifactId>
- <version>2</version>
+ <version>2.4</version>
</parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>helloworld</artifactId>
- <version>1.16.3-SNAPSHOT</version>
+ <version>${revision}</version>
<name>HelloWorld</name>
<packaging>war</packaging>
<properties>
- <isis.version>1.16.3-SNAPSHOT</isis.version>
+ <revision>1.16.3-SNAPSHOT</revision>
+ <isis.version>${revision}</isis.version>
<compiler-plugin.source>1.8</compiler-plugin.source>
<compiler-plugin.target>1.8</compiler-plugin.target>
@@ -88,6 +89,34 @@
</mixins>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <updatePomFile>true</updatePomFile>
+ <pomElements>
+ <dependencyManagement>resolve</dependencyManagement>
+ <dependencies>resolve</dependencies>
+ </pomElements>
+ </configuration>
+ <executions>
+ <execution>
+ <id>flatten</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>flatten.clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -155,16 +184,26 @@
</dependencyManagement>
<dependencies>
+
+ <!-- ISIS API -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
</dependency>
<dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-webapp</artifactId>
<type>pom</type>
</dependency>
+
+
+ <!-- TEST DEPENDENCIES -->
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-testing</artifactId>
@@ -172,11 +211,6 @@
<type>pom</type>
</dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </dependency>
-
</dependencies>
<profiles>
@@ -189,18 +223,18 @@
</activation>
<build>
<directory>target-ide</directory>
- <plugins>
- <!-- eclipse doesn't seem to support maven mixins config, so repeat here -->
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${compiler-plugin.source}</source>
- <target>${compiler-plugin.target}</target>
- <compilerArgument />
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <plugins>
+ <!-- eclipse doesn't seem to support maven mixins config, so repeat here -->
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>${compiler-plugin.source}</source>
+ <target>${compiler-plugin.target}</target>
+ <compilerArgument/>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
diff --git a/example/application/simpleapp/module-simple/pom.xml b/example/application/simpleapp/module-simple/pom.xml
index a1bac12..87e9c35 100644
--- a/example/application/simpleapp/module-simple/pom.xml
+++ b/example/application/simpleapp/module-simple/pom.xml
@@ -138,17 +138,22 @@
</build>
<dependencies>
+
+
+ <!-- ISIS API -->
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
</dependency>
-
<dependency>
<groupId>org.axonframework</groupId>
<artifactId>axon-core</artifactId>
</dependency>
- <!-- test -->
+
+ <!-- TESTS -->
+
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-testing</artifactId>
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index fc54732..7ec10e8 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -38,7 +38,7 @@
<properties>
<revision>1.16.3-SNAPSHOT</revision>
- <isis.version>1.16.2</isis.version>
+ <isis.version>${revision}</isis.version>
<lombok.version>1.16.20</lombok.version>
@@ -72,6 +72,10 @@
<version>1.0.0</version>
<configuration>
<updatePomFile>true</updatePomFile>
+ <pomElements>
+ <dependencyManagement>resolve</dependencyManagement>
+ <dependencies>resolve</dependencies>
+ </pomElements>
</configuration>
<executions>
<execution>
@@ -106,23 +110,23 @@
<!-- this project's own modules -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp-module-simple</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp-module-simple</artifactId>
<version>${revision}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp-application</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp-webapp</artifactId>
<version>${revision}</version>
</dependency>
diff --git a/pom.xml b/pom.xml
index 113342b..eae120a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,9 +32,9 @@
</description>
<scm>
- <connection>scm:git:http://git.apache.org/isis.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/isis.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf?p=isis.git</url>
+ <connection>scm:git:https://github.com/apache/isis.git</connection>
+ <developerConnection>scm:git:https://github.com/apache/isis.git</developerConnection>
+ <url>https://github.com/apache/isis.git</url>
<tag>HEAD</tag>
</scm>
@@ -69,7 +69,7 @@
<id>arch</id>
<activation>
<property>
- <name>!skip.arch</name>
+ <name>arch</name>
</property>
</activation>
<modules>