From 8dc3b83f8bf0ebf500739ad4b0ec609264b667f5 Mon Sep 17 00:00:00 2001
From: Richard Millet <remillet@berkeley.edu>
Date: Wed, 2 Apr 2014 13:28:47 -0700
Subject: [PATCH] CSPACE-6355: Added warning messages if missing password
 environment variables or if deprecated ones are still set in the environment.

---
 build.xml | 206 +++++++++++++++++++++---------------------------------
 pom.xml   | 118 +++++++++++++++++--------------
 2 files changed, 144 insertions(+), 180 deletions(-)

diff --git a/build.xml b/build.xml
index 6408aab2a..13f20a10d 100644
--- a/build.xml
+++ b/build.xml
@@ -1,13 +1,11 @@
 <project name="services-trunk" default="package" basedir=".">
-	<description>
-        collectionspace services
-    </description>
+	<description>Collectionspace Services</description>
 	<!-- environment should be declared before reading build.properties -->
 	<property environment="env" />
 	<!-- set global properties for this build -->
 	<property file="build.properties" />
 	<property name="mvn.opts" value="-V" />
-	<property name="src" location="src"/>
+	<property name="src" location="src" />
 
 	<condition property="osfamily-unix">
 		<os family="unix" />
@@ -18,46 +16,42 @@
 
 	<target name="init">
 		<!-- Create the time stamp -->
-		<tstamp/>
+		<tstamp />
 	</target>
 
-	<target name="dist" depends="package"
-            description="generate cspace service distribution">
+	<target name="dist" depends="package" description="generate cspace service distribution">
 		<!-- Create the distribution directory -->
-		<mkdir dir="${basedir}/dist"/>
+		<mkdir dir="${basedir}/dist" />
 
 		<!-- copy db scripts, etc. -->
 		<copy todir="${basedir}/${dist.server.cspace}/cspace/services">
-			<fileset dir="${src}/main/resources/scripts"/>
+			<fileset dir="${src}/main/resources/scripts" />
 		</copy>
 
 		<!-- copy datasources -->
 		<copy todir="${basedir}/${dist.deploy.cspace}">
-			<fileset dir="${src}/main/resources/config/${db}"/>
+			<fileset dir="${src}/main/resources/config/${db}" />
 		</copy>
-		<ant antfile="3rdparty/build.xml" target="dist" inheritAll="false"/>
-		<ant antfile="services/build.xml" target="dist" inheritAll="false"/>
+		<ant antfile="3rdparty/build.xml" target="dist" inheritAll="false" />
+		<ant antfile="services/build.xml" target="dist" inheritAll="false" />
 
 		<!-- bundle up everything -->
 		<tar destfile="${basedir}/dist/${cspace.services.release}-${jee.release}.tar.gz" compression="gzip">
-			<tarfileset dir="${basedir}/dist/cspace"
-                        preserveLeadingSlashes="true">
+			<tarfileset dir="${basedir}/dist/cspace" preserveLeadingSlashes="true">
 			</tarfileset>
 		</tar>
 	</target>
 
-	<target name="dist-jee-domains" depends="init"
-            description="create JEE distributions for cspace and nuxeo">
-		<antcall target="dist-jee-cspace"/>
-		<antcall target="dist-jee-nuxeo"/>
+	<target name="dist-jee-domains" depends="init" description="create JEE distributions for cspace and nuxeo">
+		<antcall target="dist-jee-cspace" />
+		<antcall target="dist-jee-nuxeo" />
 	</target>
 
-	<target name="dist-jee-cspace" depends="dist"
-            description="generate JEE distribution for cspace">
+	<target name="dist-jee-cspace" depends="dist" description="generate JEE distribution for cspace">
 		<fail message="JEE container is not installed or ${jee.dir} not found">
 			<condition>
 				<not>
-					<available file="${jee.dir}" type="dir"/>
+					<available file="${jee.dir}" type="dir" />
 				</not>
 			</condition>
 		</fail>
@@ -65,28 +59,25 @@
 		<fail message="CSpace is not deployed or ${jee.deploy.cspace.services} not found">
 			<condition>
 				<not>
