This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push: new 2008f70 ISIS-1871 hand-picking updates from M2 branch into main pom.xml 2008f70 is described below commit 2008f706d5e5558a9e6eeeefc59072463687e98d Author: Andi Huber <ahu...@apache.org> AuthorDate: Fri Feb 23 12:18:31 2018 +0100 ISIS-1871 hand-picking updates from M2 branch into main pom.xml + adding myself to developer list + make core-version a variable --- core/pom.xml | 91 +++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 56 insertions(+), 35 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 0032581..bc7d9b3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -50,6 +50,7 @@ </prerequisites> <properties> + <core-version>2.0.0-M1-SNAPSHOT</core-version> <jar-plugin.automaticModuleName>org.apache.isis.core</jar-plugin.automaticModuleName> <git-plugin.propertiesDir>org/apache/isis/core</git-plugin.propertiesDir> @@ -156,6 +157,8 @@ <guice.version>4.1.0</guice.version> <picocontainer.version>2.15</picocontainer.version> + + <javaee.version>7.0</javaee.version> <dom4j.version>1.6.1</dom4j.version> <jdom.version>2.0.2</jdom.version> @@ -213,6 +216,16 @@ </mailingLists> <developers> + <developer> + <id>ahuber</id> + <name>Andi Huber</name> + <email>ahu...@apache.org</email> + <roles> + <role>pmc</role> + <role>committer</role> + </roles> + <timezone>+1</timezone> + </developer> <developer> <id>danhaywood</id> <name>Dan Haywood</name> @@ -1137,12 +1150,12 @@ ${license.additional-notes} <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-unittestsupport</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> </dependency> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-unittestsupport</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> <type>test-jar</type> <scope>test</scope> </dependency> @@ -1151,14 +1164,14 @@ ${license.additional-notes} <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-applib</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> <type>jar</type> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-applib</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> <type>test-jar</type> <scope>test</scope> </dependency> @@ -1180,14 +1193,14 @@ ${license.additional-notes} <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-schema</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> <type>jar</type> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-schema</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> <type>test-jar</type> <scope>test</scope> </dependency> @@ -1196,7 +1209,7 @@ ${license.additional-notes} <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-log4j</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> <type>jar</type> <scope>compile</scope> </dependency> @@ -1205,14 +1218,14 @@ ${license.additional-notes} <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-metamodel</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> <type>jar</type> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-metamodel</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> <type>test-jar</type> <scope>test</scope> </dependency> @@ -1221,76 +1234,76 @@ ${license.additional-notes} <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-runtime</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> </dependency> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-runtime</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-wrapper</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> </dependency> <!-- webserver --> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-webserver</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> </dependency> <!-- specsupport --> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-specsupport</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> </dependency> <!-- integtestsupport --> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-integtestsupport</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> </dependency> <!-- Restful Objects viewer --> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-viewer-restfulobjects-applib</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> </dependency> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-viewer-restfulobjects-applib</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-viewer-restfulobjects-rendering</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> </dependency> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-viewer-restfulobjects-rendering</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-viewer-restfulobjects-server</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> </dependency> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-viewer-restfulobjects-server</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> <type>test-jar</type> <scope>test</scope> </dependency> @@ -1299,12 +1312,12 @@ ${license.additional-notes} <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-security</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> </dependency> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-security-shiro</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> </dependency> @@ -1312,41 +1325,41 @@ ${license.additional-notes} <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-viewer-wicket-applib</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> </dependency> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-viewer-wicket-model</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> </dependency> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-viewer-wicket-model</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> <scope>test</scope> <type>test-jar</type> </dependency> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-viewer-wicket-ui</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> </dependency> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-viewer-wicket-ui</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> <scope>test</scope> <type>test-jar</type> </dependency> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-viewer-wicket-impl</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> </dependency> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-viewer-wicket-impl</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> <scope>test</scope> <type>test-jar</type> </dependency> @@ -1355,26 +1368,26 @@ ${license.additional-notes} <dependency> <groupId>org.apache.isis.tool</groupId> <artifactId>isis-maven-plugin</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> </dependency> <!-- Maven dependencies --> <dependency> <groupId>org.apache.isis.mavendeps</groupId> <artifactId>isis-mavendeps-intellij</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> <type>pom</type> </dependency> <dependency> <groupId>org.apache.isis.mavendeps</groupId> <artifactId>isis-mavendeps-testing</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> <type>pom</type> </dependency> <dependency> <groupId>org.apache.isis.mavendeps</groupId> <artifactId>isis-mavendeps-webapp</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>${core-version}</version> <type>pom</type> </dependency> @@ -1458,6 +1471,14 @@ ${license.additional-notes} <artifactId>picocontainer</artifactId> <version>${picocontainer.version}</version> </dependency> + + <!-- JEE API --> + <dependency> + <groupId>javax</groupId> + <artifactId>javaee-api</artifactId> + <version>${javaee.version}</version> + <scope>provided</scope> + </dependency> <!-- Bytecode libraries --> <dependency> @@ -2147,7 +2168,7 @@ ${license.additional-notes} <configuration> <toolchains> <jdk> - <version>1.7</version> + <version>1.8</version> <vendor>oracle</vendor> </jdk> </toolchains> -- To stop receiving notification emails like this one, please contact ahu...@apache.org.