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/03/15 12:56:51 UTC
[isis] 01/05: Merge branch 'maint-1.16.2'
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 d3c7bf86604e003e192f788cf43b06fba9a0baa3
Merge: 345e2c7 529112d
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Mar 15 12:13:06 2018 +0000
Merge branch 'maint-1.16.2'
# Conflicts:
# core/applib/pom.xml
# core/integtestsupport/pom.xml
# core/log4j/pom.xml
# core/maven-plugin/pom.xml
# core/mavendeps/intellij/pom.xml
# core/mavendeps/testing/pom.xml
# core/mavendeps/webapp/pom.xml
# core/metamodel/pom.xml
# core/pom.xml
# core/runtime/pom.xml
# core/schema/pom.xml
# core/security-shiro/pom.xml
# core/security/pom.xml
# core/specsupport/pom.xml
# core/unittestsupport/pom.xml
# core/viewer-restfulobjects-applib/pom.xml
# core/viewer-restfulobjects-rendering/pom.xml
# core/viewer-restfulobjects-server/pom.xml
# core/viewer-wicket-applib/pom.xml
# core/viewer-wicket-impl/pom.xml
# core/viewer-wicket-model/pom.xml
# core/viewer-wicket-ui/pom.xml
# core/webserver/pom.xml
# core/wrapper/pom.xml
# example/application/helloworld/pom.xml
# example/application/simpleapp/module-simple/pom.xml
# example/application/simpleapp/pom.xml
# example/application/simpleapp/webapp/pom.xml
..._ugfun_getting-started_simpleapp-archetype.adoc | 69 +-
.../images/getting-started/dockerhub-tags.png | Bin 0 -> 52693 bytes
.../guides/ugvro/_ugvro_layout-resources.adoc | 27 +-
core/pom.xml | 9 +
.../isis/viewer/restfulobjects/applib/Rel.java | 1 +
.../restfulobjects/applib/RepresentationType.java | 4 +
.../restfulobjects/applib/RestfulMediaType.java | 2 +
.../applib/domainobjects/DomainObjectResource.java | 17 +
.../domainobjects/DomainObjectReprRenderer.java | 18 +-
.../server/RestfulObjectsApplication.java | 2 +
.../resources/DomainObjectResourceServerside.java | 82 +++
.../server/resources/ImageResourceServerside.java | 50 ++
example/application/helloworld/pom.xml | 1 +
example/application/simpleapp/.gitignore | 2 +
example/application/simpleapp/.gitlab-ci.yml | 52 ++
example/application/simpleapp/.m2/settings.xml | 15 +
.../application/simpleapp/module-simple/pom.xml | 75 +-
example/application/simpleapp/pom.xml | 115 ++-
example/application/simpleapp/webapp/pom.xml | 134 ++--
example/archetype/simpleapp/pom.xml | 13 +-
.../META-INF/maven/archetype-metadata.xml | 7 +
.../resources/archetype-resources/.gitattributes | 51 --
.../main/resources/archetype-resources/.gitignore | 41 --
.../resources/archetype-resources/.gitlab-ci.yml | 49 ++
.../resources/archetype-resources/.m2/settings.xml | 18 +
.../archetype-resources/application/.gitignore | 1 -
.../application/translations.pot | 790 +++++++++++++++++++++
.../archetype-resources/module-simple/.gitignore | 6 -
.../archetype-resources/module-simple/pom.xml | 1 -
.../module-simple/translations.pot | 780 ++++++++++++++++++++
.../src/main/resources/archetype-resources/pom.xml | 100 ++-
.../archetype-resources/webapp/lib/.gitignore | 5 -
.../resources/archetype-resources/webapp/pom.xml | 112 +--
.../webapp/src/main/resources/docker/Dockerfile | 4 +
.../resources/projects/basic/archetype.properties | 2 +-
recreate_archetype_RELEASE.sh | 11 +-
recreate_archetype_SNAPSHOT.sh | 14 +-
scripts/recreate-archetype.sh | 7 +-
38 files changed, 2219 insertions(+), 468 deletions(-)
diff --cc core/pom.xml
index 81aacfc,0d1caa7..3c741d1
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -867,8 -848,16 +867,17 @@@
<Automatic-Module-Name>${jar-plugin.automaticModuleName}</Automatic-Module-Name>
<Implementation-Vendor-Id>org.apache.isis</Implementation-Vendor-Id>
<Implementation-Vendor>Apache Isis™ Project</Implementation-Vendor>
+ <Bundle-SymbolicName>${jar-plugin.automaticModuleName}</Bundle-SymbolicName>
<SCM-Revision>${git.commit.id.abbrev}</SCM-Revision>
+ <!-- required for DN plugin.xml loading -->
+ <Bundle-SymbolicName>${jar-plugin.automaticModuleName}</Bundle-SymbolicName>
+ <!--
+ no requirement as of yet.
+ <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+ <Bundle-Name>${jar-plugin.automaticModuleName}</Bundle-Name>
+ <Bundle-Version>${revision}</Bundle-Version>
+ <Bundle-Vendor>Apache Isis™ Project</Bundle-Vendor>
+ -->
</manifestEntries>
</archive>
</configuration>
diff --cc example/application/helloworld/pom.xml
index 01ff078,087fae9..a8ead94
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@@ -36,7 -36,7 +36,8 @@@
<packaging>war</packaging>
<properties>
- <isis.version>1.16.3-SNAPSHOT</isis.version>
+ <revision>2.0.0-M1-SNAPSHOT</revision>
++ <isis.version>2.0.0-M1-SNAPSHOT</isis.version>
<compiler-plugin.source>1.8</compiler-plugin.source>
<compiler-plugin.target>1.8</compiler-plugin.target>
diff --cc example/application/simpleapp/module-simple/pom.xml
index 81d22c2,a1bac12..48c5bca
--- a/example/application/simpleapp/module-simple/pom.xml
+++ b/example/application/simpleapp/module-simple/pom.xml
@@@ -145,35 -142,13 +145,31 @@@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
</dependency>
-
+
+ <!-- ISIS CORE PLUGINS -->
+
<dependency>
- <groupId>org.axonframework</groupId>
- <artifactId>axon-core</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-discovery-reflections</artifactId>
- <version>${revision}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-jdo-datanucleus-5</artifactId>
- <version>${revision}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-eventbus-guava</artifactId>
- <version>${revision}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-jaxrs-resteasy-3</artifactId>
- <version>${revision}</version>
</dependency>
- <!-- test -->
+ <!-- TESTS -->
+
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-testing</artifactId>
@@@ -181,72 -156,17 +177,11 @@@
<scope>test</scope>
</dependency>
+ <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-core</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
- <profiles>
- <profile>
- <!--
- specifying -Drevision means that scope=pom dependencies are not resolved.
- This is a workaround for that issue
- -->
- <id>revision</id>
- <activation>
- <property>
- <name>revision</name>
- </property>
- </activation>
- <properties>
- <hamcrest.version>1.3</hamcrest.version>
- <assertj.version>3.6.2</assertj.version>
- <objenesis.version>2.4</objenesis.version>
- <hsqldb.version>2.3.4</hsqldb.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <version>${revision}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-integtestsupport</artifactId>
- <version>${revision}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-specsupport</artifactId>
- <version>${revision}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
- <version>${objenesis.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <version>${hamcrest.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>${assertj.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>${hsqldb.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
</project>
diff --cc example/application/simpleapp/pom.xml
index 07fa027,fc54732..d58f4e2
--- 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>4</version>
- <version>2.4</version>
++ <version>6</version>
</parent>
<groupId>org.apache.isis.example.application</groupId>
@@@ -36,8 -36,9 +36,8 @@@
<packaging>pom</packaging>
<properties>
- <revision>1.16.3-SNAPSHOT</revision>
-
- <isis.version>1.16.2</isis.version>
+ <revision>2.0.0-M1-SNAPSHOT</revision>
- <isis.version>${revision}</isis.version>
++ <isis.version>2.0.0-M1-SNAPSHOT</isis.version>
<lombok.version>1.16.20</lombok.version>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.