@@ -90,91 +90,8 @@ </dependencies> <build> - <sourceDirectory>${project.basedir}/../../src</sourceDirectory> - <testSourceDirectory>${project.basedir}/../../test</testSourceDirectory> <plugins> <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <phase>generate-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - <version>3.0</version> - </artifactItem> - <artifactItem> - <groupId>asm</groupId> - <artifactId>asm-commons</artifactId> - <version>3.0</version> - </artifactItem> - <artifactItem> - <groupId>asm</groupId> - <artifactId>asm-util</artifactId> - <version>3.0</version> - </artifactItem> - <artifactItem> - <groupId>asm</groupId> - <artifactId>asm-analysis</artifactId> - <version>3.0</version> - </artifactItem> - <artifactItem> - <groupId>asm</groupId> - <artifactId>asm-tree</artifactId> - <version>3.0</version> - </artifactItem> - <artifactItem> - <groupId>biz.aQute</groupId> - <artifactId>bndlib</artifactId> - <version>0.0.249</version> - </artifactItem> - <artifactItem> - <groupId>jline</groupId> - <artifactId>jline</artifactId> - <version>0.9.93</version> - </artifactItem> - <artifactItem> - <groupId>org.jruby.joni</groupId> - <artifactId>joni</artifactId> - <version>1.0.3</version> - </artifactItem> - <artifactItem> - <groupId>joda-time</groupId> - <artifactId>joda-time</artifactId> - <version>1.5.1</version> - </artifactItem> - <artifactItem> - <groupId>org.jruby.extras</groupId> - <artifactId>jna</artifactId> - <version>3.0.2</version> - </artifactItem> - <artifactItem> - <groupId>org.jruby.ext.posix</groupId> - <artifactId>jna-posix</artifactId> - <version>0.7</version> - </artifactItem> - <artifactItem> - <groupId>org.jruby.extras</groupId> - <artifactId>jvyamlb</artifactId> - <version>0.2.3</version> - </artifactItem> - <artifactItem> - <groupId>org.jruby.extras</groupId> - <artifactId>bytelist</artifactId> - <version>0.1</version> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.outputDirectory}</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <version>1.1</version> @@ -196,30 +113,17 @@ <executions> <execution> <id>copy-jar</id> - <phase>process-classes</phase> + <phase>package</phase> <goals><goal>run</goal></goals> <configuration> <tasks> -<echo message="whoo"/> - <copy file="${project.basedir}/../../lib/jruby-complete.jar" tofile="${project.build.directory}/${project.build.finalName}.jar"/> + <echo>copy ${project.basedir}/../../lib/jruby-complete.jar to ${project.build.directory}/${project.build.finalName}.jar</echo> + <copy overwrite="true" file="${project.basedir}/../../lib/jruby-complete.jar" tofile="${project.build.directory}/${project.build.finalName}.jar"/> </tasks> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <includes> - <!-- <include>org/jruby/test/MainTestSuite.java</include> --> - <!-- <include>org/jruby/test/ScriptTestSuite.java</include> --> - <!-- <include>org/jruby/test/TestUnitTestSuite.java</include> --> - </includes> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </configuration> - </plugin> </plugins> </build> </project> maven/jruby-complete/pom.xml @@ -90,91 +90,8 @@ </dependencies> <build> - <sourceDirectory>${basedir}/../../src</sourceDirectory> - <testSourceDirectory>${basedir}/../../test</testSourceDirectory> <plugins> <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <phase>generate-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - <version>3.0</version> - </artifactItem> - <artifactItem> - <groupId>asm</groupId> - <artifactId>asm-commons</artifactId> - <version>3.0</version> - </artifactItem> - <artifactItem> - <groupId>asm</groupId> - <artifactId>asm-util</artifactId> - <version>3.0</version> - </artifactItem> - <artifactItem> - <groupId>asm</groupId> - <artifactId>asm-analysis</artifactId> - <version>3.0</version> - </artifactItem> - <artifactItem> - <groupId>asm</groupId> - <artifactId>asm-tree</artifactId> - <version>3.0</version> - </artifactItem> - <artifactItem> - <groupId>biz.aQute</groupId> - <artifactId>bndlib</artifactId> - <version>0.0.249</version> - </artifactItem> - <artifactItem> - <groupId>jline</groupId> - <artifactId>jline</artifactId> - <version>0.9.93</version> - </artifactItem> - <artifactItem> - <groupId>org.jruby.joni</groupId> - <artifactId>joni</artifactId> - <version>1.0.3</version> - </artifactItem> - <artifactItem> - <groupId>joda-time</groupId> - <artifactId>joda-time</artifactId> - <version>1.5.1</version> - </artifactItem> - <artifactItem> - <groupId>org.jruby.extras</groupId> - <artifactId>jna</artifactId> - <version>3.0.2</version> - </artifactItem> - <artifactItem> - <groupId>org.jruby.ext.posix</groupId> - <artifactId>jna-posix</artifactId> - <version>0.7</version> - </artifactItem> - <artifactItem> - <groupId>org.jruby.extras</groupId> - <artifactId>jvyamlb</artifactId> - <version>0.2.3</version> - </artifactItem> - <artifactItem> - <groupId>org.jruby.extras</groupId> - <artifactId>bytelist</artifactId> - <version>0.1</version> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.outputDirectory}</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <version>1.1</version> @@ -196,31 +113,17 @@ <executions> <execution> <id>copy-jar</id> - <phase>process-classes</phase> + <phase>package</phase> <goals><goal>run</goal></goals> <configuration> <tasks> -<echo message="whoo"/> - <copy file="${project.basedir}/../../lib/jruby.jar" tofile="${project.build.directory}/${project.build.finalName}.jar"/> + <echo>copy ${project.basedir}/../../lib/jruby.jar to ${project.build.directory}/${project.build.finalName}.jar</echo> + <copy overwrite="true" file="${project.basedir}/../../lib/jruby.jar" tofile="${project.build.directory}/${project.build.finalName}.jar"/> </tasks> </configuration> </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <includes> - <!-- <include>org/jruby/test/MainTestSuite.java</include> --> - <!-- <include>org/jruby/test/ScriptTestSuite.java</include> --> - <!-- <include>org/jruby/test/TestUnitTestSuite.java</include> --> - </includes> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </configuration> - </plugin> </plugins> </build> </project> maven/jruby/pom.xml @@ -126,141 +126,5 @@ <artifactId>wagon-webdav</artifactId> </extension> </extensions> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass>${jruby.main.class}</mainClass> - <packageName>${jruby.package}</packageName> - </manifest> - </archive> - </configuration> - </plugin> - </plugins> </build> - <profiles> - <profile> - <id>jruby</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <resources> - <resource> - <directory>${project.basedir}/../../src</directory> - <includes> - <include>**/*.rb</include> - </includes> - </resource> - <resource> - <directory>${project.basedir}/../../lib/ruby/site_ruby/1.8</directory> - <includes> - <include>builtin/**/*.rb</include> - </includes> - </resource> - </resources> - <testResources> - <testResource> - <directory>${project.basedir}/../..</directory> - <includes> - <include>build.xml</include> - <include>test/**/*.rb</include> - <include>test/**/*.txt</include> - <include>test/*index</include> - <include>test/**/*.yml</include> - <include>test/**/*.jar</include> - <include>test/**/*.properties</include> - </includes> - </testResource> - <testResource> - <directory>${project.basedir}/../../test</directory> - <includes> - <include>org/jruby/**/*.rb</include> - </includes> - </testResource> - </testResources> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>${javac.version}</source> - <target>${javac.version}</target> - </configuration> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>filter-jruby-properties</id> - <phase>process-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <tstamp><format property="build.date" pattern="yyyy-MM-dd"/></tstamp> - <copy todir="${project.build.outputDirectory}" overwrite="true" failonerror="false"> - <fileset dir="${project.build.sourceDirectory}"> - <include name="**/*.properties"/> - </fileset> - <filterset> - <filter token="os.arch" value="${os.arch}"/> - <filter token="java.specification.version" value="${java.specification.version}"/> - <filter token="javac.version" value="${javac.version}"/> - <filter token="build.date" value="${build.date}"/> - </filterset> - </copy> - </tasks> - </configuration> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - <version>1.6.5</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> - <properties> - <jruby.package>org.jruby</jruby.package> - <jruby.main.class>org.jruby.Main</jruby.main.class> - <javac.version>${java.specification.version}</javac.version> - <jruby.launch.memory>384m</jruby.launch.memory> - </properties> - </profile> - <profile> - <id>jruby-release</id> - <activation> - <property> - <name>release</name> - <value>true</value> - </property> - </activation> - <properties> - <javac.version>1.5</javac.version> - </properties> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> pom.xml b7dc18c91d5cdc09c6d0090c9efe7187396e1737 nsieger nsieger@961051c9-f516-0410-bf72-c9f7e237a7b7 http://github.com/bobmcwhirter/jruby/commit/dd37f656898af454ba09a5d636d0a321b8fe82e2 dd37f656898af454ba09a5d636d0a321b8fe82e2 2008-08-28T09:34:26-07:00 2008-08-28T09:34:26-07:00 Simplify maven files and move jar copy to package phase git-svn-id: http://svn.codehaus.org/jruby/trunk/jruby@7568 961051c9-f516-0410-bf72-c9f7e237a7b7 25566fa07017ab0091e98827aae9c88ba10a9f33 nsieger nsieger@961051c9-f516-0410-bf72-c9f7e237a7b7