You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2019/03/29 12:52:42 UTC

svn commit: r1856530 - in /turbine/fulcrum/trunk/security: api/pom.xml dist/pom.xml hibernate/pom.xml memory/pom.xml pom.xml torque/pom.xml

Author: gk
Date: Fri Mar 29 12:52:41 2019
New Revision: 1856530

URL: http://svn.apache.org/viewvc?rev=1856530&view=rev
Log:
[maven-release-plugin] prepare release fulcrum-security-1.1.3

Modified:
    turbine/fulcrum/trunk/security/api/pom.xml
    turbine/fulcrum/trunk/security/dist/pom.xml
    turbine/fulcrum/trunk/security/hibernate/pom.xml
    turbine/fulcrum/trunk/security/memory/pom.xml
    turbine/fulcrum/trunk/security/pom.xml
    turbine/fulcrum/trunk/security/torque/pom.xml

Modified: turbine/fulcrum/trunk/security/api/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/pom.xml?rev=1856530&r1=1856529&r2=1856530&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/pom.xml (original)
+++ turbine/fulcrum/trunk/security/api/pom.xml Fri Mar 29 12:52:41 2019
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>fulcrum-security</artifactId>
         <groupId>org.apache.fulcrum</groupId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -29,9 +29,9 @@
     <url>http://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-security-api</url>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/api/</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/api/</developerConnection>
-        <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/tags/fulcrum-security-1.1.3/api</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/tags/fulcrum-security-1.1.3/api</developerConnection>
+        <url>http://svn.apache.org/viewvc/turbine/fulcrum/tags/fulcrum-security-1.1.3/api</url>
     </scm>
 
     <dependencies>

Modified: turbine/fulcrum/trunk/security/dist/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/dist/pom.xml?rev=1856530&r1=1856529&r2=1856530&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/dist/pom.xml (original)
+++ turbine/fulcrum/trunk/security/dist/pom.xml Fri Mar 29 12:52:41 2019
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>fulcrum-security</artifactId>
         <groupId>org.apache.fulcrum</groupId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -30,9 +30,9 @@
     <name>Fulcrum Security Distribution Build</name>
     
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/dist/</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/dist/</developerConnection>
-        <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/dist/</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/tags/fulcrum-security-1.1.3/dist</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/tags/fulcrum-security-1.1.3/dist</developerConnection>
+        <url>http://svn.apache.org/viewvc/turbine/fulcrum/tags/fulcrum-security-1.1.3/dist</url>
     </scm>
     
     <!-- NOTE: These dependency declarations are only required to sort this project to the 

Modified: turbine/fulcrum/trunk/security/hibernate/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/pom.xml?rev=1856530&r1=1856529&r2=1856530&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/hibernate/pom.xml (original)
+++ turbine/fulcrum/trunk/security/hibernate/pom.xml Fri Mar 29 12:52:41 2019
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>fulcrum-security</artifactId>
         <groupId>org.apache.fulcrum</groupId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -33,9 +33,9 @@
     </description>
     <url>http://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-security-hibernate/</url>
     <scm>
-      <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/hibernate/</connection>
-      <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/hibernate/</developerConnection>
-      <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/</url>
+      <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/tags/fulcrum-security-1.1.3/hibernate</connection>
+      <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/tags/fulcrum-security-1.1.3/hibernate</developerConnection>
+      <url>http://svn.apache.org/viewvc/turbine/fulcrum/tags/fulcrum-security-1.1.3/hibernate</url>
     </scm>
 
     <build>

Modified: turbine/fulcrum/trunk/security/memory/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/pom.xml?rev=1856530&r1=1856529&r2=1856530&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/memory/pom.xml (original)
+++ turbine/fulcrum/trunk/security/memory/pom.xml Fri Mar 29 12:52:41 2019
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>fulcrum-security</artifactId>
         <groupId>org.apache.fulcrum</groupId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -31,9 +31,9 @@
     </description>
     <url>http://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-security-memory</url>
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/memory/</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/memory/</developerConnection>
-        <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/tags/fulcrum-security-1.1.3/memory</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/tags/fulcrum-security-1.1.3/memory</developerConnection>
+        <url>http://svn.apache.org/viewvc/turbine/fulcrum/tags/fulcrum-security-1.1.3/memory</url>
     </scm>
 
     <build>

