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/12 15:17:02 UTC
[1/2] isis git commit: ISIS-1540: updates simpleapp to use 0.0.3 of
docker mavenmixin
Repository: isis
Updated Branches:
refs/heads/master a91d0a840 -> f8b2faa87
ISIS-1540: updates simpleapp to use 0.0.3 of docker mavenmixin
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f2855657
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f2855657
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f2855657
Branch: refs/heads/master
Commit: f28556573d782f0aca501b551109f9c34834551e
Parents: a91d0a8
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jan 12 14:07:44 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jan 12 14:07:44 2017 +0000
----------------------------------------------------------------------
example/application/simpleapp/pom.xml | 8 +++++++-
example/application/simpleapp/webapp/pom.xml | 7 +++++--
2 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f2855657/example/application/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index a34d5f4..bf68720 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -89,9 +89,10 @@
<jdepend-maven-plugin.version>2.0-beta-2</jdepend-maven-plugin.version>
<findbugs-maven-plugin.version>2.5</findbugs-maven-plugin.version>
- <mavenmixin-docker.version>0.0.2</mavenmixin-docker.version>
+ <mavenmixin-docker.version>0.0.3</mavenmixin-docker.version>
<maven-deploy-plugin.version>2.8.1</maven-deploy-plugin.version>
<docker-maven-plugin.version>0.4.13</docker-maven-plugin.version>
+ <gmavenplus-plugin.version>1.5</gmavenplus-plugin.version>
<mavendeps-isistesting.version>0.0.2</mavendeps-isistesting.version>
<mavendeps-isisintellij.version>0.0.1</mavendeps-isisintellij.version>
@@ -244,6 +245,11 @@
<artifactId>docker-maven-plugin</artifactId>
<version>${docker-maven-plugin.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
+ <version>${gmavenplus-plugin.version}</version>
+ </plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/f2855657/example/application/simpleapp/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index 8cf892e5..ada153c 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -45,8 +45,11 @@
<docker-plugin.imageName>DOCKER_REGISTRY_ACCOUNT/${project.parent.artifactId}</docker-plugin.imageName>
<docker-plugin.resource.include>${maven-war-plugin.warName}.war</docker-plugin.resource.include>
- <docker-plugin.serverId>docker-hub</docker-plugin.serverId>
- <docker-plugin.registryUrl>https://index.docker.io/v1/</docker-plugin.registryUrl>
+
+ <docker-plugin.releaseServerId>docker-hub</docker-plugin.releaseServerId>
+ <docker-plugin.releaseRegistryUrl>https://index.docker.io/v1/</docker-plugin.releaseRegistryUrl>
+ <docker-plugin.snapshotServerId>docker-hub</docker-plugin.snapshotServerId>
+ <docker-plugin.snapshotRegistryUrl>https://index.docker.io/v1/</docker-plugin.snapshotRegistryUrl>
</properties>
[2/2] isis git commit: ISIS-1540: updates simpleapp to compile under
Java 1.7
Posted by da...@apache.org.
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/f8b2faa8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f8b2faa8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f8b2faa8
Branch: refs/heads/master
Commit: f8b2faa879bc7b67ccb8ff3fba694677a08aa8b3
Parents: f285565
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: Thu Jan 12 15:08:24 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/f8b2faa8/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/f8b2faa8/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/f8b2faa8/example/application/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index bf68720..ff1b33d 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.2</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>