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 2017/01/19 11:09:11 UTC
[05/24] isis git commit: ISIS-1540: updates simpleapp to compile
under Java 1.7
ISIS-1540: updates simpleapp to compile under Java 1.7
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fbb0475a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fbb0475a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fbb0475a
Branch: refs/heads/maint-1.13.3
Commit: fbb0475a6db5931221ee0e39fcf0dbccf997239a
Parents: 781526d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jan 12 15:07:43 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jan 18 09:51:17 2017 +0000
----------------------------------------------------------------------
.../application/manifest/DomainAppAppManifestWithFixtures.java | 2 +-
.../simple/integtests/SimpleModuleIntegTestAbstract.java | 2 +-
example/application/simpleapp/pom.xml | 6 +++++-
3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/fbb0475a/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/DomainAppAppManifestWithFixtures.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/DomainAppAppManifestWithFixtures.java b/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/DomainAppAppManifestWithFixtures.java
index 756ff0e..0998455 100644
--- a/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/DomainAppAppManifestWithFixtures.java
+++ b/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/DomainAppAppManifestWithFixtures.java
@@ -39,7 +39,7 @@ public class DomainAppAppManifestWithFixtures extends DomainAppAppManifest {
*/
@Override
public List<Class<? extends FixtureScript>> getFixtures() {
- return Lists.newArrayList(CreateSimpleObjects.class);
+ return (List)Lists.newArrayList(CreateSimpleObjects.class);
}
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/fbb0475a/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
index b56a6e8..c13db47 100644
--- a/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
+++ b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
@@ -57,7 +57,7 @@ public abstract class SimpleModuleIntegTestAbstract extends IntegrationTestAbstr
}
@Override public List<Class<?>> getAdditionalServices() {
- return Lists.newArrayList(ModuleFixtureScriptsSpecificationProvider.class);
+ return (List)Lists.newArrayList(ModuleFixtureScriptsSpecificationProvider.class);
}
})
http://git-wip-us.apache.org/repos/asf/isis/blob/fbb0475a/example/application/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index a61f369..d9f5b76 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -68,7 +68,7 @@
<maven-jxr-plugin.version>2.4</maven-jxr-plugin.version>
<maven-source-plugin.version>2.2.1</maven-source-plugin.version>
- <mavenmixin-standard.version>0.0.2</mavenmixin-standard.version>
+ <mavenmixin-standard.version>0.0.3</mavenmixin-standard.version>
<maven-clean-plugin.version>2.5</maven-clean-plugin.version>
<maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version>
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
@@ -98,6 +98,10 @@
<mavendeps-isisintellij.version>0.0.1</mavendeps-isisintellij.version>
<mavendeps-isiswebapp.version>0.0.1</mavendeps-isiswebapp.version>
+ <compiler-plugin.source>1.7</compiler-plugin.source>
+ <compiler-plugin.target>1.7</compiler-plugin.target>
+ <compiler-plugin.compilerArgument></compiler-plugin.compilerArgument>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>