- Wao-commits - mailman.cloud.codelutin.com

[Suiviobsmer-commits] r623 - trunk
by fdesbois＠users.labs.libre-entreprise.org 24 Jul '10

24 Jul '10

Author: fdesbois Date: 2010-07-24 10:39:28 +0000 (Sat, 24 Jul 2010) New Revision: 623 Log: Update Topia to 2.4.1 and EUGene to 2.1.1 Modified: trunk/changelog.txt trunk/pom.xml Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-07-11 20:33:23 UTC (rev 622) +++ trunk/changelog.txt 2010-07-24 10:39:28 UTC (rev 623) @@ -3,6 +3,15 @@ Historique des versions +1.5.1 +----- + +Mise à jour librairies +++++++++++++++++++++++ + +- **ToPIA** 2.4 -> 2.4.1 [http://maven-site.nuiton.org/topia/topia-persistence] +- **EUGene** 2.1 -> 2.1.1 [http://maven-site.nuiton.org/eugene] + 1.5 --- @@ -22,7 +31,7 @@ - **JavaApiforKml** 2.2.0 [http://code.google.com/p/javaapiforkml/] - **H2** 1.2.132 -> 1.2.137 [http://www.h2database.com/html/main.html] -- **ToPIA** 2.3.4 -> 2.3.5 [http://maven-site.nuiton.org/topia/topia-persistence] +- **ToPIA** 2.3.4 -> 2.4 [http://maven-site.nuiton.org/topia/topia-persistence] - **EUGene** 2.0.2 -> 2.1 [http://maven-site.nuiton.org/eugene] - **mavenpom4labs** 2.2 -> 2.2.2.1 [http://maven-site.nuiton.org/mavenpom/mavenpom4labs] Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-11 20:33:23 UTC (rev 622) +++ trunk/pom.xml 2010-07-24 10:39:28 UTC (rev 623) @@ -288,8 +288,8 @@ <i18n.version>1.2.2</i18n.version> <nuitonutils.version>1.3.1</nuitonutils.version> <nuitonweb.version>0.1</nuitonweb.version> - <topia.version>2.4</topia.version> - <eugene.version>2.1</eugene.version> + <topia.version>2.4.1</topia.version> + <eugene.version>2.1.1</eugene.version> <tapestry.version>5.1.0.5</tapestry.version> </properties>

1 0

[Suiviobsmer-commits] r622 - in trunk: . wao-business wao-ui
by fdesbois＠users.labs.libre-entreprise.org 11 Jul '10

11 Jul '10

Author: fdesbois Date: 2010-07-11 20:33:23 +0000 (Sun, 11 Jul 2010) New Revision: 622 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-11 20:33:17 UTC (rev 621) +++ trunk/pom.xml 2010-07-11 20:33:23 UTC (rev 622) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -299,9 +299,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5?root=suiviobsm…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> </scm> <build> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-07-11 20:33:17 UTC (rev 621) +++ trunk/wao-business/pom.xml 2010-07-11 20:33:23 UTC (rev 622) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -204,9 +204,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5/?root=suiviobs…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> </scm>  Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-07-11 20:33:17 UTC (rev 621) +++ trunk/wao-ui/pom.xml 2010-07-11 20:33:23 UTC (rev 622) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -227,9 +227,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5/?root=suiviobs…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r621 - tags
by fdesbois＠users.labs.libre-entreprise.org 11 Jul '10

11 Jul '10

Author: fdesbois Date: 2010-07-11 20:33:17 +0000 (Sun, 11 Jul 2010) New Revision: 621 Log: [maven-release-plugin] copy for tag wao-1.5 Added: tags/wao-1.5/

1 0

[Suiviobsmer-commits] r620 - in trunk: . wao-business wao-ui
by fdesbois＠users.labs.libre-entreprise.org 11 Jul '10

11 Jul '10

Author: fdesbois Date: 2010-07-11 20:33:14 +0000 (Sun, 11 Jul 2010) New Revision: 620 Log: [maven-release-plugin] prepare release wao-1.5 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-11 20:30:59 UTC (rev 619) +++ trunk/pom.xml 2010-07-11 20:33:14 UTC (rev 620) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> <modules> <module>wao-ui</module> @@ -299,9 +299,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5?root=suiviobsm…</url> </scm> <build> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-07-11 20:30:59 UTC (rev 619) +++ trunk/wao-business/pom.xml 2010-07-11 20:33:14 UTC (rev 620) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -204,9 +204,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5/?root=suiviobs…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-business</developerConnection> </scm>  Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-07-11 20:30:59 UTC (rev 619) +++ trunk/wao-ui/pom.xml 2010-07-11 20:33:14 UTC (rev 620) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -227,9 +227,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5/?root=suiviobs…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r619 - trunk/wao-business/src/main/resources/i18n
by fdesbois＠users.labs.libre-entreprise.org 11 Jul '10

11 Jul '10

Author: fdesbois Date: 2010-07-11 20:30:59 +0000 (Sun, 11 Jul 2010) New Revision: 619 Log: ... Modified: trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties Modified: trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-07-11 20:25:08 UTC (rev 618) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-07-11 20:30:59 UTC (rev 619) @@ -1,24 +1,3 @@ -### -# #%L -# Wao :: Business -# %% -# Copyright (C) 2009 - 2010 Ifremer -# %% -# 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% -### wao.error.boat.canCreateContact= wao.error.boat.getNbBoarding= wao.error.boatInfos.getNbBoardingForCompany= Modified: trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-07-11 20:25:08 UTC (rev 618) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-07-11 20:30:59 UTC (rev 619) @@ -1,24 +1,3 @@ -### -# #%L -# Wao :: Business -# %% -# Copyright (C) 2009 - 2010 Ifremer -# %% -# 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% -### wao.error.boat.canCreateContact=Impossible de cr\u00E9er un nouveau contact pour la soci\u00E9t\u00E9 %1$s et le navire %2$s (%3$d) wao.error.boat.getNbBoarding=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s wao.error.boatInfos.getNbBoardingForCompany=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s pour la soci\u00E9t\u00E9 %2$s

1 0

[Suiviobsmer-commits] r618 - tags
by fdesbois＠users.labs.libre-entreprise.org 11 Jul '10

11 Jul '10

Author: fdesbois Date: 2010-07-11 20:25:08 +0000 (Sun, 11 Jul 2010) New Revision: 618 Log: remove bad tag Removed: tags/wao-1.5/

1 0

[Suiviobsmer-commits] r617 - in trunk: wao-business/src/license wao-ui/src/license
by fdesbois＠users.labs.libre-entreprise.org 11 Jul '10

11 Jul '10

Author: fdesbois Date: 2010-07-11 20:21:19 +0000 (Sun, 11 Jul 2010) New Revision: 617 Log: update licenses Modified: trunk/wao-business/src/license/THIRD-PARTY.properties trunk/wao-ui/src/license/THIRD-PARTY.properties Modified: trunk/wao-business/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-business/src/license/THIRD-PARTY.properties 2010-07-11 20:19:18 UTC (rev 616) +++ trunk/wao-business/src/license/THIRD-PARTY.properties 2010-07-11 20:21:19 UTC (rev 617) @@ -1,12 +1,18 @@ # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - BSD # - BSD License +# - BSD license # - BSD style +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 # - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 +# - GNU General Public Library # - GNU Lesser General Public License # - GNU Library or Lesser General Public License +# - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 # - MIT License # - The Apache Software License, Version 2.0 @@ -16,9 +22,12 @@ # Please fill the missing licenses for dependencies : # # -#Mon Jun 28 17:16:38 CEST 2010 +#Sun Jul 11 22:47:24 CEST 2010 antlr--antlr--2.7.6=BSD +com.sun.xml.bind--jaxb-impl--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +com.sun.xml.bind--jaxb-xjc--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD javassist--javassist--3.8.0.GA=Lesser General Public License (LGPL) v 2.1 -javax.transaction--jta--1.1=Sun ??? +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javax.xml.bind--jaxb-api--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 Modified: trunk/wao-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-ui/src/license/THIRD-PARTY.properties 2010-07-11 20:19:18 UTC (rev 616) +++ trunk/wao-ui/src/license/THIRD-PARTY.properties 2010-07-11 20:21:19 UTC (rev 617) @@ -2,11 +2,15 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache Software License 2.0 +# - BSD # - BSD License +# - BSD license # - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 # - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 +# - GNU General Public Library # - GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 # - GNU Lesser General Public Licence # - GNU Lesser General Public License @@ -14,6 +18,7 @@ # - GNU Library or Lesser General Public License # - GPL, LGPL, MPL # - General Public License (GPL) v 3.0 +# - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 # - MIT License # - Public Domain @@ -22,22 +27,21 @@ # - The GNU General Public License (GPL) # - The H2 License, Version 1.0 # - The MIT License +# - The OpenSymphony Software License, Version 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Jun 28 17:22:09 CEST 2010 +#Sun Jul 11 22:47:24 CEST 2010 antlr--antlr--2.7.6=BSD com.formos.tapestry--tapestry-testify--1.0.2=The Apache Software License, Version 2.0 +com.sun.xml.bind--jaxb-impl--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +com.sun.xml.bind--jaxb-xjc--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 commons-beanutils--commons-beanutils-core--1.7.0=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD javassist--javassist--3.9.0.GA=Lesser General Public License (LGPL) v 2.1 -javax.transaction--jta--1.1=Sun ??? +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javax.xml.bind--jaxb-api--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 ognl--ognl--2.7.3=The OpenSymphony Software License, Version 1.1 org.antlr--antlr-runtime--3.1.1=BSD - - - - -

1 0

[Suiviobsmer-commits] r616 - tags/wao-1.5/wao-ui/src/license
by fdesbois＠users.labs.libre-entreprise.org 11 Jul '10

11 Jul '10

Author: fdesbois Date: 2010-07-11 20:19:18 +0000 (Sun, 11 Jul 2010) New Revision: 616 Log: update third-party Modified: tags/wao-1.5/wao-ui/src/license/THIRD-PARTY.properties Modified: tags/wao-1.5/wao-ui/src/license/THIRD-PARTY.properties =================================================================== --- tags/wao-1.5/wao-ui/src/license/THIRD-PARTY.properties 2010-07-11 20:15:55 UTC (rev 615) +++ tags/wao-1.5/wao-ui/src/license/THIRD-PARTY.properties 2010-07-11 20:19:18 UTC (rev 616) @@ -2,11 +2,14 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache Software License 2.0 +# - BSD # - BSD License +# - BSD license # - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 +# - GNU General Public Library # - GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 # - GNU Lesser General Public Licence # - GNU Lesser General Public License @@ -14,6 +17,7 @@ # - GNU Library or Lesser General Public License # - GPL, LGPL, MPL # - General Public License (GPL) v 3.0 +# - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 # - MIT License # - Public Domain @@ -22,22 +26,21 @@ # - The GNU General Public License (GPL) # - The H2 License, Version 1.0 # - The MIT License +# - The OpenSymphony Software License, Version 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Jun 28 17:22:09 CEST 2010 +#Sun Jul 11 22:46:06 CEST 2010 antlr--antlr--2.7.6=BSD com.formos.tapestry--tapestry-testify--1.0.2=The Apache Software License, Version 2.0 +com.sun.xml.bind--jaxb-impl--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +com.sun.xml.bind--jaxb-xjc--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 commons-beanutils--commons-beanutils-core--1.7.0=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD javassist--javassist--3.9.0.GA=Lesser General Public License (LGPL) v 2.1 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javax.xml.bind--jaxb-api--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 ognl--ognl--2.7.3=The OpenSymphony Software License, Version 1.1 org.antlr--antlr-runtime--3.1.1=BSD - - - - -

1 0

[Suiviobsmer-commits] r615 - in trunk: . wao-business wao-ui
by fdesbois＠users.labs.libre-entreprise.org 11 Jul '10

11 Jul '10

Author: fdesbois Date: 2010-07-11 20:15:55 +0000 (Sun, 11 Jul 2010) New Revision: 615 Log: [maven-release-plugin] rollback the release of wao-1.5 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-11 19:38:01 UTC (rev 614) +++ trunk/pom.xml 2010-07-11 20:15:55 UTC (rev 615) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5-SNAPSHOT</version> <modules> <module>wao-ui</module> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-07-11 19:38:01 UTC (rev 614) +++ trunk/wao-business/pom.xml 2010-07-11 20:15:55 UTC (rev 615) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-07-11 19:38:01 UTC (rev 614) +++ trunk/wao-ui/pom.xml 2010-07-11 20:15:55 UTC (rev 615) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

[Suiviobsmer-commits] r614 - in tags/wao-1.5: wao-business/src/license wao-ui/src/license
by fdesbois＠users.labs.libre-entreprise.org 11 Jul '10

11 Jul '10

Author: fdesbois Date: 2010-07-11 19:38:01 +0000 (Sun, 11 Jul 2010) New Revision: 614 Log: Update THIRD-PARTY licenses Modified: tags/wao-1.5/wao-business/src/license/THIRD-PARTY.properties tags/wao-1.5/wao-ui/src/license/THIRD-PARTY.properties Modified: tags/wao-1.5/wao-business/src/license/THIRD-PARTY.properties =================================================================== --- tags/wao-1.5/wao-business/src/license/THIRD-PARTY.properties 2010-07-11 19:17:21 UTC (rev 613) +++ tags/wao-1.5/wao-business/src/license/THIRD-PARTY.properties 2010-07-11 19:38:01 UTC (rev 614) @@ -2,13 +2,18 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - BSD license # - BSD style +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 +# - GNU General Public Library # - GNU Lesser General Public License # - GNU Library or Lesser General Public License +# - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 # - MIT License +# - Sun ??? # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - The MIT License @@ -16,9 +21,12 @@ # Please fill the missing licenses for dependencies : # # -#Mon Jun 28 17:16:38 CEST 2010 +#Sun Jul 11 21:56:24 CEST 2010 antlr--antlr--2.7.6=BSD +com.sun.xml.bind--jaxb-impl--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +com.sun.xml.bind--jaxb-xjc--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD javassist--javassist--3.8.0.GA=Lesser General Public License (LGPL) v 2.1 -javax.transaction--jta--1.1=Sun ??? +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javax.xml.bind--jaxb-api--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 Modified: tags/wao-1.5/wao-ui/src/license/THIRD-PARTY.properties =================================================================== --- tags/wao-1.5/wao-ui/src/license/THIRD-PARTY.properties 2010-07-11 19:17:21 UTC (rev 613) +++ tags/wao-1.5/wao-ui/src/license/THIRD-PARTY.properties 2010-07-11 19:38:01 UTC (rev 614) @@ -33,7 +33,7 @@ commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD javassist--javassist--3.9.0.GA=Lesser General Public License (LGPL) v 2.1 -javax.transaction--jta--1.1=Sun ??? +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 ognl--ognl--2.7.3=The OpenSymphony Software License, Version 1.1 org.antlr--antlr-runtime--3.1.1=BSD

1 0