ISIS-1362: recreating simpleapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/dd6274ca Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/dd6274ca Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/dd6274ca Branch: refs/heads/release-1.12.1-RC1 Commit: dd6274caa7ef6247bda0a75e717312f749799933 Parents: cae8df3 Author: Dan Haywood <d...@haywood-associates.co.uk> Authored: Sat Apr 9 07:09:08 2016 +0100 Committer: Dan Haywood <d...@haywood-associates.co.uk> Committed: Sat Apr 9 07:09:08 2016 +0100 ---------------------------------------------------------------------- example/archetype/simpleapp/pom.xml | 4 ++-- .../simpleapp/src/main/resources/archetype-resources/dom/pom.xml | 2 +- .../src/main/resources/archetype-resources/integtests/pom.xml | 2 +- .../simpleapp/src/main/resources/archetype-resources/pom.xml | 4 ++-- .../src/test/resources/projects/basic/archetype.properties | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/dd6274ca/example/archetype/simpleapp/pom.xml ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml index b74afaa..89551e5 100644 --- a/example/archetype/simpleapp/pom.xml +++ b/example/archetype/simpleapp/pom.xml @@ -17,7 +17,7 @@ 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.isis.archetype</groupId> <artifactId>simpleapp-archetype</artifactId> @@ -44,7 +44,7 @@ <parent> <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>1.12.0</version> + <version>1.12.1</version> <relativePath>../../../core/pom.xml</relativePath> </parent> </project> http://git-wip-us.apache.org/repos/asf/isis/blob/dd6274ca/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml index fbaca0c..9b75a5e 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml @@ -180,7 +180,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>19.0.20150826</version> + <version>19.0</version> </dependency> <dependency> <groupId>org.hsqldb</groupId> http://git-wip-us.apache.org/repos/asf/isis/blob/dd6274ca/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml index 84f8899..63d740f 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml @@ -119,7 +119,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>16.0.1</version> + <version>19.0</version> </dependency> </dependencies> <executions> http://git-wip-us.apache.org/repos/asf/isis/blob/dd6274ca/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- 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 a35dbac..71cb3b4 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml @@ -32,11 +32,11 @@ </prerequisites> <properties> - <isis.version>1.12.0</isis.version> + <isis.version>1.12.1</isis.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <assertj-core.version>2.0.0</assertj-core.version> + <assertj-core.version>2.4.0</assertj-core.version> </properties> <repositories> http://git-wip-us.apache.org/repos/asf/isis/blob/dd6274ca/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties index 1c3daeb..33bf84a 100644 --- a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties +++ b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties @@ -1,4 +1,4 @@ -#Fri Mar 25 10:54:14 GMT 2016 +#Sat Apr 09 07:08:53 BST 2016 package=it.pkg version=0.1-SNAPSHOT groupId=archetype.it