Modified: turbine/fulcrum/trunk/security/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/pom.xml?rev=1856530&r1=1856529&r2=1856530&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/pom.xml (original)
+++ turbine/fulcrum/trunk/security/pom.xml Fri Mar 29 12:52:41 2019
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.fulcrum</groupId>
     <artifactId>fulcrum-security</artifactId>
-    <version>1.1.3-SNAPSHOT</version>
+    <version>1.1.3</version>
     <packaging>pom</packaging>
     <name>Fulcrum Security Master Build</name>
     <url>http://turbine.apache.org/fulcrum/fulcrum-security/</url>
@@ -41,9 +41,9 @@
     </distributionManagement>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/</developerConnection>
-        <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/tags/fulcrum-security-1.1.3</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/tags/fulcrum-security-1.1.3</developerConnection>
+        <url>http://svn.apache.org/viewvc/turbine/fulcrum/tags/fulcrum-security-1.1.3</url>
     </scm>
 
     <developers>
@@ -97,12 +97,12 @@
         <dependency>
           <groupId>org.apache.fulcrum</groupId>
           <artifactId>fulcrum-security-api</artifactId>
-          <version>1.1.3-SNAPSHOT</version>
+          <version>1.1.3</version>
         </dependency>
         <dependency>
           <groupId>org.apache.fulcrum</groupId>
           <artifactId>fulcrum-security-api</artifactId>
-          <version>1.1.3-SNAPSHOT</version>
+          <version>1.1.3</version>
           <type>test-jar</type>
           <scope>test</scope>
         </dependency>
@@ -122,7 +122,7 @@
         <dependency>
           <groupId>org.apache.fulcrum</groupId>
           <artifactId>fulcrum-security-memory</artifactId>
-          <version>1.1.3-SNAPSHOT</version>
+          <version>1.1.3</version>
           <scope>test</scope>
         </dependency>
         <dependency>