-					<available file="${jee.deploy.cspace.services}" type="file"/>
+					<available file="${jee.deploy.cspace.services}" type="file" />
 				</not>
 			</condition>
 		</fail>
 
 		<tar destfile="${basedir}/dist/${jee.release}-${domain.cspace}-${release.version}.tar.gz" compression="gzip">
-			<tarfileset dir="${jee.dir}"
-                        prefix="${jee.release}"
-                        preserveLeadingSlashes="true">
-				<exclude name="server/${jee.domain.nuxeo}/**"/>
-				<exclude name="server/${jee.domain.cspace}/log/**"/>
-				<exclude name="server/${jee.domain.cspace}/tmp/**"/>
+			<tarfileset dir="${jee.dir}" prefix="${jee.release}" preserveLeadingSlashes="true">
+				<exclude name="server/${jee.domain.nuxeo}/**" />
+				<exclude name="server/${jee.domain.cspace}/log/**" />
+				<exclude name="server/${jee.domain.cspace}/tmp/**" />
 			</tarfileset>
 		</tar>
 	</target>
 
-	<target name="dist-jee-nuxeo" depends="dist"
-            description="generate nuxeo domain distribution" >
+	<target name="dist-jee-nuxeo" depends="dist" description="generate nuxeo domain distribution">
 		<fail message="JEE server is not installed or ${jee.dir} not found">
 			<condition>
 				<not>
-					<available file="${jee.dir}" type="dir"/>
+					<available file="${jee.dir}" type="dir" />
 				</not>
 			</condition>
 		</fail>
@@ -94,24 +85,21 @@
 		<fail message="Nuxeo is not deployed or ${jee.deploy.nuxeo.plugins} not found">
 			<condition>
 				<not>
-					<available file="${jee.deploy.nuxeo.plugins}" type="dir"/>
+					<available file="${jee.deploy.nuxeo.plugins}" type="dir" />
 				</not>
 			</condition>
 		</fail>
 
 		<tar destfile="${basedir}/dist/${jee.release}-${domain.nuxeo}-${release.version}.tar.gz" compression="gzip">
-			<tarfileset dir="${jee.dir}"
-                        prefix="${jee.release}"
-                        preserveLeadingSlashes="true">
-				<exclude name="server/${jee.domain.cspace}/**"/>
-				<exclude name="server/${jee.domain.nuxeo}/log/**"/>
-				<exclude name="server/${jee.domain.nuxeo}/tmp/**"/>
+			<tarfileset dir="${jee.dir}" prefix="${jee.release}" preserveLeadingSlashes="true">
+				<exclude name="server/${jee.domain.cspace}/**" />
+				<exclude name="server/${jee.domain.nuxeo}/log/**" />
+				<exclude name="server/${jee.domain.nuxeo}/tmp/**" />
 			</tarfileset>
 		</tar>
 	</target>
 
-	<target name="package" depends="package-unix,package-windows"
-            description="mvn package" />
+	<target name="package" depends="package-unix,package-windows" description="mvn package" />
 	<target name="package-unix" if="osfamily-unix">
 		<exec executable="mvn" failonerror="true">
 			<arg value="package" />
@@ -135,8 +123,7 @@
 		</exec>
 	</target>
 
-	<target name="install" depends="install-unix,install-windows"
-            description="mvn install" />
+	<target name="install" depends="install-unix,install-windows" description="mvn install" />
 	<target name="install-unix" if="osfamily-unix">
 		<exec executable="mvn" failonerror="true">
 			<arg value="install" />
@@ -160,10 +147,9 @@
 		</exec>
 	</target>
 
-	<target name="clean" depends="clean-unix,clean-windows"
-            description="Delete target directories" >
-		<delete dir="${basedir}/build"/>
-		<delete dir="${basedir}/dist"/>
+	<target name="clean" depends="clean-unix,clean-windows" description="Delete target directories">
+		<delete dir="${basedir}/build" />
+		<delete dir="${basedir}/dist" />
 	</target>
 	<target name="clean-unix" if="osfamily-unix">
 		<exec executable="mvn" failonerror="true">
@@ -197,117 +183,94 @@
 	</target>
 
 	<target name="doc" description="Build Java API docs">
-		<ant antfile="services/build.xml" target="doc" inheritAll="false"/>
+		<ant antfile="services/build.xml" target="doc" inheritAll="false" />
 	</target>
 
