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/07 17:06:48 UTC
[isis] branch master updated (c873e03 -> 7cd9b4a)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from c873e03 Merge branch 'master' of https://github.com/apache/isis
add 77a2c76 ISIS-1899: adds current-event to home page
add 28f7f59 ISIS-1916: minor doc updates
add 56ed13e ISIS-1916: adds missing annotation for HelloWorldObjects archetype
add a77b2ae ISIS-1965: uses , adds .gitlab-ci.yml
add 210fd1e ISIS-1965: fixes invalid .gitlab-ci.yml
add f4825d6 ISIS-1965: fixes for simpleapp Docker image build
add a0857dc ISIS-1965: updates apps to use repo.incode.cloud rather than cloudbees
add 8f0c53a ISIS-1965: bumps to 2.5 of incode-build
new 7cd9b4a Merges in changes from maint-1.16.2, bumps dependency on incode-build to v7.
The 1 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:
.../rgcms/_rgcms_methods_reserved_title.adoc | 2 +-
.../ugvw/_ugvw_features_titles-in-tables.adoc | 2 +-
adocs/documentation/src/main/asciidoc/index.html | 9 ++--
adocs/template/document.html.erb | 2 +-
core/pom.xml | 46 ++++++++++++-----
core/unittestsupport/pom.xml | 1 -
core/viewer-restfulobjects-server/pom.xml | 2 -
core/viewer-wicket-impl/pom.xml | 1 +
core/viewer-wicket-ui/pom.xml | 16 +++---
core/webserver/pom.xml | 13 ++---
example/application/helloworld/pom.xml | 60 +++-------------------
example/application/simpleapp/application/pom.xml | 2 +-
.../application/simpleapp/module-simple/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 18 +++----
example/application/simpleapp/webapp/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
16 files changed, 77 insertions(+), 103 deletions(-)
[isis] 01/01: Merges in changes from maint-1.16.2,
bumps dependency on incode-build to v7.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 7cd9b4a830384788071260979716a7ef23a134cd
Merge: c873e03 8f0c53a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jul 7 18:03:04 2018 +0100
Merges in changes from maint-1.16.2, bumps dependency on incode-build to v7.
.../rgcms/_rgcms_methods_reserved_title.adoc | 2 +-
.../ugvw/_ugvw_features_titles-in-tables.adoc | 2 +-
adocs/documentation/src/main/asciidoc/index.html | 9 ++--
adocs/template/document.html.erb | 2 +-
core/pom.xml | 46 ++++++++++++-----
core/unittestsupport/pom.xml | 1 -
core/viewer-restfulobjects-server/pom.xml | 2 -
core/viewer-wicket-impl/pom.xml | 1 +
core/viewer-wicket-ui/pom.xml | 16 +++---
core/webserver/pom.xml | 13 ++---
example/application/helloworld/pom.xml | 60 +++-------------------
example/application/simpleapp/application/pom.xml | 2 +-
.../application/simpleapp/module-simple/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 18 +++----
example/application/simpleapp/webapp/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
16 files changed, 77 insertions(+), 103 deletions(-)
diff --cc core/pom.xml
index 6d778f4,5b1e55e..8b11db8
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -2101,8 -1990,53 +2101,7 @@@ ${license.additional-notes
<scope>test</scope>
</dependency>
- <!-- Specs -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.1_spec</artifactId>
- <version>${geronimo-jsp_2.1_spec.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>${geronimo-jta_1.1_spec.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <version>${geronimo-jta_1.0.1B_spec.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <version>${geronimo-servlet_3.0_spec.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>${geronimo-annotation_1.0_spec.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>${geronimo-activation_1.1_spec.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- <version>${geronimo-javamail_1.4_spec.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>${geronimo-atinject_1.0_spec.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>${geronimo-jcdi_1.0_spec.version}</version>
- </dependency>
-
<!-- JAX-RS API -->
<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
@@@ -2298,17 -2248,36 +2296,38 @@@
</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
+
++ <profile>
++
+ <!--
+ 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 NEXUS_REPO_URL=...
+
+ 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>
@@@ -2340,6 -2309,6 +2359,7 @@@
</repository>
</distributionManagement>
</profile>
++
<profile>
<id>owasp</id>
<activation>
diff --cc core/unittestsupport/pom.xml
index 9778591,06b3a3f..e33ddaf
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@@ -91,10 -63,36 +91,9 @@@
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
<version>${jdo-api.version}</version>
- <optional>true</optional>
+ <!-- provided by plugins -->
+ <scope>provided</scope>
</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.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>
</project>
diff --cc core/viewer-restfulobjects-server/pom.xml
index a4baeb4,39820cd..4b03d86
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@@ -47,18 -48,21 +47,17 @@@
<artifactId>webjars-servlet-2.x</artifactId>
</dependency>
- <!-- the javax:* equivalents of these are excluded in
- dependencyManagement of resteasy-jaxrs, so
- are required here -->
+ <!-- JDO API (non transient, provided by plugin) -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
- <!-- provided by plugins -->
<scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
</dependency>
diff --cc core/viewer-wicket-ui/pom.xml
index 656e6a9,bc4d0fd..5802952
--- a/core/viewer-wicket-ui/pom.xml
+++ b/core/viewer-wicket-ui/pom.xml
@@@ -131,12 -131,11 +131,14 @@@
<artifactId>wicket-bootstrap-themes</artifactId>
</dependency>
- <dependency>
+<!-- replaced by javaee-api -->
- <!-- <dependency> -->
- <!-- <groupId>org.apache.geronimo.specs</groupId> -->
- <!-- <artifactId>geronimo-servlet_3.0_spec</artifactId> -->
- <!-- <scope>provided</scope> -->
- <!-- </dependency> -->
++<!--
++ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
++-->
<!-- LOGGING DEPENDENCIES - LOG4J -->
@@@ -148,18 -147,8 +150,16 @@@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
-
+
+ <!-- JDO API (non transient, provided by plugin) -->
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
- <!-- provided by plugins -->
+ <scope>provided</scope>
+ </dependency>
-- <!-- TEST DEPENDENCIES -->
++ <!-- TEST DEPENDENCIES -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
diff --cc core/webserver/pom.xml
index 01e965a,d81a7c2..7da4c3d
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@@ -48,14 -48,11 +48,15 @@@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
</dependency>
+
+<!-- provided by JEE standard API -->
- <!-- <dependency> -->
- <!-- <groupId>org.apache.geronimo.specs</groupId> -->
- <!-- <artifactId>geronimo-servlet_3.0_spec</artifactId> -->
- <!-- <scope>provided</scope> -->
- <!-- </dependency> -->
-
++<!--
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
++-->
</dependencies>
</project>
diff --cc example/application/helloworld/pom.xml
index 8928051,18fdd10..8f2c701
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.incode</groupId>
<artifactId>incode-build</artifactId>
- <version>6</version>
- <version>2.5</version>
++ <version>7</version>
</parent>
<groupId>org.apache.isis.example.application</groupId>
@@@ -193,40 -139,13 +142,45 @@@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
</dependency>
+
+
+ <!-- ISIS CORE PLUGINS -->
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-codegen-bytebuddy</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-discovery-reflections</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-jdo-datanucleus-5</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-eventbus-guava</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-jaxrs-resteasy-3</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</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>
diff --cc example/application/simpleapp/pom.xml
index 6265008,ab744db..bcca60b
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.incode</groupId>
<artifactId>incode-build</artifactId>
- <version>6</version>
- <version>2.5</version>
++ <version>7</version>
</parent>
<groupId>org.apache.isis.example.application</groupId>
@@@ -36,10 -36,11 +36,10 @@@
<packaging>pom</packaging>
<properties>
- <revision>1.16.3-SNAPSHOT</revision>
-
+ <revision>2.0.0-M1-SNAPSHOT</revision>
<isis.version>${revision}</isis.version>
- <lombok.version>[1.16,)</lombok.version>
- <lombok.version>1.18.0</lombok.version>
++ <lombok.version>[1.18,)</lombok.version>
<compiler-plugin.source>1.8</compiler-plugin.source>
<compiler-plugin.target>1.8</compiler-plugin.target>