Author: echatellier Date: 2012-08-06 12:46:10 +0200 (Mon, 06 Aug 2012) New Revision: 3567 Url: http://chorem.org/repositories/revision/lima/3567 Log: Udpate libs. Fix build. Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java trunk/lima-business/src/test/java/org/chorem/lima/business/LetteringComparatorTest.java trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java trunk/pom.xml Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java 2012-08-03 16:05:58 UTC (rev 3566) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java 2012-08-06 10:46:10 UTC (rev 3567) @@ -1,4 +1,27 @@ package org.chorem.lima.business.utils; +/* + * #%L + * Lima :: business + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 CodeLutin + * %% + * 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 java.io.Serializable; import java.util.Comparator; Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/LetteringComparatorTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/LetteringComparatorTest.java 2012-08-03 16:05:58 UTC (rev 3566) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/LetteringComparatorTest.java 2012-08-06 10:46:10 UTC (rev 3567) @@ -1,4 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 CodeLutin + * %% + * 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 org.chorem.lima.business.utils.LetteringComparator; import org.junit.Assert; Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2012-08-03 16:05:58 UTC (rev 3566) +++ trunk/lima-callao/pom.xml 2012-08-06 10:46:10 UTC (rev 3567) @@ -28,10 +28,6 @@ <artifactId>commons-collections</artifactId> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2012-08-03 16:05:58 UTC (rev 3566) +++ trunk/lima-swing/pom.xml 2012-08-06 10:46:10 UTC (rev 3567) @@ -71,9 +71,17 @@ </dependency> <dependency> - <groupId>org.swinglabs</groupId> + <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-core</artifactId> </dependency> + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-autocomplete</artifactId> + </dependency> + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-painters</artifactId> + </dependency> <dependency> <groupId>org.apache.commons</groupId> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-08-03 16:05:58 UTC (rev 3566) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-08-06 10:46:10 UTC (rev 3567) @@ -9,15 +9,15 @@ * %% * 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 + * 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 + * + * 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% Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-03 16:05:58 UTC (rev 3566) +++ trunk/pom.xml 2012-08-06 10:46:10 UTC (rev 3567) @@ -109,7 +109,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.167</version> + <version>1.3.168</version> <scope>runtime</scope> </dependency> @@ -162,13 +162,27 @@ <!-- autres libraires --> <dependency> - <groupId>org.swinglabs</groupId> + <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-core</artifactId> - <version>1.6.2-2</version> + <version>${swingxVersion}</version> <scope>compile</scope> </dependency> <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-autocomplete</artifactId> + <version>${swingxVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-painters</artifactId> + <version>${swingxVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> <version>1.6.1</version> @@ -214,26 +228,26 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>8.1.4.v20120524</version> + <version>8.1.5.v20120716</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>8.1.4.v20120524</version> + <version>8.1.5.v20120716</version> </dependency> <!-- pdfbox to create pdf document --> <dependency> <groupId>org.apache.pdfbox</groupId> <artifactId>pdfbox</artifactId> - <version>1.7.0</version> + <version>1.7.1</version> </dependency> <dependency> <groupId>org.apache.pdfbox</groupId> <artifactId>pdfbox-examples</artifactId> - <version>1.7.0</version> + <version>1.7.1</version> </dependency> <dependency> @@ -342,13 +356,14 @@ <projectId>lima</projectId> <!-- customized libs version --> - <nuitonUtilsVersion>2.5.2-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.5.3-SNAPSHOT</nuitonUtilsVersion> <eugenePluginVersion>2.4.2</eugenePluginVersion> <topiaVersion>2.6.11</topiaVersion> - <jaxxVersion>2.5.4-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.5.3</jaxxVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <openEjbVersion>4.0.0</openEjbVersion> <slf4jVersion>1.6.6</slf4jVersion> + <swingxVersion>1.6.4</swingxVersion> <!-- license to use --> <license.licenseName>gpl_v3</license.licenseName>