Author: tchemit Date: 2012-12-15 00:44:19 +0100 (Sat, 15 Dec 2012) New Revision: 72 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/72 Log: fix dependencies + use commons.lang3 Modified: trunk/pom.xml trunk/tutti-persistence-adagio/pom.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-14 23:16:31 UTC (rev 71) +++ trunk/pom.xml 2012-12-14 23:44:19 UTC (rev 72) @@ -301,6 +301,11 @@ <artifactId>spring-orm</artifactId> <version>${spring.version}</version> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + <version>${spring.version}</version> + </dependency> <!-- Spring AOP + AspectJ --> <dependency> <groupId>org.springframework</groupId> Modified: trunk/tutti-persistence-adagio/pom.xml =================================================================== --- trunk/tutti-persistence-adagio/pom.xml 2012-12-14 23:16:31 UTC (rev 71) +++ trunk/tutti-persistence-adagio/pom.xml 2012-12-14 23:44:19 UTC (rev 72) @@ -35,7 +35,7 @@ <artifactId>nuiton-utils</artifactId> </dependency> - <dependency> + <!--dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> @@ -48,7 +48,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - </dependency> + </dependency--> <dependency> <groupId>commons-logging</groupId> @@ -58,6 +58,10 @@ <!-- Pour SPRING : --> <dependency> <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </dependency> + <!--dependency> + <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> </dependency> <dependency> @@ -75,9 +79,9 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-orm</artifactId> - </dependency> + </dependency--> <!-- Spring AOP + AspectJ --> - <dependency> + <!--dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> </dependency> @@ -88,7 +92,7 @@ <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> - </dependency> + </dependency--> <dependency> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2012-12-14 23:16:31 UTC (rev 71) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2012-12-14 23:44:19 UTC (rev 72) @@ -30,7 +30,7 @@ import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUIHandler.java 2012-12-14 23:16:31 UTC (rev 71) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUIHandler.java 2012-12-14 23:44:19 UTC (rev 72) @@ -30,7 +30,7 @@ import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.HBox; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java 2012-12-14 23:16:31 UTC (rev 71) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java 2012-12-14 23:44:19 UTC (rev 72) @@ -27,7 +27,7 @@ import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.SwingUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;