-	<target name="gen_ddl"
-            description="generate service-specific tables(s), indices, etc.">
-		<ant antfile="services/build.xml" target="gen_ddl" inheritAll="false"/>
+	<target name="gen_ddl" description="generate service-specific tables(s), indices, etc.">
+		<ant antfile="services/build.xml" target="gen_ddl" inheritAll="false" />
 	</target>
 
-	<target name="create_db" 
-            description="create database(s), invoke subtasks for indexes, etc.">
-		<antcall target="create_nuxeo_db"/>
-		<antcall target="create_cspace_db"/>
+	<target name="create_db" description="create database(s), invoke subtasks for indexes, etc.">
+		<exec executable="cmd" failonerror="true">
+			<arg value="/c" />
+			<arg value="mvn.bat" />
+			<arg value="validate" />
+			<arg value="${mvn.opts}" />
+		</exec>
+		<antcall target="create_nuxeo_db" />
+		<antcall target="create_cspace_db" />
 	</target>
 
-	<target name="create_nuxeo_db" 
-            description="create nuxeo database">
-		<sql driver="${db.jdbc.driver.class}"
-             url="${db.jdbc.csadmin.url}"
-             userid="${db.csadmin.user}"
-             password="${db.csadmin.user.password}"
-						 autocommit="true"
-             src="${db.script.dir}/init_nuxeo_db.sql"
-             >
+	<target name="create_nuxeo_db" description="create nuxeo database">
+		<sql driver="${db.jdbc.driver.class}" url="${db.jdbc.csadmin.url}" userid="${db.csadmin.user}" password="${db.csadmin.user.password}" autocommit="true" src="${db.script.dir}/init_nuxeo_db.sql">
 			<classpath>
-				<pathelement path="${db.driver.jar}"/>
+				<pathelement path="${db.driver.jar}" />
 			</classpath>
 		</sql>
-		<ant antfile="services/build.xml" target="create_nuxeo_db" inheritAll="false"/>
+		<ant antfile="services/build.xml" target="create_nuxeo_db" inheritAll="false" />
 	</target>
 
-	<target name="create_cspace_db" 
-		description="create cspace database">
-		<sql driver="${db.jdbc.driver.class}"
-             url="${db.jdbc.csadmin.url}"
-             userid="${db.csadmin.user}"
-             password="${db.csadmin.user.password}"
-						 autocommit="true"
-             src="${db.script.dir}/init_cspace_db.sql"
-             >
+	<target name="create_cspace_db" description="create cspace database">
+		<sql driver="${db.jdbc.driver.class}" url="${db.jdbc.csadmin.url}" userid="${db.csadmin.user}" password="${db.csadmin.user.password}" autocommit="true" src="${db.script.dir}/init_cspace_db.sql">
 			<classpath>
-				<pathelement path="${db.driver.jar}"/>
+				<pathelement path="${db.driver.jar}" />
 			</classpath>
 		</sql>
-		<ant antfile="services/build.xml" target="create_cspace_db" inheritAll="false"/>
+		<ant antfile="services/build.xml" target="create_cspace_db" inheritAll="false" />
 	</target>
 
-	<target name="import"
-            description="import default configuration">
-		<ant antfile="services/build.xml" target="import" inheritAll="false"/>
+	<target name="import" description="import default configuration">
+		<ant antfile="services/build.xml" target="import" inheritAll="false" />
 	</target>
 
-	<target name="deploy" depends="checkvars,install,setup_initdb.sql"
-            description="deploy services in ${jee.server.cspace}">
+	<target name="deploy" depends="install, setup_initdb.sql" description="deploy services in ${jee.server.cspace}">
 		<!-- copy db scripts, etc. -->
 		<copy todir="${jee.server.cspace}/cspace/services/scripts">
-			<fileset dir="${src}/main/resources/scripts/"/>
+			<fileset dir="${src}/main/resources/scripts/" />
 		</copy>
