Author: tv
Date: Sat Jul 25 19:19:08 2015
New Revision: 1692636
URL: http://svn.apache.org/r1692636
Log:
Update dependencies
- fulcrum-security to 1.1.0
- fulcrum-intake to 1.2.0
Modified:
turbine/core/trunk/pom.xml
Modified: turbine/core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1692636&r1=1692635&r2=1692636&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Sat Jul 25 19:19:08 2015
@@ -515,262 +515,271 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <!--default setting is forkCount=1/reuseForks=true -->
- <reuseForks>false</reuseForks>
+ <!--default setting is forkCount=1/reuseForks=true -->
+ <reuseForks>false</reuseForks>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.torque</groupId>
<artifactId>torque-maven-plugin</artifactId>
- <version>4.0</version>
+ <version>4.0</version>
+ <configuration>
+ <targetDatabase>mysql</targetDatabase>
+ <schemaDir>src/torque/schema</schemaDir>
+ </configuration>
<executions>
- <execution>
- <id>torque-om</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <packaging>classpath</packaging>
- <configPackage>org.apache.torque.templates.om</configPackage>
- <sourceDir>${project.basedir}/src/torque/schema</sourceDir>
- <loglevel>error</loglevel>
- <options>
-
<torque.om.package>org.apache.turbine.services.schedule</torque.om.package>
-
<torque.om.addGetByNameMethods>false</torque.om.addGetByNameMethods>
-
<torque.om.save.saveException>TorqueException</torque.om.save.saveException>
-
<torque.om.useIsForBooleanGetters>true</torque.om.useIsForBooleanGetters>
- </options>
- <outputDirMap>
- <modifiable>${project.build.sourceDirectory}</modifiable>
- </outputDirMap>
- </configuration>
- </execution>
- <!-- database specific loaders -->
- <execution>
- <id>torque-sql-mysql</id>
- <phase>package</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <packaging>classpath</packaging>
-
<configPackage>org.apache.torque.templates.sql</configPackage>
- <sourceDir>${project.basedir}/src/torque/schema</sourceDir>
-
<defaultOutputDir>${project.build.directory}/generated-sql/torque/mysql</defaultOutputDir>
- <defaultOutputDirUsage>none</defaultOutputDirUsage>
- <loglevel>error</loglevel>
- <options>
- <torque.database>mysql</torque.database>
- </options>
- </configuration>
- </execution>
- <execution>
- <id>generate-idtable-sql-mysql</id>
- <phase>package</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <packaging>classpath</packaging>
-
<configPackage>org.apache.torque.templates.idtable</configPackage>
- <sourceDir>${project.basedir}/src/torque/schema</sourceDir>
-
<defaultOutputDir>${project.build.directory}/generated-sql/torque/mysql</defaultOutputDir>
- <defaultOutputDirUsage>none</defaultOutputDirUsage>
- <loglevel>info</loglevel>
- <options>
- <torque.database>mysql</torque.database>
- </options>
- </configuration>
- </execution>
- <execution>
- <id>torque-sql-hsqldb</id>
- <phase>package</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <packaging>classpath</packaging>
-
<configPackage>org.apache.torque.templates.sql</configPackage>
- <sourceDir>${project.basedir}/src/torque/schema</sourceDir>
-
<defaultOutputDir>${project.build.directory}/generated-sql/torque/hsqldb</defaultOutputDir>
- <defaultOutputDirUsage>none</defaultOutputDirUsage>
- <loglevel>error</loglevel>
- <options>
- <torque.database>hsqldb</torque.database>
- </options>
- </configuration>
- </execution>
- <execution>
- <id>generate-idtable-sql-hsqldb</id>
- <phase>package</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <packaging>classpath</packaging>
-
<configPackage>org.apache.torque.templates.idtable</configPackage>
- <sourceDir>${project.basedir}/src/torque/schema</sourceDir>
-
<defaultOutputDir>${project.build.directory}/generated-sql/torque/hsqldb</defaultOutputDir>
- <defaultOutputDirUsage>none</defaultOutputDirUsage>
- <loglevel>info</loglevel>
- <options>
- <torque.database>hsqldb</torque.database>
- </options>
- </configuration>
- </execution>
- <execution>
- <id>torque-sql-derby</id>
- <phase>package</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <packaging>classpath</packaging>
-
<configPackage>org.apache.torque.templates.sql</configPackage>
- <sourceDir>${project.basedir}/src/torque/schema</sourceDir>
-
<defaultOutputDir>${project.build.directory}/generated-sql/torque/derby</defaultOutputDir>
- <defaultOutputDirUsage>none</defaultOutputDirUsage>
- <loglevel>error</loglevel>
- <options>
- <torque.database>derby</torque.database>
- </options>
- </configuration>
- </execution>
- <execution>
- <id>generate-idtable-sql-derby</id>
- <phase>package</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <packaging>classpath</packaging>
-
<configPackage>org.apache.torque.templates.idtable</configPackage>
- <sourceDir>${project.basedir}/src/torque/schema</sourceDir>
-
<defaultOutputDir>${project.build.directory}/generated-sql/torque/derby</defaultOutputDir>
- <defaultOutputDirUsage>none</defaultOutputDirUsage>
- <loglevel>info</loglevel>
- <options>
- <torque.database>derby</torque.database>
- </options>
- </configuration>
- </execution>
- <execution>
- <id>torque-sql-oracle</id>
- <phase>package</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <packaging>classpath</packaging>
-
<configPackage>org.apache.torque.templates.sql</configPackage>
- <sourceDir>${project.basedir}/src/torque/schema</sourceDir>
-
<defaultOutputDir>${project.build.directory}/generated-sql/torque/oracle</defaultOutputDir>
- <defaultOutputDirUsage>none</defaultOutputDirUsage>
- <loglevel>error</loglevel>
- <options>
- <torque.database>oracle</torque.database>
- </options>
- </configuration>
- </execution>
- <execution>
- <id>generate-idtable-sql-oracle</id>
- <phase>package</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <packaging>classpath</packaging>
-
<configPackage>org.apache.torque.templates.idtable</configPackage>
- <sourceDir>${project.basedir}/src/torque/schema</sourceDir>
-
<defaultOutputDir>${project.build.directory}/generated-sql/torque/oracle</defaultOutputDir>
- <defaultOutputDirUsage>none</defaultOutputDirUsage>
- <loglevel>info</loglevel>
- <options>
- <torque.database>oracle</torque.database>
- </options>
- </configuration>
- </execution>
- <execution>
- <id>torque-sql-postgresql</id>
- <phase>package</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <packaging>classpath</packaging>
-
<configPackage>org.apache.torque.templates.sql</configPackage>
- <sourceDir>${project.basedir}/src/torque/schema</sourceDir>
-
<defaultOutputDir>${project.build.directory}/generated-sql/torque/postgresql</defaultOutputDir>
- <defaultOutputDirUsage>none</defaultOutputDirUsage>
- <loglevel>error</loglevel>
- <options>
- <torque.database>postgresql</torque.database>
- </options>
- </configuration>
- </execution>
- <execution>
- <id>generate-idtable-sql-postgresql</id>
- <phase>package</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <packaging>classpath</packaging>
-
<configPackage>org.apache.torque.templates.idtable</configPackage>
- <sourceDir>${project.basedir}/src/torque/schema</sourceDir>
-
<defaultOutputDir>${project.build.directory}/generated-sql/torque/postgresql</defaultOutputDir>
- <defaultOutputDirUsage>none</defaultOutputDirUsage>
- <loglevel>info</loglevel>
- <options>
- <torque.database>postgresql</torque.database>
- </options>
- </configuration>
- </execution>
- <execution>
- <id>torque-sql-mssql</id>
- <phase>package</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <packaging>classpath</packaging>
-
<configPackage>org.apache.torque.templates.sql</configPackage>
- <sourceDir>${project.basedir}/src/torque/schema</sourceDir>
-
<defaultOutputDir>${project.build.directory}/generated-sql/torque/mssql</defaultOutputDir>
- <defaultOutputDirUsage>none</defaultOutputDirUsage>
- <loglevel>error</loglevel>
- <options>
- <torque.database>mssql</torque.database>
- </options>
- </configuration>
- </execution>
- <execution>
- <id>generate-idtable-sql-mssql</id>
- <phase>package</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <packaging>classpath</packaging>
-
<configPackage>org.apache.torque.templates.idtable</configPackage>
- <sourceDir>${project.basedir}/src/torque/schema</sourceDir>
-
<defaultOutputDir>${project.build.directory}/generated-sql/torque/mssql</defaultOutputDir>
- <defaultOutputDirUsage>none</defaultOutputDirUsage>
- <loglevel>info</loglevel>
- <options>
- <torque.database>mssql</torque.database>
- </options>
- </configuration>
- </execution>
+ <execution>
+ <id>generate-om-scheduler-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+ <configPackage>org.apache.torque.templates.om</configPackage>
+ <sourceDir>src/torque/schema</sourceDir>
+ <sourceIncludes>
+ <include>scheduler-schema.xml</include>
+ </sourceIncludes>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>mysql</torque.database>
+
<torque.om.addGetByNameMethods>false</torque.om.addGetByNameMethods>
+
<torque.om.save.saveException>TorqueException</torque.om.save.saveException>
+
<torque.om.package>org.apache.turbine.services.schedule</torque.om.package>
+
<torque.om.useIsForBooleanGetters>true</torque.om.useIsForBooleanGetters>
+
<torque.runOnlyOnSourceChange>true</torque.runOnlyOnSourceChange>
+ </options>
+ <outputDirMap>
+
<modifiable>${project.build.directory}/generated-sources</modifiable>
+ </outputDirMap>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-sql-mysql</id>
+ <phase>package</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+ <configPackage>org.apache.torque.templates.sql</configPackage>
+ <sourceDir>src/torque/schema</sourceDir>
+
<defaultOutputDir>${project.build.directory}/generated-sql/torque/mysql</defaultOutputDir>
+ <defaultOutputDirUsage>none</defaultOutputDirUsage>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>mysql</torque.database>
+ </options>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-sql-hsqldb</id>
+ <phase>package</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+ <configPackage>org.apache.torque.templates.sql</configPackage>
+ <sourceDir>src/torque/schema</sourceDir>
+
<defaultOutputDir>${project.build.directory}/generated-sql/torque/hsqldb</defaultOutputDir>
+ <defaultOutputDirUsage>none</defaultOutputDirUsage>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>hsqldb</torque.database>
+ </options>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-sql-derby</id>
+ <phase>package</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+ <configPackage>org.apache.torque.templates.sql</configPackage>
+ <sourceDir>src/torque/schema</sourceDir>
+
<defaultOutputDir>${project.build.directory}/generated-sql/torque/derby</defaultOutputDir>
+ <defaultOutputDirUsage>none</defaultOutputDirUsage>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>derby</torque.database>
+ </options>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-sql-oracle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+ <configPackage>org.apache.torque.templates.sql</configPackage>
+ <sourceDir>src/torque/schema</sourceDir>
+
<defaultOutputDir>${project.build.directory}/generated-sql/torque/oracle</defaultOutputDir>
+ <defaultOutputDirUsage>none</defaultOutputDirUsage>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>oracle</torque.database>
+ </options>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-sql-postgresql</id>
+ <phase>package</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+ <configPackage>org.apache.torque.templates.sql</configPackage>
+ <sourceDir>src/torque/schema</sourceDir>
+
<defaultOutputDir>${project.build.directory}/generated-sql/torque/postgresql</defaultOutputDir>
+ <defaultOutputDirUsage>none</defaultOutputDirUsage>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>postgresql</torque.database>
+ </options>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-sql-mssql</id>
+ <phase>package</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+ <configPackage>org.apache.torque.templates.sql</configPackage>
+ <sourceDir>src/torque/schema</sourceDir>
+
<defaultOutputDir>${project.build.directory}/generated-sql/torque/mssql</defaultOutputDir>
+ <defaultOutputDirUsage>none</defaultOutputDirUsage>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>mssql</torque.database>
+ </options>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>torque-idtable-mysql</id>
+ <phase>package</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+
<configPackage>org.apache.torque.templates.idtable</configPackage>
+ <sourceDir>src/torque/schema</sourceDir>
+
<defaultOutputDir>${project.build.directory}/generated-sql/torque/mysql</defaultOutputDir>
+ <defaultOutputDirUsage>none</defaultOutputDirUsage>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>mysql</torque.database>
+ </options>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-idtable-hsqldb</id>
+ <phase>package</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+
<configPackage>org.apache.torque.templates.idtable</configPackage>
+ <sourceDir>src/torque/schema</sourceDir>
+
<defaultOutputDir>${project.build.directory}/generated-sql/torque/hsqldb</defaultOutputDir>
+ <defaultOutputDirUsage>none</defaultOutputDirUsage>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>hsqldb</torque.database>
+ </options>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-idtable-derby</id>
+ <phase>package</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+
<configPackage>org.apache.torque.templates.idtable</configPackage>
+ <sourceDir>src/torque/schema</sourceDir>
+
<defaultOutputDir>${project.build.directory}/generated-sql/torque/derby</defaultOutputDir>
+ <defaultOutputDirUsage>none</defaultOutputDirUsage>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>derby</torque.database>
+ </options>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-idtable-oracle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+
<configPackage>org.apache.torque.templates.idtable</configPackage>
+ <sourceDir>src/torque/schema</sourceDir>
+
<defaultOutputDir>${project.build.directory}/generated-sql/torque/oracle</defaultOutputDir>
+ <defaultOutputDirUsage>none</defaultOutputDirUsage>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>oracle</torque.database>
+ </options>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-idtable-postgresql</id>
+ <phase>package</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+
<configPackage>org.apache.torque.templates.idtable</configPackage>
+ <sourceDir>src/torque/schema</sourceDir>
+
<defaultOutputDir>${project.build.directory}/generated-sql/torque/postgresql</defaultOutputDir>
+ <defaultOutputDirUsage>none</defaultOutputDirUsage>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>postgresql</torque.database>
+ </options>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-idtable-mssql</id>
+ <phase>package</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+
<configPackage>org.apache.torque.templates.idtable</configPackage>
+ <sourceDir>src/torque/schema</sourceDir>
+
<defaultOutputDir>${project.build.directory}/generated-sql/torque/mssql</defaultOutputDir>
+ <defaultOutputDirUsage>none</defaultOutputDirUsage>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>mssql</torque.database>
+ </options>
+ </configuration>
+ </execution>
</executions>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.apache.torque</groupId>
<artifactId>torque-templates</artifactId>
<version>4.0</version>
- </dependency>
- </dependencies>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
@@ -889,7 +898,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-intake</artifactId>
- <version>1.0.6</version>
+ <version>1.2.0</version>
<type>jar</type>
</dependency>
<dependency>
@@ -941,12 +950,12 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-api</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-memory</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