Modified: turbine/fulcrum/trunk/security/torque/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/pom.xml?rev=1856530&r1=1856529&r2=1856530&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/pom.xml (original)
+++ turbine/fulcrum/trunk/security/torque/pom.xml Fri Mar 29 12:52:41 2019
@@ -1,444 +1,442 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
-	license agreements. See the NOTICE file distributed with this work for additional 
-	information regarding copyright ownership. The ASF licenses this file to 
-	You under the Apache License, Version 2.0 (the "License"); you may not use 
-	this file except in compliance with the License. You may obtain a copy of 
-	the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-	by applicable law or agreed to in writing, software distributed under the 
-	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-	OF ANY KIND, either express or implied. See the License for the specific 
-	language governing permissions and limitations under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<parent>
-		<artifactId>fulcrum-security</artifactId>
-		<groupId>org.apache.fulcrum</groupId>
-		<version>1.1.3-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>fulcrum-security-torque</artifactId>
-	<name>Fulcrum Security Torque Impl</name>
-	<description>
-    Fulcrum Security Torque Impl is an implementation of the Fulcrum Security API
-    that uses Apache DB Torque as a database backend.
-  </description>
-	<url>http://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-security-torque</url>
-	<scm>
-		<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/torque/</connection>
-		<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/torque/</developerConnection>
-		<url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/</url>
-	</scm>
-
-	<properties>
-		<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
-
-		<!-- Easy update of torque libs -->
-		<torque.version>4.0</torque.version>
-		<torque.om>org.apache.fulcrum.security.torque.om</torque.om>
-		<torque.om.path>org/apache/fulcrum/security/torque/om</torque.om.path>
-	</properties>
-	<build>
-		<sourceDirectory>src/java</sourceDirectory>
-		<testSourceDirectory>src/test</testSourceDirectory>
-		<testResources>
-			<testResource>
-				<directory>${project.basedir}/src/test</directory>
-			</testResource>
-		</testResources>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M2</version>
-				<configuration>
-					<!--default setting is forkCount=1/reuseForks=true -->
-					<reuseForks>false</reuseForks>
-					<forkCount>1</forkCount>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<configuration>
-				
-					<!--  TODO : figure out why javadoc warnings are not ignored
-						as this is breaking mvn site generation 
-						The only 'warnings' that remain and are serious are coming from
-						the OM generated classes
-					-->
-					
-					<!--  worked on torque, but not here? -->
-					<doclint>none</doclint>
-					
-					<!--  exclude generated sources for now (only works when running mvn javadoc:javadoc, but not with mvn site? -->
-					<excludePackageNames>org.apache.fulcrum.security.torque.om*</excludePackageNames>
-					
-				</configuration>
-			</plugin>
-
-
-		</plugins>
-	</build>
-
-	 <reporting>
-	    <plugins>
-	      <plugin>
-	        <groupId>org.apache.maven.plugins</groupId>
-	        <artifactId>maven-javadoc-plugin</artifactId>
-	        <version>3.0.1</version>
-	        <configuration>
-	          <show>public</show>
-	        </configuration>
-	      </plugin>
-	    </plugins>
-	  </reporting>
-  
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.fulcrum</groupId>
-			<artifactId>fulcrum-security-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.torque</groupId>
-			<artifactId>torque-runtime</artifactId>
-			<version>${torque.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.fulcrum</groupId>
-			<artifactId>fulcrum-security-api</artifactId>
-			<type>test-jar</type>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-			<!-- broken -->
-			<!-- <version>2.4.1</version> -->
-			<version>1.8.0.10</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>commons-dbcp</groupId>
-			<artifactId>commons-dbcp</artifactId>
-			<version>1.4</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-dbcp2</artifactId>
-			<version>2.5.0</version>
-		</dependency>
-
-		<!-- testing dependencies -->
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.1.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.fulcrum</groupId>
-			<artifactId>fulcrum-testcontainer</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.fulcrum</groupId>
-			<artifactId>fulcrum-yaafi</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-	<profiles>
-		<profile>
-			<id>torque-generate-off</id>
-		</profile>
-		<profile>
-			<id>torque-generate</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.torque</groupId>
-						<artifactId>torque-maven-plugin</artifactId>
-						<version>${torque.version}</version>
-						<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}/schema</sourceDir>
-									<loglevel>error</loglevel>
-									<options>
-										<torque.database>mysql</torque.database>
-										<torque.om.package>${torque.om}</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>
-							<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}/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>${project.basedir}/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>${project.basedir}/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>${project.basedir}/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>${project.basedir}/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>${project.basedir}/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>${project.basedir}/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>${project.basedir}/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>${project.basedir}/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>${project.basedir}/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>${project.basedir}/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>${project.basedir}/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>
-								<groupId>org.apache.torque</groupId>
-								<artifactId>torque-templates</artifactId>
-								<version>${torque.version}</version>
-							</dependency>
-						</dependencies>
-					</plugin>
-					<plugin><!-- clean up for torque-generate sources mysql -->
-						<artifactId>maven-clean-plugin</artifactId>
-						<configuration>
-							<filesets>
-								<fileSet>
-									<directory>${project.build.sourceDirectory}/${torque.om.path}</directory>
-									<excludes><!-- no peer interface configurable in Torque 4.0 -->
-										<exclude>TurbineUserPeerImpl.java</exclude>
-										<exclude>TurbineGroupPeerImpl.java</exclude>
-										<exclude>TurbineRolePeerImpl.java</exclude>
-										<exclude>TurbinePermissionPeerImpl.java</exclude>
-										<exclude>TurbineUserGroupRolePeerImpl.java</exclude>
-									</excludes>
-								</fileSet>
-							</filesets>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+	license agreements. See the NOTICE file distributed with this work for additional 
+	information regarding copyright ownership. The ASF licenses this file to 
+	You under the Apache License, Version 2.0 (the "License"); you may not use 
+	this file except in compliance with the License. You may obtain a copy of 
+	the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+	by applicable law or agreed to in writing, software distributed under the 
+	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+	OF ANY KIND, either express or implied. See the License for the specific 
+	language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<artifactId>fulcrum-security</artifactId>
+		<groupId>org.apache.fulcrum</groupId>
+		<version>1.1.3</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>fulcrum-security-torque</artifactId>
+	<name>Fulcrum Security Torque Impl</name>
+	<description>
+    Fulcrum Security Torque Impl is an implementation of the Fulcrum Security API
+    that uses Apache DB Torque as a database backend.
+  </description>
+	<url>http://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-security-torque</url>
+	<scm>
+		<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/tags/fulcrum-security-1.1.3/torque</connection>
+		<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/tags/fulcrum-security-1.1.3/torque</developerConnection>
+		<url>http://svn.apache.org/viewvc/turbine/fulcrum/tags/fulcrum-security-1.1.3/torque</url>
+	</scm>
+
+	<properties>
+		<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+
+		<!-- Easy update of torque libs -->
+		<torque.version>4.0</torque.version>
+		<torque.om>org.apache.fulcrum.security.torque.om</torque.om>
+		<torque.om.path>org/apache/fulcrum/security/torque/om</torque.om.path>
+	</properties>
+	<build>
+		<sourceDirectory>src/java</sourceDirectory>
+		<testSourceDirectory>src/test</testSourceDirectory>
+		<testResources>
+			<testResource>
+				<directory>${project.basedir}/src/test</directory>
+			</testResource>
+		</testResources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>3.0.0-M2</version>
+				<configuration>
+					<!--default setting is forkCount=1/reuseForks=true -->
+					<reuseForks>false</reuseForks>
+					<forkCount>1</forkCount>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+				
+					<!--  TODO : figure out why javadoc warnings are not ignored
+						as this is breaking mvn site generation 
+						The only 'warnings' that remain and are serious are coming from
+						the OM generated classes
+					-->
+					
+					<!--  worked on torque, but not here? -->
+					<doclint>none</doclint>
+					
+					<!--  exclude generated sources for now (only works when running mvn javadoc:javadoc, but not with mvn site? -->
+					<excludePackageNames>org.apache.fulcrum.security.torque.om*</excludePackageNames>
+					
+				</configuration>
+			</plugin>
+
+
+		</plugins>
+	</build>
+
+	 <reporting>
+	    <plugins>
+	      <plugin>
+	        <groupId>org.apache.maven.plugins</groupId>
+	        <artifactId>maven-javadoc-plugin</artifactId>
+	        <version>3.0.1</version>
+	        <configuration>
+	          <show>public</show>
+	        </configuration>
+	      </plugin>
+	    </plugins>
+	  </reporting>
+  
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.fulcrum</groupId>
+			<artifactId>fulcrum-security-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.torque</groupId>
+			<artifactId>torque-runtime</artifactId>
+			<version>${torque.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.fulcrum</groupId>
+			<artifactId>fulcrum-security-api</artifactId>
+			<type>test-jar</type>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<!-- broken -->
+			<!-- <version>2.4.1</version> -->
+			<version>1.8.0.10</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-dbcp</groupId>
+			<artifactId>commons-dbcp</artifactId>
+			<version>1.4</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-dbcp2</artifactId>
+			<version>2.5.0</version>
+		</dependency>
+
+		<!-- testing dependencies -->
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.1.0</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.fulcrum</groupId>
+			<artifactId>fulcrum-testcontainer</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.fulcrum</groupId>
+			<artifactId>fulcrum-yaafi</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<profiles>
+		<profile>
+			<id>torque-generate-off</id>
+		</profile>
+		<profile>
+			<id>torque-generate</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.torque</groupId>
+						<artifactId>torque-maven-plugin</artifactId>
+						<version>${torque.version}</version>
+						<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}/schema</sourceDir>
+									<loglevel>error</loglevel>
+									<options>
+										<torque.database>mysql</torque.database>
+										<torque.om.package>${torque.om}</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>
+							<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}/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>${project.basedir}/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>${project.basedir}/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>${project.basedir}/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>${project.basedir}/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>${project.basedir}/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>${project.basedir}/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>${project.basedir}/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>${project.basedir}/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>${project.basedir}/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>${project.basedir}/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>${project.basedir}/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>
+								<groupId>org.apache.torque</groupId>
+								<artifactId>torque-templates</artifactId>
+								<version>${torque.version}</version>
+							</dependency>
+						</dependencies>
+					</plugin>
+					<plugin><!-- clean up for torque-generate sources mysql -->
+						<artifactId>maven-clean-plugin</artifactId>
+						<configuration>
+							<filesets>
+								<fileSet>
+									<directory>${project.build.sourceDirectory}/${torque.om.path}</directory>
+									<excludes><!-- no peer interface configurable in Torque 4.0 -->
+										<exclude>TurbineUserPeerImpl.java</exclude>
+										<exclude>TurbineGroupPeerImpl.java</exclude>
+										<exclude>TurbineRolePeerImpl.java</exclude>
+										<exclude>TurbinePermissionPeerImpl.java</exclude>
+										<exclude>TurbineUserGroupRolePeerImpl.java</exclude>
+									</excludes>
+								</fileSet>
+							</filesets>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>