Skip to content

Commit

Permalink
refactored the maven modules for integration test so we can have some…
Browse files Browse the repository at this point in the history 
… more configurations
  • Loading branch information
@jkutner
jkutner committed Sep 4, 2013
1 parent 4e0bfb3 commit 32c66ad
Show file tree
Hide file tree
Showing 4 changed files with 101 additions and 64 deletions.
40 changes: 40 additions & 0 deletions integration/gem-initializer/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>org.jruby.warbler</groupId>
<artifactId>gem-initializer</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
<warbler.version>1.4.0.dev</warbler.version>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.jruby.plugins</groupId>
<artifactId>jruby-rake-plugin</artifactId>
<executions>
<execution>
<id>build-warbler-gem</id>
<phase>initialize</phase>
<goals><goal>jruby</goal></goals>
<configuration>
<args>-C../../ -S gem build warbler.gemspec</args>
</configuration>
</execution>
<execution>
<id>gem-install-warbler</id>
<phase>initialize</phase>
<goals><goal>jruby</goal></goals>
<configuration>
<args>-S gem install ${basedir}/../../warbler-${warbler.version}.gem</args>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
49 changes: 49 additions & 0 deletions integration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,53 @@
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
<module>gem-initializer</module>
<module>simple_rack_test</module>
<!--<module>simple-webapp</module>-->
</modules>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jruby.version>1.7.4</jruby.version>
</properties>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<defaultGoal>verify</defaultGoal>
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
<resources>
<resource>
<directory>${basedir}/src/main/ruby</directory>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.9</version>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jruby.plugins</groupId>
<artifactId>jruby-rake-plugin</artifactId>
<version>${jruby.version}</version>
</plugin>
</plugins>
</build>
</project>
9 changes: 0 additions & 9 deletions integration/simple_rack_test/Rakefile
View file

This file was deleted.

67 changes: 12 additions & 55 deletions integration/simple_rack_test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,40 +10,28 @@
<name>simple_rack_test</name>
<url>http://maven.apache.org</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jruby.version>1.7.4</jruby.version>
<warbler.version>1.4.0.dev</warbler.version>
</properties>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
<scope>test</scope>
<groupId>${groupId}</groupId>
<artifactId>gem-initializer</artifactId>
<version>${version}</version>
<type>pom</type>
</dependency>
</dependencies>

<build>
<defaultGoal>verify</defaultGoal>
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
<resources>
<resource>
<directory>${basedir}/src/main/ruby</directory>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.9</version>
<groupId>org.jruby.plugins</groupId>
<artifactId>jruby-rake-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
<id>create-war</id>
<phase>pre-integration-test</phase>
<goals><goal>jruby</goal></goals>
<configuration>
<args>-Csrc/main/ruby -S warble</args>
</configuration>
</execution>
</executions>
</plugin>
Expand Down Expand Up @@ -76,37 +64,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jruby.plugins</groupId>
<artifactId>jruby-rake-plugin</artifactId>
<version>${jruby.version}</version>
<executions>
<execution>
<id>build-warbler-gem</id>
<phase>prepare-package</phase>
<goals><goal>jruby</goal></goals>
<configuration>
<args>-C../.. -S gem build warbler.gemspec</args>
</configuration>
</execution>
<execution>
<id>gem-install-warbler</id>
<phase>prepare-package</phase>
<goals><goal>jruby</goal></goals>
<configuration>
<args>-S gem install ${basedir}/../../warbler-${warbler.version}.gem</args>
</configuration>
</execution>
<execution>
<id>create-war</id>
<phase>prepare-package</phase>
<goals><goal>jruby</goal></goals>
<configuration>
<args>-Csrc/main/ruby -S warble</args>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

0 comments on commit 32c66ad

Please sign in to comment.