Skip to content

Commit

Permalink
converted integration tests to jruby 1.7.5 and the jruby-maven-plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
@jkutner
jkutner committed Oct 22, 2013
1 parent 181d8d5 commit 1834fe8
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 22 deletions.
30 changes: 21 additions & 9 deletions integration/gem-initializer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,33 @@
<build>
<plugins>
<plugin>
<groupId>org.jruby.plugins</groupId>
<artifactId>jruby-rake-plugin</artifactId>
<groupId>de.saumya.mojo</groupId>
<artifactId>jruby-maven-plugin</artifactId>
<executions>
<execution>
<id>build-warbler-gem</id>
<phase>pre-integration-test</phase>
<goals><goal>jruby</goal></goals>
<id>build-warbler</id>
<inherited>true</inherited>
<phase>compile</phase>
<goals>
<goal>jruby</goal>
</goals>
<configuration>
<args>-C../../ -S gem build warbler.gemspec</args>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>de.saumya.mojo</groupId>
<artifactId>jruby-maven-plugin</artifactId>
<executions>
<execution>
<id>gem-install-warbler</id>
<phase>pre-integration-test</phase>
<goals><goal>jruby</goal></goals>
<id>install-warbler</id>
<inherited>true</inherited>
<phase>compile</phase>
<goals>
<goal>jruby</goal>
</goals>
<configuration>
<args>-S gem install ${basedir}/../../warbler-${warbler.version}.gem</args>
</configuration>
Expand All @@ -36,4 +48,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
23 changes: 16 additions & 7 deletions integration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@
</modules>

<properties>
<version.jruby-maven-plugins>0.28.4</version.jruby-maven-plugins>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jruby.version>1.7.4</jruby.version>
<jruby.version>1.7.5</jruby.version>
<warbler.version>1.4.0.dev</warbler.version>
<rubygems.home>${session.executionRootDirectory}/target/jruby/lib/ruby/gems/shared</rubygems.home>
</properties>

<dependencies>
Expand Down Expand Up @@ -54,6 +56,7 @@
<configuration>
<tasks>
<mkdir dir="target"/>
<mkdir dir="${rubygems.home}"/>
</tasks>
</configuration>
<goals>
Expand Down Expand Up @@ -88,11 +91,6 @@
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.jruby.plugins</groupId>
<artifactId>jruby-rake-plugin</artifactId>
<version>${jruby.version}</version>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
Expand Down Expand Up @@ -128,7 +126,18 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
</plugin>
<plugin>
<groupId>de.saumya.mojo</groupId>
<artifactId>jruby-maven-plugin</artifactId>
<version>${version.jruby-maven-plugins}</version>
<extensions>true</extensions>
<configuration>
<gemHome>${rubygems.home}</gemHome>
<jrubySwitches>--1.9</jrubySwitches>
<jrubyVersion>${jruby.version}</jrubyVersion>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
</project>
32 changes: 30 additions & 2 deletions integration/rails4_test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,36 @@
<build>
<plugins>
<plugin>
<groupId>org.jruby.plugins</groupId>
<artifactId>jruby-rake-plugin</artifactId>
<groupId>de.saumya.mojo</groupId>
<artifactId>jruby-maven-plugin</artifactId>
<executions>
<execution>
<id>install-bundler</id>
<phase>compile</phase>
<goals><goal>jruby</goal></goals>
<configuration>
<args>-S gem install bundler</args>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>de.saumya.mojo</groupId>
<artifactId>jruby-maven-plugin</artifactId>
<executions>
<execution>
<id>bundle-install</id>
<phase>pre-integration-test</phase>
<goals><goal>jruby</goal></goals>
<configuration>
<args>-C src/main/ruby -S bundle install</args>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>de.saumya.mojo</groupId>
<artifactId>jruby-maven-plugin</artifactId>
<executions>
<execution>
<id>create-war</id>
Expand Down
4 changes: 2 additions & 2 deletions integration/runnable_test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
</executions>
</plugin>
<plugin>
<groupId>org.jruby.plugins</groupId>
<artifactId>jruby-rake-plugin</artifactId>
<groupId>de.saumya.mojo</groupId>
<artifactId>jruby-maven-plugin</artifactId>
<executions>
<execution>
<id>create-war</id>
Expand Down
4 changes: 2 additions & 2 deletions integration/simple_rack_test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<build>
<plugins>
<plugin>
<groupId>org.jruby.plugins</groupId>
<artifactId>jruby-rake-plugin</artifactId>
<groupId>de.saumya.mojo</groupId>
<artifactId>jruby-maven-plugin</artifactId>
<executions>
<execution>
<id>create-war</id>
Expand Down

0 comments on commit 1834fe8

Please sign in to comment.