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 84a55cf ISIS-1841 further preparing for jdk 10+ build 84a55cf is described below commit 84a55cf0e152f304a807bfc125c44a529cab910c Author: Andi Huber <ahu...@apache.org> AuthorDate: Tue May 22 15:42:21 2018 +0200 ISIS-1841 further preparing for jdk 10+ build --- core/maven-plugin/pom.xml | 20 ++++++++++++++++---- core/pom.xml | 25 +------------------------ 2 files changed, 17 insertions(+), 28 deletions(-) diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml index 5620e29..c16385a 100644 --- a/core/maven-plugin/pom.xml +++ b/core/maven-plugin/pom.xml @@ -37,17 +37,19 @@ </description> <prerequisites> - <maven>3.0.4</maven> + <maven>3.5.3</maven> </prerequisites> <properties> <jar-plugin.automaticModuleName>org.apache.isis.tool.mavenplugin</jar-plugin.automaticModuleName> <git-plugin.propertiesDir>org/apache/isis/tool/mavenplugin</git-plugin.propertiesDir> - <maven-core.version>3.3.9</maven-core.version> + <maven-core.version>3.5.3</maven-core.version> <maven-project.version>3.0-alpha-2</maven-project.version> - <maven-plugin-annotations.version>3.4</maven-plugin-annotations.version> - <plexus-container-default.version>1.7</plexus-container-default.version> + <maven-plugin-annotations.version>3.5.1</maven-plugin-annotations.version> + <plexus-container-default.version>1.7.1</plexus-container-default.version> + <plexus-utils.version>3.1.0</plexus-utils.version> + </properties> <build> @@ -120,6 +122,12 @@ It's all a bit of a pig's ear... --> + + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>${plexus-utils.version}</version> + </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -130,6 +138,10 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-annotations</artifactId> </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + </exclusion> </exclusions> </dependency> diff --git a/core/pom.xml b/core/pom.xml index e432086..3fcd4a3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -172,11 +172,6 @@ <javaee.version>7.0</javaee.version> - <!-- XML libraries ... no longer needed - <dom4j.version>1.6.1</dom4j.version> - <jdom.version>2.0.2</jdom.version> - <xstream.version>1.4.9</xstream.version> --> - <htmlparser.version>2.1</htmlparser.version> <junit.version>4.12</junit.version> @@ -602,7 +597,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> + <version>3.7.0</version> <configuration> <showDeprecation>false</showDeprecation> <showWarnings>false</showWarnings> @@ -1674,24 +1669,6 @@ ${license.additional-notes} <version>${javassist.version}</version> </dependency> - <!-- XML libraries ... no longer needed --> -<!-- <dependency> --> -<!-- <groupId>dom4j</groupId> --> -<!-- <artifactId>dom4j</artifactId> --> -<!-- <version>${dom4j.version}</version> --> -<!-- </dependency> --> -<!-- <dependency> --> -<!-- <groupId>org.jdom</groupId> --> -<!-- <artifactId>jdom</artifactId> --> -<!-- <version>${jdom.version}</version> --> -<!-- </dependency> --> -<!-- <dependency> --> -<!-- <groupId>com.thoughtworks.xstream</groupId> --> -<!-- <artifactId>xstream</artifactId> --> -<!-- <version>${xstream.version}</version> --> -<!-- </dependency> --> - - <!-- JSON libraries --> <dependency> <groupId>com.fasterxml.jackson.core</groupId> -- To stop receiving notification emails like this one, please contact ahu...@apache.org.