Author: thomas.diesler(a)jboss.com Date: 2008-05-06 04:33:33 -0400 (Tue, 06 May 2008) New Revision: 6884 Removed: container/jboss50/branches/jbossws-jboss501/src/main/scripts/antrun-install.xml Modified: container/jboss50/branches/jbossws-jboss501/pom.xml Log: Add jboss-metadata to transitive dependencies Modified: container/jboss50/branches/jbossws-jboss501/pom.xml =================================================================== --- container/jboss50/branches/jbossws-jboss501/pom.xml 2008-05-06 08:12:26 UTC (rev 6883) +++ container/jboss50/branches/jbossws-jboss501/pom.xml 2008-05-06 08:33:33 UTC (rev 6884) @@ -48,31 +48,26 @@ <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-server</artifactId> <version>${jboss.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.deployers</groupId> <artifactId>jboss-deployers-structure-spi</artifactId> <version>${jboss.deployers.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.metadata</groupId> <artifactId>jboss-metadata</artifactId> <version>${jboss.metadata.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-core</artifactId> <version>${jboss.ejb3.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.security</groupId> <artifactId>jboss-security-spi</artifactId> <version>${jboss.security.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss</groupId> @@ -114,11 +109,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.metadata</groupId> - <artifactId>jboss-metadata</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-core</artifactId> <scope>provided</scope> @@ -134,6 +124,12 @@ <groupId>org.jboss</groupId> <artifactId>jbossxb</artifactId> </dependency> + + <!-- transitive dependencies --> + <dependency> + <groupId>org.jboss.metadata</groupId> + <artifactId>jboss-metadata</artifactId> + </dependency> </dependencies> <!-- Plugins --> @@ -150,25 +146,6 @@ </resources> <plugins> <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>install</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="artifact.id" value="${project.artifactId}"/> - <property name="version.id" value="${project.version}"/> - <property name="jboss.local.repository" value="${jboss.local.repository}"/> - <ant antfile="src/main/scripts/antrun-install.xml" target="install"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> Deleted: container/jboss50/branches/jbossws-jboss501/src/main/scripts/antrun-install.xml =================================================================== --- container/jboss50/branches/jbossws-jboss501/src/main/scripts/antrun-install.xml 2008-05-06 08:12:26 UTC (rev 6883) +++ container/jboss50/branches/jbossws-jboss501/src/main/scripts/antrun-install.xml 2008-05-06 08:33:33 UTC (rev 6884) @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<project> - - <!-- ================================================================== --> - <!-- Setup --> - <!-- ================================================================== --> - - <property name="project.dir" value="${basedir}"/> - <property name="project.etc.dir" value="${project.dir}/src/main/etc"/> - <property name="project.target.dir" value="${project.dir}/target"/> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <target name="init"> - <property name="repository.id" value="${version.id}"/> - <echo message="version.id=${version.id}"/> - <echo message="repository.id=${repository.id}"/> - <echo message="jboss.local.repository=${jboss.local.repository}"/> - </target> - - <target name="check-properties" depends="init"> - <available property="jboss.local.repository.available" type="dir" file="${jboss.local.repository}"/> - <fail message="Cannot find directory ${jboss.local.repository}. Did you copy profiles-example.xml?" unless="jboss.local.repository.available"/> - </target> - - - <!-- ================================================================== --> - <!-- Installation --> - <!-- ================================================================== --> - - <!-- Install to jboss.local.repository --> - <target name="install" depends="check-properties" description="Install to jboss.local.repository"> - - <!-- Check if the target jar is available --> - <available property="jar.available" file="${project.target.dir}/${artifact.id}-${version.id}.jar"/> - <fail message="Cannot find ${artifact.id}-${version.id}.jar. Did you run 'mvn package'?" unless="jar.available"/> - - <!-- jboss/jbossws-project --> - <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss/${artifact.id}/${repository.id}"/> - <mkdir dir="${jboss.repository.dir}/lib"/> - <copy file="${project.target.dir}/${artifact.id}-${version.id}.jar" tofile="${jboss.repository.dir}/lib/${artifact.id}.jar" overwrite="true"/> - <copy file="${project.target.dir}/${artifact.id}-${version.id}-container.jar" tofile="${jboss.repository.dir}/lib/${artifact.id}-container.jar" overwrite="true"/> - <copy file="${project.target.dir}/${artifact.id}-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/${artifact.id}-src.jar" overwrite="true"/> - <copy file="${project.target.dir}/${artifact.id}-${version.id}-resources.zip" tofile="${jboss.repository.dir}/lib/${artifact.id}-resources.zip" overwrite="true"/> - <copy file="${project.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/component-info.xml" overwrite="true"/> - </target> - -</project>