branch develop-2.x updated (488ea8ce -> 68fd36ea)
This is an automated email from the git hooks/post-receive script. New change to branch develop-2.x in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git from 488ea8ce [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 68fd36ea fixes #1906: Add jigsaw profile The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 68fd36ea5736cd7dfdec209fd71614cbcd5d5d9f Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Apr 3 17:10:57 2018 +0200 fixes #1906: Add jigsaw profile Summary of changes: jaxx-maven-plugin/pom.xml | 38 ++++++++++++++++++++++++++++---------- pom.xml | 9 --------- 2 files changed, 28 insertions(+), 19 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-2.x in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit 68fd36ea5736cd7dfdec209fd71614cbcd5d5d9f Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Apr 3 17:10:57 2018 +0200 fixes #1906: Add jigsaw profile --- jaxx-maven-plugin/pom.xml | 38 ++++++++++++++++++++++++++++---------- pom.xml | 9 --------- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/jaxx-maven-plugin/pom.xml b/jaxx-maven-plugin/pom.xml index 91bfcc96..1bf7f135 100644 --- a/jaxx-maven-plugin/pom.xml +++ b/jaxx-maven-plugin/pom.xml @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2008 - 2010 CodeLutin + Copyright (C) 2008 - 2018 CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -144,16 +144,7 @@ <artifactId>javahelp</artifactId> </dependency> - <!-- pour acceder aux BeansInfos swing via Introspector --> - <dependency> - <groupId>com.sun</groupId> - <artifactId>dt</artifactId> - <scope>system</scope> - <systemPath>/${java.home}/../lib/dt.jar</systemPath> - </dependency> - <!-- tests dependencies --> - <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-verifier</artifactId> @@ -236,6 +227,33 @@ <profiles> <profile> + <id>jigsaw</id> + <activation> + <jdk>[1.9,)</jdk> + </activation> + <!-- No dependencies needed by Jigsaw --> + <dependencies/> + </profile> + <profile> + <id>default-jdk</id> + <activation> + <file> + <exists>${java.home}/../lib/dt.jar</exists> + </file> + </activation> + <dependencies> + <!-- sun dependencies --> + <dependency> + <groupId>com.sun</groupId> + <artifactId>dt</artifactId> + <scope>system</scope> + <version>${java.version}</version> + <systemPath>${java.home}/../lib/dt.jar</systemPath> + </dependency> + </dependencies> + </profile> + + <profile> <id>reporting</id> <activation> <property> diff --git a/pom.xml b/pom.xml index 2cca966c..1cafcfef 100644 --- a/pom.xml +++ b/pom.xml @@ -375,15 +375,6 @@ </exclusions> </dependency> - <!-- sun dependencies --> - <dependency> - <groupId>com.sun</groupId> - <artifactId>dt</artifactId> - <version>${java.version}</version> - <scope>system</scope> - <systemPath>/${java.home}/../lib/dt.jar</systemPath> - </dependency> - <dependency> <groupId>javax.help</groupId> <artifactId>javahelp</artifactId> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm