isis git commit: Changed all occurrences of allowNulls and allowsNulls in the docs to allowsNull
Repository: isis
Updated Branches:
refs/heads/maint-1.13.1 8f943fd4c -> 0a1a96820
Changed all occurrences of allowNulls and allowsNulls in the docs to allowsNull
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0a1a9682
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0a1a9682
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0a1a9682
Branch: refs/heads/maint-1.13.1
Commit: 0a1a96820eb0a4aac021d08fcbbc7e76a465172f
Parents: 8f943fd
Author: Rosco Kalis
Authored: Tue Sep 13 13:39:39 2016 +0200
Committer: Dan Haywood
Committed: Fri Sep 16 14:14:39 2016 +0100
--
.../src/main/asciidoc/_release-notes_1.3.0.adoc | 2 +-
.../src/main/asciidoc/guides/_rgant-Column.adoc | 4 ++--
.../src/main/asciidoc/guides/_rgant-Property.adoc | 4 ++--
.../asciidoc/guides/_rgant-Property_optionality.adoc| 12 ++--
.../guides/_ugfun_core-concepts_building-blocks.adoc| 2 +-
.../_ugfun_how-tos_class-structure_properties.adoc | 8
6 files changed, 16 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/0a1a9682/adocs/documentation/src/main/asciidoc/_release-notes_1.3.0.adoc
--
diff --git a/adocs/documentation/src/main/asciidoc/_release-notes_1.3.0.adoc
b/adocs/documentation/src/main/asciidoc/_release-notes_1.3.0.adoc
index be4e631..c3fc460 100644
--- a/adocs/documentation/src/main/asciidoc/_release-notes_1.3.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/_release-notes_1.3.0.adoc
@@ -213,7 +213,7 @@
* link:https://issues.apache.org/jira/browse/ISIS-427[ISIS-427] - specific),
with JDO implementation.
* link:https://issues.apache.org/jira/browse/ISIS-450[ISIS-450] - session
interaction between entities.
* link:https://issues.apache.org/jira/browse/ISIS-459[ISIS-459] - Enhance
IsisJdoSupport service to support integration testing (execute arbitrary SQL,
delete all instances of an entity)
-* link:https://issues.apache.org/jira/browse/ISIS-488[ISIS-488] - Derive
Apache Isis' MandatoryFacet from JDO @Column(allowNulls=) annotation, and
provide @Mandatory annotation as override
+* link:https://issues.apache.org/jira/browse/ISIS-488[ISIS-488] - Derive
Apache Isis' MandatoryFacet from JDO @Column(allowsNull=) annotation, and
provide @Mandatory annotation as override
* link:https://issues.apache.org/jira/browse/ISIS-553[ISIS-553] - Provide view
model support, as sketched out in the Restful Objects spec
http://git-wip-us.apache.org/repos/asf/isis/blob/0a1a9682/adocs/documentation/src/main/asciidoc/guides/_rgant-Column.adoc
--
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-Column.adoc
b/adocs/documentation/src/main/asciidoc/guides/_rgant-Column.adoc
index 97a1b12..f782a44 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-Column.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-Column.adoc
@@ -29,7 +29,7 @@ For example:
[source,java]
public class Customer {
-@javax.jdo.annotations.Column(allowNulls="true")
+@javax.jdo.annotations.Column(allowsNull="true")
public String getMiddleInitial() { ... }
public void setMiddleInitial(String middleInitial) { ... }
@@ -54,7 +54,7 @@ public class Customer {
@javax.jdo.annotations.Column(length=20)
public String getFirstName() { ... }
public void setFirstName(String firstName) { ... }
-@javax.jdo.annotations.Column(allowNulls="true", length=1)
+@javax.jdo.annotations.Column(allowsNull="true", length=1)
public String getMiddleInitial() { ... }
public void setMiddleInitial(String middleInitial) { ... }
@javax.jdo.annotations.Column(length=30)
http://git-wip-us.apache.org/repos/asf/isis/blob/0a1a9682/adocs/documentation/src/main/asciidoc/guides/_rgant-Property.adoc
--
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-Property.adoc
b/adocs/documentation/src/main/asciidoc/guides/_rgant-Property.adoc
index 9d27376..774741b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-Property.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-Property.adoc
@@ -73,7 +73,7 @@ Property must also be annotated with
`@javax.jdo.annotations.NotPersistent` in o
|
|specifies a property is optional rather than mandatory +
-In many/most cases you should however use
xref:rgant.adoc#_rgant-Column[`@Column#allowNulls()`]
+In many/most cases you should however use
xref:rgant.adoc#_rgant-Column[`@Column#allowsNull()`]
@@ -102,7 +102,7 @@ public class Customer {
return EmailUtil.ensureValidEmail(proposed);// <1>
}
[1/3] isis git commit: Changed all occurrences of allowNulls and allowsNulls in the docs to allowsNull
Repository: isis
Updated Branches:
refs/heads/master fe5a295a0 -> 469751d9c
Changed all occurrences of allowNulls and allowsNulls in the docs to allowsNull
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2ab1ac19
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2ab1ac19
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2ab1ac19
Branch: refs/heads/master
Commit: 2ab1ac19a071d4ff45dadba5590db2cc82705084
Parents: 67f6621
Author: Rosco Kalis
Authored: Tue Sep 13 13:39:39 2016 +0200
Committer: Rosco Kalis
Committed: Tue Sep 13 13:39:39 2016 +0200
--
.../src/main/asciidoc/_release-notes_1.3.0.adoc | 2 +-
.../src/main/asciidoc/guides/_rgant-Column.adoc | 4 ++--
.../src/main/asciidoc/guides/_rgant-Property.adoc | 4 ++--
.../asciidoc/guides/_rgant-Property_optionality.adoc| 12 ++--
.../guides/_ugfun_core-concepts_building-blocks.adoc| 2 +-
.../_ugfun_how-tos_class-structure_properties.adoc | 8
6 files changed, 16 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/2ab1ac19/adocs/documentation/src/main/asciidoc/_release-notes_1.3.0.adoc
--
diff --git a/adocs/documentation/src/main/asciidoc/_release-notes_1.3.0.adoc
b/adocs/documentation/src/main/asciidoc/_release-notes_1.3.0.adoc
index be4e631..c3fc460 100644
--- a/adocs/documentation/src/main/asciidoc/_release-notes_1.3.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/_release-notes_1.3.0.adoc
@@ -213,7 +213,7 @@
* link:https://issues.apache.org/jira/browse/ISIS-427[ISIS-427] - specific),
with JDO implementation.
* link:https://issues.apache.org/jira/browse/ISIS-450[ISIS-450] - session
interaction between entities.
* link:https://issues.apache.org/jira/browse/ISIS-459[ISIS-459] - Enhance
IsisJdoSupport service to support integration testing (execute arbitrary SQL,
delete all instances of an entity)
-* link:https://issues.apache.org/jira/browse/ISIS-488[ISIS-488] - Derive
Apache Isis' MandatoryFacet from JDO @Column(allowNulls=) annotation, and
provide @Mandatory annotation as override
+* link:https://issues.apache.org/jira/browse/ISIS-488[ISIS-488] - Derive
Apache Isis' MandatoryFacet from JDO @Column(allowsNull=) annotation, and
provide @Mandatory annotation as override
* link:https://issues.apache.org/jira/browse/ISIS-553[ISIS-553] - Provide view
model support, as sketched out in the Restful Objects spec
http://git-wip-us.apache.org/repos/asf/isis/blob/2ab1ac19/adocs/documentation/src/main/asciidoc/guides/_rgant-Column.adoc
--
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-Column.adoc
b/adocs/documentation/src/main/asciidoc/guides/_rgant-Column.adoc
index 97a1b12..f782a44 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-Column.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-Column.adoc
@@ -29,7 +29,7 @@ For example:
[source,java]
public class Customer {
-@javax.jdo.annotations.Column(allowNulls="true")
+@javax.jdo.annotations.Column(allowsNull="true")
public String getMiddleInitial() { ... }
public void setMiddleInitial(String middleInitial) { ... }
@@ -54,7 +54,7 @@ public class Customer {
@javax.jdo.annotations.Column(length=20)
public String getFirstName() { ... }
public void setFirstName(String firstName) { ... }
-@javax.jdo.annotations.Column(allowNulls="true", length=1)
+@javax.jdo.annotations.Column(allowsNull="true", length=1)
public String getMiddleInitial() { ... }
public void setMiddleInitial(String middleInitial) { ... }
@javax.jdo.annotations.Column(length=30)
http://git-wip-us.apache.org/repos/asf/isis/blob/2ab1ac19/adocs/documentation/src/main/asciidoc/guides/_rgant-Property.adoc
--
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-Property.adoc
b/adocs/documentation/src/main/asciidoc/guides/_rgant-Property.adoc
index 9d27376..774741b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-Property.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-Property.adoc
@@ -73,7 +73,7 @@ Property must also be annotated with
`@javax.jdo.annotations.NotPersistent` in o
|
|specifies a property is optional rather than mandatory +
-In many/most cases you should however use
xref:rgant.adoc#_rgant-Column[`@Column#allowNulls()`]
+In many/most cases you should however use
xref:rgant.adoc#_rgant-Column[`@Column#allowsNull()`]
@@ -102,7 +102,7 @@ public class Customer {
return EmailUtil.ensureValidEmail(proposed);// <1>
}
}
-@j
[3/3] isis git commit: ISIS-1491: Merge branch 'ISIS-1491_pr-51'
ISIS-1491: Merge branch 'ISIS-1491_pr-51' Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/469751d9 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/469751d9 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/469751d9 Branch: refs/heads/master Commit: 469751d9cfcadde98732e9fb90682e3042652287 Parents: fe5a295 8b35114 Author: Dan Haywood Authored: Fri Sep 16 14:13:36 2016 +0100 Committer: Dan Haywood Committed: Fri Sep 16 14:13:36 2016 +0100 -- .../src/main/asciidoc/_release-notes_1.3.0.adoc | 2 +- .../src/main/asciidoc/guides/_rgant-Column.adoc | 4 ++-- .../src/main/asciidoc/guides/_rgant-Property.adoc | 4 ++-- .../asciidoc/guides/_rgant-Property_optionality.adoc| 12 ++-- .../guides/_ugfun_core-concepts_building-blocks.adoc| 2 +- .../_ugfun_how-tos_class-structure_properties.adoc | 8 6 files changed, 16 insertions(+), 16 deletions(-) --
[2/3] isis git commit: ISIS-1491: Merge branch 'master' of https://github.com/rkalis/isis into ISIS-1491_pr-51
ISIS-1491: Merge branch 'master' of https://github.com/rkalis/isis into ISIS-1491_pr-51 Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8b351144 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8b351144 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8b351144 Branch: refs/heads/master Commit: 8b3511449cea88817236e4f6c49f09a117b75c91 Parents: fe5a295 2ab1ac1 Author: Dan Haywood Authored: Fri Sep 16 14:05:44 2016 +0100 Committer: Dan Haywood Committed: Fri Sep 16 14:05:44 2016 +0100 -- .../src/main/asciidoc/_release-notes_1.3.0.adoc | 2 +- .../src/main/asciidoc/guides/_rgant-Column.adoc | 4 ++-- .../src/main/asciidoc/guides/_rgant-Property.adoc | 4 ++-- .../asciidoc/guides/_rgant-Property_optionality.adoc| 12 ++-- .../guides/_ugfun_core-concepts_building-blocks.adoc| 2 +- .../_ugfun_how-tos_class-structure_properties.adoc | 8 6 files changed, 16 insertions(+), 16 deletions(-) --
isis git commit: Fix 'svg' suffix in ImageResourceCacheClassPath
Repository: isis
Updated Branches:
refs/heads/maint-1.13.1 b6245475b -> 8f943fd4c
Fix 'svg' suffix in ImageResourceCacheClassPath
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8f943fd4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8f943fd4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8f943fd4
Branch: refs/heads/maint-1.13.1
Commit: 8f943fd4c5a8679abd2b961956405e13d5a9427c
Parents: b624547
Author: Andi Huber
Authored: Wed Aug 31 02:17:32 2016 +0200
Committer: Dan Haywood
Committed: Fri Sep 16 14:00:51 2016 +0100
--
.../wicket/viewer/imagecache/ImageResourceCacheClassPath.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/8f943fd4/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
--
diff --git
a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
index e6295d0..a8eb2d9 100644
---
a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
+++
b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
@@ -48,7 +48,7 @@ public class ImageResourceCacheClassPath implements
ImageResourceCache {
private static final long serialVersionUID = 1L;
-private static final List IMAGE_SUFFICES = Arrays.asList("png",
"gif", "jpeg", "jpg", ".svg");
+private static final List IMAGE_SUFFICES = Arrays.asList("png",
"gif", "jpeg", "jpg", "svg");
private static final String FALLBACK_IMAGE = "Default.png";
private final Map
resourceReferenceByKey = Maps.newConcurrentMap();
[3/3] isis git commit: ISIS-1490: Merge branch 'ISIS-1490_pr-50'
ISIS-1490: Merge branch 'ISIS-1490_pr-50' Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fe5a295a Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fe5a295a Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fe5a295a Branch: refs/heads/master Commit: fe5a295a0fc0550cb7e5b9570afa01a204b99d64 Parents: baaa853 222947e Author: Dan Haywood Authored: Fri Sep 16 13:29:41 2016 +0100 Committer: Dan Haywood Committed: Fri Sep 16 13:29:41 2016 +0100 -- .../wicket/viewer/imagecache/ImageResourceCacheClassPath.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/3] isis git commit: ISIS-1490: Merge branch 'patch-1' of https://github.com/hobrom/isis into ISIS-1490_pr-50
ISIS-1490: Merge branch 'patch-1' of https://github.com/hobrom/isis into ISIS-1490_pr-50 Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/222947e2 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/222947e2 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/222947e2 Branch: refs/heads/master Commit: 222947e2ae83a492157248be3bedf56992ec7603 Parents: baaa853 795805e Author: Dan Haywood Authored: Fri Sep 16 13:25:57 2016 +0100 Committer: Dan Haywood Committed: Fri Sep 16 13:25:57 2016 +0100 -- .../wicket/viewer/imagecache/ImageResourceCacheClassPath.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[1/3] isis git commit: Fix 'svg' suffix in ImageResourceCacheClassPath
Repository: isis
Updated Branches:
refs/heads/master baaa85394 -> fe5a295a0
Fix 'svg' suffix in ImageResourceCacheClassPath
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/795805ee
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/795805ee
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/795805ee
Branch: refs/heads/master
Commit: 795805ee8bbcac33de1ec1f1291ba5654da572d3
Parents: 37684f7
Author: Andi Huber
Authored: Wed Aug 31 02:17:32 2016 +0200
Committer: GitHub
Committed: Wed Aug 31 02:17:32 2016 +0200
--
.../wicket/viewer/imagecache/ImageResourceCacheClassPath.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/795805ee/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
--
diff --git
a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
index e6295d0..a8eb2d9 100644
---
a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
+++
b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
@@ -48,7 +48,7 @@ public class ImageResourceCacheClassPath implements
ImageResourceCache {
private static final long serialVersionUID = 1L;
-private static final List IMAGE_SUFFICES = Arrays.asList("png",
"gif", "jpeg", "jpg", ".svg");
+private static final List IMAGE_SUFFICES = Arrays.asList("png",
"gif", "jpeg", "jpg", "svg");
private static final String FALLBACK_IMAGE = "Default.png";
private final Map
resourceReferenceByKey = Maps.newConcurrentMap();
[2/8] isis git commit: ISIS-1465: updates .travis.yml to not build simpleapp or archetype
ISIS-1465: updates .travis.yml to not build simpleapp or archetype Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/43e1f91c Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/43e1f91c Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/43e1f91c Branch: refs/heads/master Commit: 43e1f91c2adb3bea9f0c859dea3656df7643491f Parents: c29f846 Author: Dan Haywood Authored: Thu Sep 8 08:03:00 2016 +0200 Committer: Dan Haywood Committed: Fri Sep 9 00:51:40 2016 +0200 -- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/43e1f91c/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index cd1b609..c44eb99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: java jdk: - oraclejdk8 -install: "mvn clean install -P released" +install: "mvn clean install -Dskip.app -Dskip.arch"
[7/8] isis git commit: ISIS-1465: adding docs for interim-release.sh and also bash_functions
ISIS-1465: adding docs for interim-release.sh and also bash_functions Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2caea6fe Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2caea6fe Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2caea6fe Branch: refs/heads/master Commit: 2caea6fe4ce7beba2f2c902adb8ae27571f7486f Parents: f2f7ced Author: Dan Haywood Authored: Fri Sep 9 11:17:20 2016 +0200 Committer: Dan Haywood Committed: Fri Sep 9 11:17:20 2016 +0200 -- .../src/main/asciidoc/downloads.adoc| 2 +- ...om_release-process-for-interim-releases.adoc | 80 ++ .../_cgcom_release-process-for-snapshots.adoc | 4 +- .../guides/_dg_working-with-many-repos.adoc | 110 +++ .../src/main/asciidoc/guides/cgcom.adoc | 1 + .../src/main/asciidoc/guides/dg.adoc| 1 + 6 files changed, 194 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/2caea6fe/adocs/documentation/src/main/asciidoc/downloads.adoc -- diff --git a/adocs/documentation/src/main/asciidoc/downloads.adoc b/adocs/documentation/src/main/asciidoc/downloads.adoc index 1757c00..8e1cb6e 100644 --- a/adocs/documentation/src/main/asciidoc/downloads.adoc +++ b/adocs/documentation/src/main/asciidoc/downloads.adoc @@ -75,7 +75,7 @@ Alternatively, you can verify the MD5 signature on the files. A Unix/Linux progr - +[[_downloads_source_code]] == Source Code You can also download the Apache Isis source code using: http://git-wip-us.apache.org/repos/asf/isis/blob/2caea6fe/adocs/documentation/src/main/asciidoc/guides/_cgcom_release-process-for-interim-releases.adoc -- diff --git a/adocs/documentation/src/main/asciidoc/guides/_cgcom_release-process-for-interim-releases.adoc b/adocs/documentation/src/main/asciidoc/guides/_cgcom_release-process-for-interim-releases.adoc new file mode 100644 index 000..401894d --- /dev/null +++ b/adocs/documentation/src/main/asciidoc/guides/_cgcom_release-process-for-interim-releases.adoc @@ -0,0 +1,80 @@ +[[_cgcom_release-process-for-interim-releases]] += Interim Releases +:notice: licensed to the apache software foundation (asf) under one or more contributor license agreements. see the notice file distributed with this work for additional information regarding copyright ownership. the asf licenses this file to you under the apache license, version 2.0 (the "license"); you may not use this file except in compliance with the license. you may obtain a copy of the license at. http://www.apache.org/licenses/license-2.0 . unless required by applicable law or agreed to in writing, software distributed under the license is distributed on an "as is" basis, without warranties or conditions of any kind, either express or implied. see the license for the specific language governing permissions and limitations under the license. +:_basedir: ../ +:_imagesdir: images/ +:toc: right + + +The intent of an "interim" release is to allow a developer team to release their application based on a `-SNAPSHOT` version of the framework. Since `-SNAPSHOT` changes on a day-to-day basis, the idea is to tag a particular revision and to release this, thereby providing stability/traceability for the application being developed. + +Whereas xref:cgcom.adoc#_cgcom_cutting-a-release.adoc[formal release]s and xref:cgcom.adoc#_cgcom_relesae-process-for-snapshots.adoc[snapshot release]s are public (released through the Maven repository maintained by Apache Software Foundation), interim releases are non-public and rely on infrastructure provided by a developer team. The tagged release resides _not_ in the link:../downloads.adoc#_downloads_source_code[official Apache Isis git repository], but instead in a fork/clone maintained by the developer team. + +[NOTE] + +The procedure developed here was put together for the team working on the link:../powered-by.adoc#_powered-by_estatio[Estatio app], which maintains its own link:https://github.com/incodehq/isis[fork on github] and uses link:https://www.cloudbees.com/[CloudBees] as a Jenkins build server/private Maven repo. + + + +== Prerequisites + +Create a remote fork/clone of the Apache Isis repository (eg using link:http://github.com[github] or link:http://bitbucket.org[bitbucket] or similar), and ensure that your local fork specifies this remote. + +Also, set up a CI server against your fork/clone, to build against any branches called `origin/interim/*`. To build it should use the command: + +[source,bash] + +mvn clean install -Dskip.app -Dskip.arch + + +that is, skipping the example simpleapp and archetype; only `
[4/8] isis git commit: ISIS-1465: another attempt at getting travis to build (no 'install' step)
ISIS-1465: another attempt at getting travis to build (no 'install' step) Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4f72edbd Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4f72edbd Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4f72edbd Branch: refs/heads/master Commit: 4f72edbde84643320c0ef514bac2a67f29ddb130 Parents: fac6e2e Author: Dan Haywood Authored: Thu Sep 8 23:38:14 2016 +0200 Committer: Dan Haywood Committed: Fri Sep 9 00:52:00 2016 +0200 -- .travis.yml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/isis/blob/4f72edbd/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index 2bb59e0..a3950e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: java jdk: - oraclejdk8 +install: script: "mvn clean install -Dskip.app -Dskip.arch"
[5/8] isis git commit: ISIS-1465: yet another attempt to fix .travis.yml
ISIS-1465: yet another attempt to fix .travis.yml Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/66f67c2e Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/66f67c2e Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/66f67c2e Branch: refs/heads/master Commit: 66f67c2ec18bd2a3c8ce9acb8768378ddd9242a4 Parents: 4f72edb Author: Dan Haywood Authored: Thu Sep 8 23:45:48 2016 +0200 Committer: Dan Haywood Committed: Fri Sep 9 00:52:19 2016 +0200 -- .travis.yml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/isis/blob/66f67c2e/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index a3950e8..ae5c5a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,5 @@ language: java jdk: - oraclejdk8 install: + - script: "mvn clean install -Dskip.app -Dskip.arch"
[3/8] isis git commit: ISIS-1465: for .travis.yml, use 'script' rather than 'install' to build the project (otherwise will run 'mvn test -B' at the end as the default script)
ISIS-1465: for .travis.yml, use 'script' rather than 'install' to build the project (otherwise will run 'mvn test -B' at the end as the default script) Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fac6e2e6 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fac6e2e6 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fac6e2e6 Branch: refs/heads/master Commit: fac6e2e681f1187c1377fd8b2e441b6f53c4859c Parents: 43e1f91 Author: Dan Haywood Authored: Thu Sep 8 23:28:30 2016 +0200 Committer: Dan Haywood Committed: Fri Sep 9 00:51:50 2016 +0200 -- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/fac6e2e6/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index c44eb99..2bb59e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: java jdk: - oraclejdk8 -install: "mvn clean install -Dskip.app -Dskip.arch" +script: "mvn clean install -Dskip.app -Dskip.arch"
[6/8] isis git commit: ISIS-1465: enhancing interim-release.sh to automatically cleanrremote branches and push new branch (and tag)
ISIS-1465: enhancing interim-release.sh to automatically cleanrremote branches and push new branch (and tag) Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f2f7cedc Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f2f7cedc Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f2f7cedc Branch: refs/heads/master Commit: f2f7cedca09ac0fef0aebafd1aa8aaa7684a3b47 Parents: 66f67c2 Author: Dan Haywood Authored: Fri Sep 9 00:15:31 2016 +0200 Committer: Dan Haywood Committed: Fri Sep 9 00:52:29 2016 +0200 -- interim-release.sh | 28 +--- 1 file changed, 25 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/f2f7cedc/interim-release.sh -- diff --git a/interim-release.sh b/interim-release.sh index ea2231b..34dacb8 100644 --- a/interim-release.sh +++ b/interim-release.sh @@ -1,8 +1,10 @@ +#!/bin/bash VERSION_BASE=$1 +REMOTE=$2 -if [ ! "$VERSION_BASE" ]; then -echo "usage: $(basename $0) [base version]" -echo " eg: $(basename $0) 1.13.0" +if [ -z "$VERSION_BASE" -o -z "$REMOTE" ]; then +echo "usage: $(basename $0) [base version] [remote]" +echo " eg: $(basename $0) 1.13.0 incodehq" exit 1 fi @@ -12,6 +14,13 @@ VERSION="$VERSION_BASE.$DATE" BRANCH="interim/$VERSION" TAG="isis-$VERSION" +echo "removing any earlier (local) 'interim' branches" +for a in `git branch --list | grep interim` +do +git branch -D $a +done + +echo "checking out new branch $BRANCH" git checkout -b "$BRANCH" echo "updating version in all pom.xml files..." @@ -24,3 +33,16 @@ git commit -am "bumping to $VERSION" echo "tagging" git tag $TAG + +echo "removing any earlier remote branches" +for a in `git ls-remote --heads $REMOTE | sed 's?.*refs/heads/??' | grep interim` +do +git push $REMOTE --delete $a +done + +echo "pushing tag" +git push $REMOTE $TAG + +echo "pushing branch" +git push $REMOTE $BRANCH +
[1/8] isis git commit: ISIS-1465: adding interim-release.sh
Repository: isis Updated Branches: refs/heads/master 67f66214c -> baaa85394 ISIS-1465: adding interim-release.sh Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c29f846a Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c29f846a Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c29f846a Branch: refs/heads/master Commit: c29f846acf3c146fb52b04079f2bec0fe8eeab75 Parents: 67f6621 Author: Dan Haywood Authored: Thu Sep 8 01:13:47 2016 +0200 Committer: Dan Haywood Committed: Fri Sep 9 00:51:25 2016 +0200 -- interim-release.sh | 26 ++ 1 file changed, 26 insertions(+) -- http://git-wip-us.apache.org/repos/asf/isis/blob/c29f846a/interim-release.sh -- diff --git a/interim-release.sh b/interim-release.sh new file mode 100644 index 000..ea2231b --- /dev/null +++ b/interim-release.sh @@ -0,0 +1,26 @@ +VERSION_BASE=$1 + +if [ ! "$VERSION_BASE" ]; then +echo "usage: $(basename $0) [base version]" +echo " eg: $(basename $0) 1.13.0" +exit 1 +fi + +DATE=`date +'%Y%m%d-%H%M'` + +VERSION="$VERSION_BASE.$DATE" +BRANCH="interim/$VERSION" +TAG="isis-$VERSION" + +git checkout -b "$BRANCH" + +echo "updating version in all pom.xml files..." +pushd core >/dev/null +mvn versions:set -DnewVersion=$VERSION > /dev/null +popd >/dev/null + +echo "Committing changes" +git commit -am "bumping to $VERSION" + +echo "tagging" +git tag $TAG
[8/8] isis git commit: ISIS-1465: fixes error in last commit on the simpleapp archetype
ISIS-1465: fixes error in last commit on the simpleapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/baaa8539
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/baaa8539
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/baaa8539
Branch: refs/heads/master
Commit: baaa8539435b4fdb86957c9789ad19e5f5487683
Parents: 2caea6f
Author: Dan Haywood
Authored: Fri Sep 16 13:09:27 2016 +0100
Committer: Dan Haywood
Committed: Fri Sep 16 13:23:06 2016 +0100
--
.../dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/baaa8539/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
--
diff --git
a/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
b/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
index 95f5da5..371bc8d 100644
---
a/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
+++
b/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
@@ -27,7 +27,7 @@ public class SimpleObjectTest {
@Before
public void setUp() throws Exception {
-simpleObject = new SimpleObject(null);
+simpleObject = new SimpleObject("Foobar");
}
public static class Name extends SimpleObjectTest {
isis git commit: ISIS-1465: fixes error in last commit on the simpleapp archetype
Repository: isis
Updated Branches:
refs/heads/maint-1.13.1 8e6baa275 -> b6245475b
ISIS-1465: fixes error in last commit on the simpleapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b6245475
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b6245475
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b6245475
Branch: refs/heads/maint-1.13.1
Commit: b6245475b2b625ef043854cc4e511d9a9a22b31c
Parents: 8e6baa2
Author: Dan Haywood
Authored: Fri Sep 16 13:09:27 2016 +0100
Committer: Dan Haywood
Committed: Fri Sep 16 13:10:34 2016 +0100
--
.../dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/b6245475/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
--
diff --git
a/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
b/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
index b789f3a..69e36b8 100644
---
a/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
+++
b/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
@@ -27,7 +27,7 @@ public class SimpleObjectTest {
@Before
public void setUp() throws Exception {
-simpleObject = new SimpleObject(null);
+simpleObject = new SimpleObject("Foobar");
}
public static class Name extends SimpleObjectTest {
[isis] Git Push Summary [forced push!] [Forced Update!]
Repository: isis Updated Branches: refs/heads/master 4861080b3 -> 67f66214c (forced update)
isis git commit: ISIS-1465: fixes error in last commit on the simpleapp archetype
Repository: isis
Updated Branches:
refs/heads/master 67f66214c -> 4861080b3
ISIS-1465: fixes error in last commit on the simpleapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4861080b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4861080b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4861080b
Branch: refs/heads/master
Commit: 4861080b3bb9c75c2e3c1e64b8711c9bc5ce350a
Parents: 67f6621
Author: Dan Haywood
Authored: Fri Sep 16 13:09:27 2016 +0100
Committer: Dan Haywood
Committed: Fri Sep 16 13:09:27 2016 +0100
--
.../dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/isis/blob/4861080b/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
--
diff --git
a/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
b/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
index 95f5da5..371bc8d 100644
---
a/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
+++
b/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
@@ -27,7 +27,7 @@ public class SimpleObjectTest {
@Before
public void setUp() throws Exception {
-simpleObject = new SimpleObject(null);
+simpleObject = new SimpleObject("Foobar");
}
public static class Name extends SimpleObjectTest {