-		<ant antfile="3rdparty/build.xml" target="deploy" inheritAll="false"/>
-		<ant antfile="services/build.xml" target="deploy" inheritAll="false"/>
-	</target>
-
-	<target name="checkvars">
-		<fail unless="env.CSPACE_JEESERVER_HOME" 
-							message="Required environment variable CSPACE_JEESERVER_HOME has not been set."/>
-		<fail unless="env.DB_CSPACE_PASSWORD" 
-							message="Required environment variable DB_CSPACE_PASSWORD has not been set."/>
-		<fail unless="env.DB_NUXEO_PASSWORD" 
-							message="Required environment variable DB_NUXEO_PASSWORD has not been set."/>
-		<fail unless="env.DB_READER_PASSWORD"
-							message="Required environment variable DB_READER_PASSWORD has not been set."/>
-		<fail unless="env.DB_CSADMIN_PASSWORD" 
-							message="Required environment variable DB_CSADMIN_PASSWORD has not been set."/>
+		<ant antfile="3rdparty/build.xml" target="deploy" inheritAll="false" />
+		<ant antfile="services/build.xml" target="deploy" inheritAll="false" />
 	</target>
 
 	<target name="setup_initdb.sql" description="copy init_db scripts, replacing keywords">
 		<copy todir="${jee.server.cspace}/cspace/services/db">
-			<fileset dir="${src}/main/resources/db"/>
+			<fileset dir="${src}/main/resources/db" />
 			<filterset>
 				<filter token="DB_CSADMIN_NAME" value="${db.csadmin.name}" />
 				<filter token="DB_CSADMIN_USER" value="${db.csadmin.user}" />
-				<filter token="DB_CSADMIN_PASSWORD" value="${env.DB_CSADMIN_PASSWORD}" /> <!-- Note: double-subs from ${db.xyz.password} fail -->
+				<filter token="DB_CSADMIN_PASSWORD" value="${env.DB_CSADMIN_PASSWORD}" />
+				<!-- Note: double-subs from ${db.xyz.password} fail -->
 
 				<filter token="DB_CSPACE_NAME" value="${db.cspace.name}" />
 				<filter token="DB_CSPACE_USER" value="${db.cspace.user}" />
-				<filter token="DB_CSPACE_PASSWORD" value="${env.DB_CSPACE_PASSWORD}" /> <!-- Note: double-subs from ${db.xyz.password} fail -->
-				
+				<filter token="DB_CSPACE_PASSWORD" value="${env.DB_CSPACE_PASSWORD}" />
+				<!-- Note: double-subs from ${db.xyz.password} fail -->
+
 				<filter token="DB_NUXEO_NAME" value="${db.nuxeo.name}" />
 				<filter token="DB_NUXEO_USER" value="${db.nuxeo.user}" />
-				<filter token="DB_NUXEO_PASSWORD" value="${env.DB_NUXEO_PASSWORD}" /> <!-- Note: double-subs from ${db.xyz.password} fail -->
+				<filter token="DB_NUXEO_PASSWORD" value="${env.DB_NUXEO_PASSWORD}" />
+				<!-- Note: double-subs from ${db.xyz.password} fail -->
 
 				<filter token="DB_READER_USER" value="${db.reader.user}" />
-				<filter token="DB_READER_PASSWORD" value="${env.DB_READER_PASSWORD}" /> <!-- Note: double-subs from ${db.xyz.password} fail -->
-	</filterset>
+				<filter token="DB_READER_PASSWORD" value="${env.DB_READER_PASSWORD}" />
+				<!-- Note: double-subs from ${db.xyz.password} fail -->
+			</filterset>
 		</copy>
 	</target>
 
-	<target name="undeploy"
-            description="undeploy services from ${jee.server.cspace}">
-		<ant antfile="services/build.xml" target="undeploy" inheritAll="false"/>
-		<ant antfile="3rdparty/build.xml" target="undeploy" inheritAll="false"/>
-		<delete failonerror="false" dir="${jee.server.cspace}/cspace/services"/>
-		<delete failonerror="false" dir="${jee.server.cspace}/cspace/config/services"/>
+	<target name="undeploy" description="undeploy services from ${jee.server.cspace}">
+		<ant antfile="services/build.xml" target="undeploy" inheritAll="false" />
+		<ant antfile="3rdparty/build.xml" target="undeploy" inheritAll="false" />
+		<delete failonerror="false" dir="${jee.server.cspace}/cspace/services" />
+		<delete failonerror="false" dir="${jee.server.cspace}/cspace/config/services" />
 		<!-- Delete mysql-ds.xml to clean up pre-1.8 bundles -->
