Skip to content

Commit

Permalink
updated jar-dependencies and include ruby-maven in dist archives
Browse files Browse the repository at this point in the history
  • Loading branch information
mkristian committed Jul 2, 2014
1 parent 25ee92a commit 71a145e
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lib/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def version
ImportedGem.new( 'krypt-core', KRYPT_VERSION, true ),
ImportedGem.new( 'krypt-provider-jdk', KRYPT_VERSION, true ),
ImportedGem.new( 'ffi', '1.9.3', true ),
ImportedGem.new( 'jar-dependencies', '0.0.3', true )
ImportedGem.new( 'jar-dependencies', '0.0.4', true )
]

project 'JRuby Lib Setup' do
Expand Down
4 changes: 2 additions & 2 deletions lib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<dependency>
<groupId>rubygems</groupId>
<artifactId>jar-dependencies</artifactId>
<version>0.0.3</version>
<version>0.0.4</version>
<type>gem</type>
</dependency>
</dependencies>
Expand Down Expand Up @@ -183,7 +183,7 @@
<artifactItem>
<groupId>rubygems</groupId>
<artifactId>jar-dependencies</artifactId>
<version>0.0.3</version>
<version>0.0.4</version>
<type>gem</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}</outputDirectory>
Expand Down
22 changes: 22 additions & 0 deletions maven/jruby-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,32 @@
<jruby.home>${basedir}/../..</jruby.home>
<tesla.dump.readonly>true</tesla.dump.readonly>
<main.basedir>${project.parent.parent.basedir}</main.basedir>
<jruby.plugins.version>1.0.3</jruby.plugins.version>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
</properties>
<dependencies>
<dependency>
<groupId>rubygems</groupId>
<artifactId>ruby-maven</artifactId>
<version>3.1.1.0.7</version>
<type>gem</type>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>${jruby.plugins.version}</version>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>initialize</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
Expand Down
2 changes: 1 addition & 1 deletion maven/jruby-dist/src/it/integrity/verify.bsh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "gems count 8";
expected = "gems count 9";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
Expand Down
8 changes: 8 additions & 0 deletions maven/jruby-dist/src/main/assembly/jruby.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@
<format>zip</format>
</formats>
<fileSets>
<fileSet>
<directory>${project.build.directory}/rubygems</directory>
<outputDirectory>/lib/ruby/gems/shared</outputDirectory>
<includes>
<include>gems/**</include>
<include>specifications/**</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.build.directory}/META-INF/jruby.home</directory>
<outputDirectory>/</outputDirectory>
Expand Down

0 comments on commit 71a145e

Please sign in to comment.