Author: sebb
Date: Tue Mar 30 19:23:14 2010
New Revision: 929232
URL: http://svn.apache.org/viewvc?rev=929232&view=rev
Log:
Maven now does install, rather than leaving it to Ant
Modified:
jakarta/bsf/branches/bsf3.x/bsf-engines/build.xml
jakarta/bsf/branches/bsf3.x/bsf-engines/pom.xml
Modified: jakarta/bsf/branches/bsf3.x/bsf-engines/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/bsf/branches/bsf3.x/bsf-engines/build.xml?rev=929232&r1=929231&r2=929232&view=diff
==============================================================================
--- jakarta/bsf/branches/bsf3.x/bsf-engines/build.xml (original)
+++ jakarta/bsf/branches/bsf3.x/bsf-engines/build.xml Tue Mar 30 19:23:14 2010
@@ -32,22 +32,6 @@
</target>
- <!-- Install the bsf.engines jar into the local maven repo -->
- <target name="install-engines" depends="merge-engines">
- <property name="mvn.path" value="" description="Allows override in
case mvn is not on the default path"/>
- <exec executable="${mvn.path}mvn${maven.suffix}" dir="${basedir}"
failonerror="true">
- <arg value="install:install-file"/>
- <arg value="-DlocalRepositoryPath=${localRepository}"/>
- <arg value="-DgroupId=org.apache.bsf"/>
- <arg value="-DartifactId=bsf-engines"/>
- <arg value="-Dversion=${bsf.version}"/>
- <arg value="-Dpackaging=jar"/>
- <arg value="-DgeneratePom=true"/>
- <arg
value="-Dfile=${basedir}/target/bsf-engines-${bsf.version}.jar"/>
- </exec>
-
- </target>
-
<target name="merge-engines" depends="check-merged, download-engines"
unless="already.merged">
<mkdir dir="${basedir}${download.dir}"/>
Modified: jakarta/bsf/branches/bsf3.x/bsf-engines/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/bsf/branches/bsf3.x/bsf-engines/pom.xml?rev=929232&r1=929231&r2=929232&view=diff
==============================================================================
--- jakarta/bsf/branches/bsf3.x/bsf-engines/pom.xml (original)
+++ jakarta/bsf/branches/bsf3.x/bsf-engines/pom.xml Tue Mar 30 19:23:14 2010
@@ -79,7 +79,7 @@
</goals>
<configuration>
<tasks>
- <ant target="install-engines">
+ <ant target="merge-engines">
<property name="localRepository"
value="${settings.localRepository}"/>
<property name="bsf.version"
value="${project.version}"/>
</ant>
@@ -88,6 +88,28 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+
<file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file>
+ <type>jar</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
---------------------------------------------------------------------
To unsubscribe, e-mail: bsf-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: bsf-dev-h...@jakarta.apache.org