-		<delete failonerror="false" file="${jee.deploy.cspace}/mysql-ds.xml"/>
-		<delete failonerror="false" file="${jee.deploy.cspace}/jee-ds.xml"/>
-		<delete failonerror="false" file="${jee.deploy.cspace}/cspace-ds.xml"/>
+		<delete failonerror="false" file="${jee.deploy.cspace}/mysql-ds.xml" />
+		<delete failonerror="false" file="${jee.deploy.cspace}/jee-ds.xml" />
+		<delete failonerror="false" file="${jee.deploy.cspace}/cspace-ds.xml" />
 	</target>
 
-	<target name="hotdeploy" depends="install"
-            description="deploy services in running ${jee.server.cspace}">
-		<ant antfile="services/build.xml" target="hotdeploy" inheritAll="false"/>
+	<target name="hotdeploy" depends="install" description="deploy services in running ${jee.server.cspace}">
+		<ant antfile="services/build.xml" target="hotdeploy" inheritAll="false" />
 	</target>
 
 	<target name="eclipse" depends="eclipse-unix,eclipse-windows" description="Generate Eclipse files" />
@@ -329,15 +292,4 @@
 		</exec>
 	</target>
 
-	<target name="dist_installer" depends="package"
-            description="Installer: Creates an installer distribution for the CollectionSpace services.">
-		<!-- copy install scripts, etc. -->
-		<copy todir="${basedir}/${dist.installer}">
-			<fileset file="${basedir}/build.properties"/>
-			<fileset dir="installer"/>
-			<fileset dir="${src}/main/resources/scripts"/>
-		</copy>
-		<ant antfile="services/build.xml" target="dist_installer" inheritAll="false"/>
-	</target>
-
 </project>
diff --git a/pom.xml b/pom.xml
index ed3ec8afc..bb781cc2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,20 +12,14 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		
+		<cspace.services.version>4.1-SNAPSHOT</cspace.services.version>
+		<cspace.services.client.version>4.1-SNAPSHOT</cspace.services.client.version>
 		<nuxeo.general.release>5.5.0-HF07</nuxeo.general.release>
 		<nuxeo.shell.version>${nuxeo.general.release}</nuxeo.shell.version>
 		<nuxeo.platform.version>${nuxeo.general.release}</nuxeo.platform.version>
-		<nuxeo.core.version>${nuxeo.general.release}</nuxeo.core.version>		
-<!--
-		<nuxeo.shell.version>5.5-I20111104_1115</nuxeo.shell.version>
-		<nuxeo.platform.version>5.5-I20111104_1115</nuxeo.platform.version>
-		<nuxeo.core.version>5.5-I20111104_1115</nuxeo.core.version>
--->
-		<cspace.services.version>4.1-SNAPSHOT</cspace.services.version>
-		<cspace.services.client.version>4.1-SNAPSHOT</cspace.services.client.version>
+		<nuxeo.core.version>${nuxeo.general.release}</nuxeo.core.version>
 		<spring.version>3.0.5.RELEASE</spring.version>
-        <spring.security.version>3.0.5.RELEASE</spring.security.version>
+		<spring.security.version>3.0.5.RELEASE</spring.security.version>
 	</properties>
 
 	<distributionManagement>
@@ -128,7 +122,7 @@
 				<enabled>false</enabled>
 			</snapshots>
 		</repository>
-    
+
 		<repository>
 			<id>public-snapshot</id>
 			<url>http://maven.nuxeo.org/public-snapshot</url>
@@ -165,18 +159,18 @@
 			<name>External release repository of the EL4J project</name>
 			<url>http://public-el4.elca-services.ch/el4j/maven2repository</url>
 		</repository>
-    
-    <repository>
-      <snapshots>
-          <enabled>false</enabled>
-      </snapshots>
-      <releases>
-          <enabled>true</enabled>
-      </releases>
-      <id>Apache</id>
-      <name>External release repository of the Apache projects</name>
-      <url>https://repository.apache.org/content/groups/public/</url>
-    </repository>
+
+		<repository>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<id>Apache</id>
+			<name>External release repository of the Apache projects</name>
+			<url>https://repository.apache.org/content/groups/public/</url>
+		</repository>
 
 	</repositories>
 
@@ -250,16 +244,10 @@
 					<configuration>
 					</configuration>
 				</plugin>
-				<!--
-				<plugin>
-				    <groupId>org.apache.maven.plugins</groupId>
-				    <artifactId>maven-site-plugin</artifactId> 
-					<configuration>
-					    <dependencyLocationEnabled>false</dependencyLocationEnabled> 
-					    <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>
-					</configuration> 
-				</plugin>
-				-->
+				<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> 
+					<configuration> <dependencyLocationEnabled>false</dependencyLocationEnabled> 
+					<unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand> </configuration> 
+					</plugin> -->
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-war-plugin</artifactId>
@@ -295,7 +283,8 @@
 						</execution>
 					</executions>
 				</plugin>
-				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+				<!--This plugin's configuration is used to store Eclipse m2e settings 
+					only. It has no influence on the Maven build itself. -->
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
 					<artifactId>lifecycle-mapping</artifactId>
@@ -346,6 +335,38 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 			</plugin>
+			<!-- 
+				This plugin ensures that the required environment variables are set before we perform
+				any build related tasks.
+			 -->
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>check-environment-vars</id>
+						<phase>validate</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<fail unless="env.CSPACE_JEESERVER_HOME" message="Required environment variable CSPACE_JEESERVER_HOME has not been set." />
+								<fail unless="env.DB_CSPACE_PASSWORD" message="Required environment variable DB_CSPACE_PASSWORD has not been set." />
+								<fail unless="env.DB_NUXEO_PASSWORD" message="Required environment variable DB_NUXEO_PASSWORD has not been set." />
+								<fail unless="env.DB_READER_PASSWORD" message="Required environment variable DB_READER_PASSWORD has not been set." />
+								<fail unless="env.DB_CSADMIN_PASSWORD" message="Required environment variable DB_CSADMIN_PASSWORD has not been set." />
+								<!--
+									Fail if these deprecated environment variables are set.
+								-->
+								<fail if="env.DB_USER" message="The deprecated environment variable DB_USER should not be set." />
+								<fail if="env.DB_PASSWORD" message="The deprecated environment variable DB_PASSWORD should not be set.  Ensure that DB_CSADMIN_PASSWORD is set instead." />
+								<fail if="env.DB_PASSWORD_CSPACE" message="The deprecated environment variable DB_PASSWORD_CSPACE should not be set.  Ensure that DB_CSPACE_PASSWORD is set instead." />
+								<fail if="env.DB_PASSWORD_NUXEO" message="The deprecated environment variable DB_PASSWORD_NUXEO should not be set.  Ensure that DB_NUXEO_PASSWORD is set instead." />
+							</tasks>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 
@@ -361,13 +382,13 @@
 				<artifactId>slf4j-log4j12</artifactId>
 				<version>1.6.1</version>
 			</dependency>
-            <dependency>
-                <groupId>org.testng</groupId>
-                <artifactId>testng</artifactId>
+			<dependency>
+				<groupId>org.testng</groupId>
+				<artifactId>testng</artifactId>
 				<version>6.1.1</version>
-                <!-- <version>5.6</version> -->
-                <scope>test</scope>
-            </dependency>			
+				<!-- <version>5.6</version> -->
+				<scope>test</scope>
+			</dependency>
 			<dependency>
 				<groupId>javax.ejb</groupId>
 				<artifactId>ejb</artifactId>
@@ -390,9 +411,7 @@
 				<groupId>javax.transaction</groupId>
 				<artifactId>jta</artifactId>
 				<version>1.1</version>
-				<!--
-				<scope>provided</scope>
-				-->
+				<!-- <scope>provided</scope> -->
 			</dependency>
 
 			<dependency>
@@ -439,16 +458,9 @@
 					</reportSet>
 				</reportSets>
 			</plugin>
-			<!--
-			<plugin>
-			    <groupId>org.apache.maven.plugins</groupId>
-			    <artifactId>maven-javadoc-plugin</artifactId> 
-				<version>2.6.1</version>
-				<configuration>
-				    <show>public</show>
-				</configuration> 
-			</plugin>
-			-->
+			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> 
+				<version>2.6.1</version> <configuration> <show>public</show> </configuration> 
+				</plugin> -->
 		</plugins>
 	</reporting>
 
-- 
2.47.3