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