Author: Bavencoff Date: 2013-05-30 14:16:14 +0200 (Thu, 30 May 2013) New Revision: 213 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: Prepare release : generate script SQL, check dependency, update dependency Modified: trunk/magalie-persistence/pom.xml trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/AbstractEntity.java trunk/magalie-services/pom.xml trunk/magalie-web/pom.xml trunk/pom.xml Modified: trunk/magalie-persistence/pom.xml =================================================================== --- trunk/magalie-persistence/pom.xml 2013-05-29 13:24:06 UTC (rev 212) +++ trunk/magalie-persistence/pom.xml 2013-05-30 12:16:14 UTC (rev 213) @@ -117,6 +117,52 @@ <!--</execution>--> <!--</executions>--> <!--</plugin>--> + <plugin> + <groupId>com.aziphael</groupId> + <artifactId>hibernate4-dll-maven-plugin</artifactId> + <version>1.0.RELEASE</version> + <goals> + <goal>export</goal> + </goals> + <configuration> + <entityPackage>com.franciaflex.magalie.persistence.entity</entityPackage> + <dialect>org.hibernate.dialect.Oracle10gDialect</dialect> + <drop>false</drop> + <!-- Export file. Default is ${project.build.directory}/generated-sources/sql/schema-export.sql --> + <exportFile>${project.build.directory}/generated-sources/sql/export.sql</exportFile> + </configuration> + </plugin> + <plugin> + <groupId>de.juplo</groupId> + <artifactId>hibernate4-maven-plugin</artifactId> + <version>1.0.1</version> + <executions> + <execution> + <id>executionCreate</id> + <goals> + <goal>export</goal> + </goals> + <configuration> + <type>CREATE</type> + <outputFile>${project.build.directory}/generated-sources/Create.sql</outputFile> + </configuration> + </execution> + <execution> + <id>executionDrop</id> + <goals> + <goal>export</goal> + </goals> + <configuration> + <type>DROP</type> + <outputFile>${project.build.directory}/generated-sources/Drop.sql</outputFile> + </configuration> + </execution> + </executions> + <configuration> + <hibernateDialect>org.hibernate.dialect.Oracle10gDialect</hibernateDialect> + <target>SCRIPT</target> + </configuration> + </plugin> </plugins> </build> Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/AbstractEntity.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/AbstractEntity.java 2013-05-29 13:24:06 UTC (rev 212) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/AbstractEntity.java 2013-05-30 12:16:14 UTC (rev 213) @@ -26,8 +26,10 @@ import com.google.common.base.Objects; import org.apache.commons.lang3.builder.ToStringBuilder; -public abstract class AbstractEntity { +import java.io.Serializable; +public abstract class AbstractEntity implements Serializable { + public abstract String getId(); @Override Modified: trunk/magalie-services/pom.xml =================================================================== --- trunk/magalie-services/pom.xml 2013-05-29 13:24:06 UTC (rev 212) +++ trunk/magalie-services/pom.xml 2013-05-30 12:16:14 UTC (rev 213) @@ -31,11 +31,6 @@ </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> - - <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> </dependency> Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-05-29 13:24:06 UTC (rev 212) +++ trunk/magalie-web/pom.xml 2013-05-30 12:16:14 UTC (rev 213) @@ -128,13 +128,7 @@ <artifactId>log4j</artifactId> </dependency> - <!-- Test dependencies --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <scope>runtime</scope> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-29 13:24:06 UTC (rev 212) +++ trunk/pom.xml 2013-05-30 12:16:14 UTC (rev 213) @@ -79,6 +79,17 @@ <role>technical writer</role> </roles> </developer> + <developer> + <id>sbavencoff</id> + <name>Sylvain Bavencoff</name> + <email>bavencoff at codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>+2</timezone> + <roles> + <role>developer</role> + </roles> + </developer> </developers> <packaging>pom</packaging> @@ -92,19 +103,18 @@ <!-- versions --> <nuitonWebVersion>1.13</nuitonWebVersion> <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> - <h2Version>1.3.170</h2Version> + <h2Version>1.3.172</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.8</struts2Version> <jqueryPluginVersion>3.5.1</jqueryPluginVersion> <bootstrapPluginVersion>1.6.0</bootstrapPluginVersion> <shiroVersion>1.2.1</shiroVersion> - <slf4jVersion>1.7.2</slf4jVersion> + <slf4jVersion>1.7.5</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> <hibernateVersion>4.1.9.Final</hibernateVersion> <seleniumVersion>2.28.0</seleniumVersion> <mockitoVersion>1.9.5</mockitoVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> - <topiaVersion>2.7.1</topiaVersion> <eugeneVersion>2.5.6.1</eugeneVersion> <!-- license to use --> @@ -142,7 +152,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <scope>test</scope> + <scope>provided</scope> <version>${h2Version}</version> </dependency> @@ -184,6 +194,7 @@ <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> <version>${struts2Version}</version> + <scope>compile</scope> </dependency> <dependency> @@ -240,12 +251,19 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4jVersion}</version> + <scope>runtime</scope> + </dependency> + <!-- Others --> <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> - <version>1.4.6</version> + <version>1.4.7</version> </dependency> <dependency>