branch develop updated (84c4414 -> 168a446)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 84c4414 Mise en forme des tableaux comprenant des cases à cocher (termine #6710) Merge branch 'feature/6710' into develop new b90ab90 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 73daf28 [jgitflow-maven-plugin]updating poms for 4.0.1.1 branch with snapshot versions new a2320a4 Ajout de licenses manqauntes new aaf1511 [jgitflow-maven-plugin]updating poms for branch'release/4.0.1.1' with non-snapshot versions new b509d93 [jgitflow-maven-plugin]merging 'release/4.0.1.1' into 'master' new b64117e [jgitflow-maven-plugin]merging 'master' into 'develop' new 168a446 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 168a446ae0986c959950b3b1d9e977ee97b3db2c Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 14 12:52:08 2015 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit b64117e8621675090cbc9b78d6eb704a5cafaca0 Merge: b90ab90 b509d93 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 14 12:52:07 2015 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit b90ab90b098823fb888621f1679e4c92c7b09edb Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 14 12:52:06 2015 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit b509d93455ffa46e831f4f0d8a79f67b67f2daae Merge: 79c8956 aaf1511 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 14 12:52:02 2015 +0200 [jgitflow-maven-plugin]merging 'release/4.0.1.1' into 'master' commit aaf1511fd55abb1b702be7ce0da7554a7c57e3f3 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 14 12:45:04 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0.1.1' with non-snapshot versions commit a2320a415626822af5da2a06f90f7005c680579b Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 14 12:44:40 2015 +0200 Ajout de licenses manqauntes Summary of changes: .../table/ObserveBooleanTableCellRenderer.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit a2320a415626822af5da2a06f90f7005c680579b Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 14 12:44:40 2015 +0200 Ajout de licenses manqauntes --- .../table/ObserveBooleanTableCellRenderer.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/table/ObserveBooleanTableCellRenderer.java b/observe-swing/src/main/java/fr/ird/observe/ui/util/table/ObserveBooleanTableCellRenderer.java index ae8c7ad..fd47031 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/util/table/ObserveBooleanTableCellRenderer.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/util/table/ObserveBooleanTableCellRenderer.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.util.table; +/* + * #%L + * ObServe :: Swing + * %% + * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Predicate; import javax.swing.Icon; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit aaf1511fd55abb1b702be7ce0da7554a7c57e3f3 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 14 12:45:04 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0.1.1' with non-snapshot versions --- observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/observe-business/pom.xml b/observe-business/pom.xml index 3aa72ba..d914aad 100644 --- a/observe-business/pom.xml +++ b/observe-business/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.1.1-SNAPSHOT</version> + <version>4.0.1.1</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index d1c3015..1c13d9e 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.1.1-SNAPSHOT</version> + <version>4.0.1.1</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 7600566..b673e0a 100644 --- a/observe-swing/pom.xml +++ b/observe-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.1.1-SNAPSHOT</version> + <version>4.0.1.1</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index a0f1e4c..71f576b 100644 --- a/observe-validation/pom.xml +++ b/observe-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.1.1-SNAPSHOT</version> + <version>4.0.1.1</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index ebb7618..d4a9c85 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.1.1-SNAPSHOT</version> + <version>4.0.1.1</version> <packaging>pom</packaging> <name>ObServe</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit b509d93455ffa46e831f4f0d8a79f67b67f2daae Merge: 79c8956 aaf1511 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 14 12:52:02 2015 +0200 [jgitflow-maven-plugin]merging 'release/4.0.1.1' into 'master' observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- .../main/java/fr/ird/observe/ObserveConfig.java | 5 ++ .../main/java/fr/ird/observe/ObserveRunner.java | 15 +++- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 6 ++ .../table/ObserveBooleanTableCellRenderer.java | 100 +++++++++++++++++++++ .../main/{filters => resources}/log4j.properties | 2 +- .../observe-log4j.properties | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 11 files changed, 130 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit b90ab90b098823fb888621f1679e4c92c7b09edb Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 14 12:52:06 2015 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/observe-business/pom.xml b/observe-business/pom.xml index b5a788b..d914aad 100644 --- a/observe-business/pom.xml +++ b/observe-business/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.2-SNAPSHOT</version> + <version>4.0.1.1</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 819541d..1c13d9e 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.2-SNAPSHOT</version> + <version>4.0.1.1</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 320bbca..b673e0a 100644 --- a/observe-swing/pom.xml +++ b/observe-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.2-SNAPSHOT</version> + <version>4.0.1.1</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 51e2c98..71f576b 100644 --- a/observe-validation/pom.xml +++ b/observe-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.2-SNAPSHOT</version> + <version>4.0.1.1</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index 18fc25a..d4a9c85 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.2-SNAPSHOT</version> + <version>4.0.1.1</version> <packaging>pom</packaging> <name>ObServe</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit b64117e8621675090cbc9b78d6eb704a5cafaca0 Merge: b90ab90 b509d93 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 14 12:52:07 2015 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' .../table/ObserveBooleanTableCellRenderer.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 168a446ae0986c959950b3b1d9e977ee97b3db2c Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 14 12:52:08 2015 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/observe-business/pom.xml b/observe-business/pom.xml index d914aad..b5a788b 100644 --- a/observe-business/pom.xml +++ b/observe-business/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.1.1</version> + <version>4.0.2-SNAPSHOT</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 1c13d9e..819541d 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.1.1</version> + <version>4.0.2-SNAPSHOT</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index b673e0a..320bbca 100644 --- a/observe-swing/pom.xml +++ b/observe-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.1.1</version> + <version>4.0.2-SNAPSHOT</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 71f576b..51e2c98 100644 --- a/observe-validation/pom.xml +++ b/observe-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.1.1</version> + <version>4.0.2-SNAPSHOT</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index d4a9c85..18fc25a 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.1.1</version> + <version>4.0.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm