Skip to content

Commit

Permalink
Merge branch 'master' into no_newline
Browse files Browse the repository at this point in the history 
Conflicts:
	truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java
@nirvdrum
nirvdrum committed Aug 7, 2015
2 parents 1eff2a3 + aa0e79e commit 926fbb7
Showing 114 changed files with 609 additions and 3,356 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,8 @@ sudo: false
# - $HOME/.m2

before_script:
- export MAVEN_SKIP_RC=true
- export MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=192m"
- unset GEM_PATH GEM_HOME IRBRC JRUBY_OPTS
- "export PATH=`pwd`/bin:$PATH"
- echo $HOME
30 changes: 12 additions & 18 deletions core/src/main/java/org/jruby/RubyProcess.java
View file
Original file line number Diff line number Diff line change
@@ -830,28 +830,17 @@ public static IRubyObject uid(Ruby runtime) {
return runtime.newFixnum(checkErrno(runtime, runtime.getPosix().getuid()));
}

@Deprecated
public static IRubyObject waitpid2(IRubyObject recv, IRubyObject[] args) {
return waitpid2(recv.getRuntime(), args);
}
@JRubyMethod(name = "waitpid2", rest = true, module = true, visibility = PRIVATE)
public static IRubyObject waitpid2(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
return waitpid2(context.runtime, args);
}
public static IRubyObject waitpid2(Ruby runtime, IRubyObject[] args) {
int pid = -1;
int flags = 0;
if (args.length > 0) {
pid = (int)args[0].convertToInteger().getLongValue();
}
if (args.length > 1) {
flags = (int)args[1].convertToInteger().getLongValue();
}
IRubyObject pid = waitpid(context, recv, args);

int[] status = new int[1];
pid = checkErrno(runtime, runtime.getPosix().waitpid(pid, status, flags), ECHILD);
if (pid.isNil()) return pid;

return runtime.newArray(runtime.newFixnum(pid), RubyProcess.RubyStatus.newProcessStatus(runtime, status[0], pid));
return context.runtime.newArray(pid, context.getLastExitStatus());
}

public static IRubyObject waitpid2(Ruby runtime, IRubyObject[] args) {
return waitpid2(runtime.getCurrentContext(), runtime.getProcess(), args);
}

@JRubyMethod(name = "initgroups", required = 2, module = true, visibility = PRIVATE)
@@ -1346,4 +1335,9 @@ private static void raiseErrnoIfSet(Ruby runtime, NonNativeErrno nonNative) {
throw runtime.newErrnoFromInt(runtime.getPosix().errno());
}
}

@Deprecated
public static IRubyObject waitpid2(IRubyObject recv, IRubyObject[] args) {
return waitpid2(recv.getRuntime(), args);
}
}
6 changes: 3 additions & 3 deletions core/src/main/java/org/jruby/ext/socket/Option.java
View file
Original file line number Diff line number Diff line change
@@ -170,9 +170,9 @@ public IRubyObject rb_int(ThreadContext context, IRubyObject self) {
return context.nil;
}

@JRubyMethod
public IRubyObject rb_int(ThreadContext context) {
return context.nil;
@JRubyMethod(name = "int")
public IRubyObject asInt(ThreadContext context) {
return context.getRuntime().newFixnum((int) intData);
}

@JRubyMethod(meta = true)
2 changes: 2 additions & 0 deletions core/src/main/java/org/jruby/ext/socket/RubyTCPServer.java
View file
Original file line number Diff line number Diff line change
@@ -101,6 +101,8 @@ public IRubyObject initialize(ThreadContext context, IRubyObject[] args) {
InetAddress addr = InetAddress.getByName(host);

ServerSocketChannel ssc = ServerSocketChannel.open();
ssc.socket().setReuseAddress(true);

InetSocketAddress socket_address = new InetSocketAddress(addr, port);

ssc.socket().bind(socket_address);
4 changes: 4 additions & 0 deletions core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java
View file
Original file line number Diff line number Diff line change
@@ -648,6 +648,10 @@ private String resolveScript(String scriptName) {
if (result != null) return scriptName;// use relative filename
result = resolve(config.getJRubyHome() + "/bin", scriptName);
if (result != null) return result;
// since the current directory is also on the classpath we
// want to find it on filesystem first
result = resolve(config.getCurrentDirectory() + "/bin", scriptName);
if (result != null) return result;
result = resolve("uri:classloader:/bin", scriptName);
if (result != null) return result;

3 changes: 2 additions & 1 deletion core/src/main/ruby/jruby/jruby.rb
View file
Original file line number Diff line number Diff line change
@@ -90,7 +90,8 @@ def compile(content = nil, filename = (default_filename = true; '-'), extra_posi
irscope = compile_ir(content, filename)

visitor = org.jruby.ir.targets.JVMVisitor.new
bytes = visitor.compile_to_bytecode(irscope);
context = org.jruby.ir.targets.JVMVisitorMethodContext.new
bytes = visitor.compile_to_bytecode(irscope, context)
static_scope = irscope.static_scope;
top_self = runtime.top_self
static_scope.module = top_self.class
61 changes: 32 additions & 29 deletions maven/jruby-complete/src/it/GH-1983_jruby-completedotjar-S-irb-doesnt-work-anymore/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -4,43 +4,46 @@
<version>1</version>
<modelVersion>4.0.0</modelVersion>

<dependencies>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
<version>@project.version@</version>
<type>jar</type>
</dependency>
</dependencies>

<build>
<resources>
<resource>
<directory>../../local-repo/org/jruby/jruby-complete/@project.version@</directory>
<includes>
<include>jruby-complete-*.jar</include>
</includes>
<targetPath>${project.basedir}</targetPath>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy jruby-complete.jar</id>
<phase>process-resources</phase>
<goals><goal>copy</goal></goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
<version>${jruby.version}</version>
<type>jar</type>
<outputDirectory>${project.basedir}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2</version>
<executions>
<execution>
<phase>package</phase>
<goals><goal>exec</goal></goals>
<executions>
<execution>
<phase>package</phase>
<goals><goal>exec</goal></goals>
<configuration>
<executable>sh</executable>
<arguments>
<argument>irb.sh</argument>
<argument>@project.version@</argument>
</arguments>
</configuration>
</execution>
</executions>
<arguments>
<argument>irb.sh</argument>
<argument>${jruby.version}</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
6 changes: 3 additions & 3 deletions maven/jruby-complete/src/it/extended/Mavenfile
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#-*- mode: ruby -*-

properties( 'polyglot.dump.pom' => 'pom.xml',
'jruby.version' => '@project.version@',
'jruby.plugins.version' => '1.0.8',
# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '1.0.10',
'project.build.sourceEncoding' => 'utf-8',
'jruby.home' => '${basedir}/../../../../..' )

phase :package do
104 changes: 0 additions & 104 deletions maven/jruby-complete/src/it/extended/pom.xml
View file

This file was deleted.

121 changes: 62 additions & 59 deletions maven/jruby-complete/src/it/hello world/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,83 +1,86 @@
<project>
<groupId>org.jruby</groupId>
<groupId>org.jruby.test</groupId>
<artifactId>it-hello</artifactId>
<version>1</version>
<modelVersion>4.0.0</modelVersion>

<dependencies>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
<version>@project.version@</version>
<type>jar</type>
</dependency>
</dependencies>

<build>
<resources>
<resource>
<directory>../../local-repo/org/jruby/jruby-complete/@project.version@</directory>
<includes>
<include>jruby-complete-*.jar</include>
</includes>
<targetPath>${project.basedir}</targetPath>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy jruby-complete.jar</id>
<phase>process-resources</phase>
<goals><goal>copy</goal></goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
<version>${jruby.version}</version>
<type>jar</type>
<outputDirectory>${project.basedir}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2</version>
<executions>
<execution>
<id>simple</id>
<phase>process-resources</phase>
<goals><goal>exec</goal></goals>
<executions>
<execution>
<id>simple</id>
<phase>process-resources</phase>
<goals><goal>exec</goal></goals>
<configuration>
<executable>java</executable>
<arguments>
<!--
<argument>-Djruby.debug.loadService=true</argument>
-->
<argument>-jar</argument>
<argument>jruby-complete-@project.version@.jar</argument>
<argument>-e</argument>
<!-- make sure openssl loads -->
<argument>
puts 'hello world'
puts 'openssl loaded' if require 'openssl'
p OpenSSL::VERSION
puts 'readline loaded' if require 'readline'
p Java::jline.console.ConsoleReader
</argument>
<!--
<argument>-Djruby.debug.loadService=true</argument>
-->
<argument>-jar</argument>
<argument>jruby-complete-${jruby.version}.jar</argument>
<argument>-e</argument>
<!-- make sure openssl loads -->
<argument>
puts 'hello world'
puts 'openssl loaded' if require 'openssl'
p OpenSSL::VERSION
puts 'readline loaded' if require 'readline'
p Java::jline.console.ConsoleReader
</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>load_path</id>
<phase>process-resources</phase>
<goals><goal>exec</goal></goals>
</execution>
<execution>
<id>load_path</id>
<phase>process-resources</phase>
<goals><goal>exec</goal></goals>
<configuration>
<executable>java</executable>
<arguments>
<argument>-jar</argument>
<argument>jruby-complete-@project.version@.jar</argument>
<argument>-e</argument>
<!-- make sure openssl loads -->
<argument>
orig = $LOAD_PATH.clone
$LOAD_PATH.clear
orig.each {|s| $LOAD_PATH.push s.gsub('%20', ' ')}
puts 'hello world - 2'
puts 'openssl loaded - 2' if require 'openssl'
p OpenSSL::VERSION
puts 'readline loaded - 2' if require 'readline'
p Java::jline.console.ConsoleReader
</argument>
<argument>-jar</argument>
<argument>jruby-complete-${jruby.version}.jar</argument>
<argument>-e</argument>
<!-- make sure openssl loads -->
<argument>
orig = $LOAD_PATH.clone
$LOAD_PATH.clear
orig.each {|s| $LOAD_PATH.push s.gsub('%20', ' ')}
puts 'hello world - 2'
puts 'openssl loaded - 2' if require 'openssl'
p OpenSSL::VERSION
puts 'readline loaded - 2' if require 'readline'
p Java::jline.console.ConsoleReader
</argument>
</arguments>
</configuration>
</execution>
</executions>
</execution>
</executions>
</plugin>
</plugins>
</build>
19 changes: 19 additions & 0 deletions maven/jruby-complete/src/it/integrity/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -178,6 +178,25 @@
</arguments>
</configuration>
</execution>
<execution>
<id>-S me - GH-3233</id>
<phase>test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>java</executable>
<arguments>
<argument>-classpath</argument>
<argument>.</argument>
<argument>-classpath</argument>
<classpath/>
<argument>org.jruby.Main</argument>
<argument>-S</argument>
<argument>me</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
5 changes: 5 additions & 0 deletions maven/jruby-complete/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -48,3 +48,8 @@ if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = basedir + "/bin/me";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
35 changes: 0 additions & 35 deletions maven/jruby-complete/src/it/settings.xml
View file

This file was deleted.

16 changes: 5 additions & 11 deletions maven/jruby-complete/src/templates/osgi_many_bundles_with_embedded_gems/gems-bundle/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -6,18 +6,12 @@

packaging 'bundle'

jar 'org.osgi:org.osgi.core', '5.0.0', :scope => :provided
# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '1.0.10',
# needed bundle plugin
'polyglot.dump.pom' => 'pom.xml' )

jruby_plugin! :gem, :includeRubygemsInResources => true

# ruby-maven will dump an equivalent pom.xml
properties( 'tesla.dump.pom' => 'pom.xml',
'jruby.home' => '${project.basedir}/../../../../../../' )

execute 'jrubydir', 'process-resources' do |ctx|
require 'jruby/commands'
JRuby::Commands.generate_dir_info( ctx.project.build.directory.to_pathname + '/rubygems' )
end
jruby_plugin! :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0'

plugin( 'org.apache.felix:maven-bundle-plugin', '2.4.0',
:instructions => {
125 changes: 0 additions & 125 deletions maven/jruby-complete/src/templates/osgi_many_bundles_with_embedded_gems/gems-bundle/pom.xml
View file

This file was deleted.

6 changes: 6 additions & 0 deletions maven/jruby-complete/src/templates/osgi_many_bundles_with_embedded_gems/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
#-*- mode: ruby -*-

id 'org.jruby.test:osgi-complete:1'

packaging :pom

# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '1.0.10',
'project.build.sourceEncoding' => 'utf-8' )

modules [ 'gems-bundle', 'scripts-bundle', 'test' ]
15 changes: 3 additions & 12 deletions maven/jruby-complete/src/templates/osgi_many_bundles_with_embedded_gems/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>no_group_id_given</groupId>
<artifactId>osgi_many_bundles_with_embedded_gems</artifactId>
<groupId>dummy</groupId>
<artifactId>dummy</artifactId>
<version>0.0.0</version>
<packaging>pom</packaging>
<name>osgi_many_bundles_with_embedded_gems</name>
<modules>
<module>gems-bundle</module>
<module>scripts-bundle</module>
<module>test</module>
</modules>
</project>
3 changes: 2 additions & 1 deletion ...n/jruby-complete/src/templates/osgi_many_bundles_with_embedded_gems/scripts-bundle/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,8 @@

packaging 'bundle'

jar 'org.osgi:org.osgi.core', '5.0.0', :scope => :provided
properties( # needed bundle plugin
'polyglot.dump.pom' => 'pom.xml' )

# add some ruby scripts to bundle
resource :directory => 'src/main/ruby'
40 changes: 0 additions & 40 deletions .../jruby-complete/src/templates/osgi_many_bundles_with_embedded_gems/scripts-bundle/pom.xml
View file

This file was deleted.

5 changes: 2 additions & 3 deletions maven/jruby-complete/src/templates/osgi_many_bundles_with_embedded_gems/test/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
#-*- mode: ruby -*-

properties( 'tesla.dump.pom' => 'pom.xml',
'exam.version' => '3.0.3',
properties( 'exam.version' => '3.0.3',
'url.version' => '1.5.2',
'logback.version' => '1.0.13' )

bundle 'org.jruby:jruby-complete', '@project.version@'
bundle 'org.jruby:jruby-complete', '${jruby.version}'
bundle 'org.jruby.osgi:gems-bundle', '1.0'
bundle 'org.jruby.osgi:scripts-bundle', '1.0'

156 changes: 0 additions & 156 deletions maven/jruby-complete/src/templates/osgi_many_bundles_with_embedded_gems/test/pom.xml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...s_with_embedded_gems/test/src/test/java/org/jruby/embed/osgi/test/JRubyOsgiEmbedTest.java
View file
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ public Option[] config() {
return options(
junitBundles(),
systemProperty("org.ops4j.pax.url.mvn.localRepository").value(System.getProperty( "maven.repo.local" )),
mavenBundle("org.jruby", "jruby-complete", System.getProperty("project.version")),
mavenBundle("org.jruby", "jruby-complete", System.getProperty("jruby.version")),
mavenBundle("org.jruby.osgi", "gems-bundle", "1.0"),
mavenBundle("org.jruby.osgi", "scripts-bundle", "1.0")
);
35 changes: 0 additions & 35 deletions maven/jruby-dist/src/it/settings.xml
View file

This file was deleted.

2 changes: 0 additions & 2 deletions maven/jruby-dist/src/it/sources/invoker.properties
View file

This file was deleted.

15 changes: 0 additions & 15 deletions maven/jruby-dist/src/it/sources/verify.bsh
View file

This file was deleted.

6 changes: 2 additions & 4 deletions maven/jruby-jars/src/it/extended/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# jruby scripting container
jar 'org.jruby:jruby-core', '@project.version@'
jar 'org.jruby:jruby-stdlib', '@project.version@'
jar 'org.jruby:jruby-core', '${jruby.version}'
jar 'org.jruby:jruby-stdlib', '${jruby.version}'

# unit tests
jar 'junit:junit', '4.8.2', :scope => :test

properties 'tesla.dump.pom' => 'pom.xml', 'tesla.dump.readOnly' => true

plugin :surefire, '2.15', :reuseForks => false, :additionalClasspathElements => [ '${basedir}/../../../../../core/target/test-classes', '${basedir}/../../../../../test/target/test-classes' ]
46 changes: 3 additions & 43 deletions maven/jruby-jars/src/it/extended/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,46 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>no_group_id_given</groupId>
<artifactId>extended</artifactId>
<groupId>dummy</groupId>
<artifactId>dummy</artifactId>
<version>0.0.0</version>
<name>extended</name>
<properties>
<tesla.dump.readOnly>true</tesla.dump.readOnly>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
</properties>
<dependencies>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-core</artifactId>
<version>@project.version@</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-stdlib</artifactId>
<version>@project.version@</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.15</version>
<configuration>
<reuseFork>false</reuseFork>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../../../../../core/target/test-classes</additionalClasspathElement>
<additionalClasspathElement>${basedir}/../../../../../test/target/test-classes</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
</plugins>
</build>
</project>
35 changes: 0 additions & 35 deletions maven/jruby-jars/src/it/settings.xml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion maven/jruby/src/it/extended/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# jruby scripting container
pom 'org.jruby:jruby', '@project.version@'
pom 'org.jruby:jruby', '${jruby.version}'

# unit tests
jar 'junit:junit', '4.8.2', :scope => :test
14 changes: 3 additions & 11 deletions maven/jruby/src/it/j2ee_jetty/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# it is war-file
packaging 'war'

# get jruby dependencies
properties( 'jruby.version' => '@project.version@',
# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '1.0.10',
'project.build.sourceEncoding' => 'utf-8' )

pom( 'org.jruby:jruby', '${jruby.version}' )
@@ -13,17 +13,9 @@
repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
:id => 'rubygems-releases' )

jruby_plugin :gem, :includeRubygemsInResources => true do
jruby_plugin :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do
execute_goal :initialize
end
execute 'jrubydir', 'initialize' do |ctx|
require 'jruby/commands'
JRuby::Commands.generate_dir_info( ctx.project.build.directory.to_pathname + '/rubygems' )
end

# ruby-maven will dump an equivalent pom.xml
properties( 'tesla.dump.pom' => 'pom.xml',
'jruby.home' => '../../../../../' )

# start jetty for the tests
plugin( 'org.eclipse.jetty:jetty-maven-plugin', '9.1.3.v20140225',
133 changes: 3 additions & 130 deletions maven/jruby/src/it/j2ee_jetty/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,133 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>no_group_id_given</groupId>
<artifactId>j2ee_jetty</artifactId>
<groupId>dummy</groupId>
<artifactId>dummy</artifactId>
<version>0.0.0</version>
<packaging>war</packaging>
<name>j2ee_jetty</name>
<properties>
<jruby.home>../../../../../</jruby.home>
<jruby.version>@project.version@</jruby.version>
<jruby.plugins.version>1.0.3</jruby.plugins.version>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<tesla.version>0.1.1</tesla.version>
</properties>
<dependencies>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
<version>${jruby.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>flickraw</artifactId>
<version>0.9.7</version>
<type>gem</type>
</dependency>
</dependencies>
<repositories>
<repository>
<id>rubygems-releases</id>
<url>http://rubygems-proxy.torquebox.org/releases</url>
</repository>
</repositories>
<build>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>${jruby.plugins.version}</version>
<executions>
<execution>
<goals>
<goal>initialize</goal>
</goals>
</execution>
</executions>
<configuration>
<includeRubygemsInResources>true</includeRubygemsInResources>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.1.3.v20140225</version>
<executions>
<execution>
<id>start jetty</id>
<phase>pre-integration-test</phase>
<goals>
<goal>start</goal>
</goals>
<configuration>
<daemon>true</daemon>
</configuration>
</execution>
<execution>
<id>stop jetty</id>
<phase>post-integration-test</phase>
<goals>
<goal>stop</goal>
</goals>
</execution>
</executions>
<configuration>
<path>/</path>
<stopPort>9999</stopPort>
<stopKey>foo</stopKey>
</configuration>
</plugin>
<plugin>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-maven-plugin</artifactId>
<version>${tesla.version}</version>
<executions>
<execution>
<id>jrubydir</id>
<phase>initialize</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<taskId>jrubydir</taskId>
<nativePom>pom.rb</nativePom>
</configuration>
</execution>
<execution>
<id>download</id>
<phase>integration-test</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<taskId>download</taskId>
<nativePom>pom.rb</nativePom>
</configuration>
</execution>
<execution>
<id>check download</id>
<phase>verify</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<taskId>check download</taskId>
<nativePom>pom.rb</nativePom>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-ruby</artifactId>
<version>${tesla.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
1 change: 0 additions & 1 deletion maven/jruby/src/it/j2ee_jetty_rack/.gitignore
View file

This file was deleted.

4 changes: 1 addition & 3 deletions maven/jruby/src/it/j2ee_jetty_rack/.jrubydir
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
.
config.ru
gems
specifications
config.ru
8 changes: 2 additions & 6 deletions maven/jruby/src/it/j2ee_jetty_rack/Mavenfile
View file
Original file line number Diff line number Diff line change
@@ -8,22 +8,18 @@ properties( 'jruby.plugins.version' => '1.0.10',
'project.build.sourceEncoding' => 'utf-8',
'public.dir' => '${basedir}/public' )

pom( 'org.jruby:jruby', '@project.version@' )
pom( 'org.jruby:jruby', '${jruby.version}' )

jar( 'org.jruby.rack:jruby-rack', '1.1.18',
:exclusions => [ 'org.jruby:jruby-complete' ] )


# ruby-maven will dump an equivalent pom.xml
properties[ 'tesla.dump.pom' ] = 'pom.xml'

# a gem to be used
gem 'flickraw', '0.9.7'

repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
:id => 'rubygems-releases' )

jruby_plugin :gem, :includeRubygemsInResources => true, :includeLibDirectoryInResources => true, :jrubyVersion => '1.7.19' do
jruby_plugin :gem, :includeRubygemsInResources => true, :includeLibDirectoryInResources => true, :jrubyVersion => '9.0.0.0' do
execute_goal :initialize
end

151 changes: 3 additions & 148 deletions maven/jruby/src/it/j2ee_jetty_rack/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,151 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>no_group_id_given</groupId>
<artifactId>j2ee_jetty_rack</artifactId>
<groupId>dummy</groupId>
<artifactId>dummy</artifactId>
<version>0.0.0</version>
<packaging>war</packaging>
<name>j2ee_jetty_rack</name>
<properties>
<jruby.plugins.version>1.0.10</jruby.plugins.version>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
<public.dir>${basedir}/public</public.dir>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<tesla.version>0.1.1</tesla.version>
</properties>
<dependencies>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
<version>@project.version@</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.jruby.rack</groupId>
<artifactId>jruby-rack</artifactId>
<version>1.1.18</version>
<exclusions>
<exclusion>
<artifactId>jruby-complete</artifactId>
<groupId>org.jruby</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>flickraw</artifactId>
<version>0.9.7</version>
<type>gem</type>
</dependency>
</dependencies>
<repositories>
<repository>
<id>rubygems-releases</id>
<url>http://rubygems-proxy.torquebox.org/releases</url>
</repository>
</repositories>
<build>
<resources>
<resource>
<directory>${basedir}</directory>
<includes>
<include>config.ru</include>
<include>.jrubydir</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>${jruby.plugins.version}</version>
<executions>
<execution>
<goals>
<goal>initialize</goal>
</goals>
</execution>
</executions>
<configuration>
<includeRubygemsInResources>true</includeRubygemsInResources>
<includeLibDirectoryInResources>true</includeLibDirectoryInResources>
<jrubyVersion>1.7.19</jrubyVersion>
</configuration>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.2</version>
<configuration>
<warSourceDirectory>${public.dir}</warSourceDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.1.3.v20140225</version>
<executions>
<execution>
<id>start jetty</id>
<phase>pre-integration-test</phase>
<goals>
<goal>start</goal>
</goals>
<configuration>
<daemon>true</daemon>
</configuration>
</execution>
<execution>
<id>stop jetty</id>
<phase>post-integration-test</phase>
<goals>
<goal>stop</goal>
</goals>
</execution>
</executions>
<configuration>
<path>/</path>
<webAppSourceDirectory>${public.dir}</webAppSourceDirectory>
<stopPort>9999</stopPort>
<stopKey>foo</stopKey>
</configuration>
</plugin>
<plugin>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-maven-plugin</artifactId>
<version>${tesla.version}</version>
<executions>
<execution>
<id>download</id>
<phase>integration-test</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<taskId>download</taskId>
<nativePom>Mavenfile</nativePom>
</configuration>
</execution>
<execution>
<id>check download</id>
<phase>verify</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<taskId>check download</taskId>
<nativePom>Mavenfile</nativePom>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-ruby</artifactId>
<version>${tesla.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
17 changes: 6 additions & 11 deletions maven/jruby/src/it/j2ee_tomcat/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# it is war-file
packaging 'war'

# get jruby dependencies
properties( 'jruby.version' => '@project.version@',
# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '1.0.10',
'project.build.sourceEncoding' => 'utf-8' )

pom( 'org.jruby:jruby', '${jruby.version}' )
@@ -13,24 +13,19 @@
repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
:id => 'rubygems-releases' )

jruby_plugin :gem, :includeRubygemsInResources => true do
jruby_plugin :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do
execute_goal :initialize
end
execute 'jrubydir', 'initialize' do |ctx|
require 'jruby/commands'
JRuby::Commands.generate_dir_info( ctx.project.build.directory.to_pathname + '/rubygems' )
end

# ruby-maven will dump an equivalent pom.xml
properties( 'tesla.dump.pom' => 'pom.xml',
'jruby.home' => '../../../../../' )

# start tomcat for the tests
plugin( 'org.codehaus.mojo:tomcat-maven-plugin', '1.1',
:fork => true, :path => '/' ) do
execute_goals( 'run',
:id => 'run-tomcat',
:phase => 'pre-integration-test' )
execute_goals( 'shutdown',
:id => 'shutdown-tomcat',
:phase => 'post-integration-test' )
end

# download files during the tests
122 changes: 3 additions & 119 deletions maven/jruby/src/it/j2ee_tomcat/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,122 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>no_group_id_given</groupId>
<artifactId>j2ee_tomcat</artifactId>
<groupId>dummy</groupId>
<artifactId>dummy</artifactId>
<version>0.0.0</version>
<packaging>war</packaging>
<name>j2ee_tomcat</name>
<properties>
<jruby.home>../../../../../</jruby.home>
<jruby.version>@project.version@</jruby.version>
<jruby.plugins.version>1.0.3</jruby.plugins.version>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<tesla.version>0.1.1</tesla.version>
</properties>
<dependencies>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
<version>${jruby.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>flickraw</artifactId>
<version>0.9.7</version>
<type>gem</type>
</dependency>
</dependencies>
<repositories>
<repository>
<id>rubygems-releases</id>
<url>http://rubygems-proxy.torquebox.org/releases</url>
</repository>
</repositories>
<build>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>${jruby.plugins.version}</version>
<executions>
<execution>
<goals>
<goal>initialize</goal>
</goals>
</execution>
</executions>
<configuration>
<includeRubygemsInResources>true</includeRubygemsInResources>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
<version>1.1</version>
<executions>
<execution>
<id>run-tomcat</id>
<phase>pre-integration-test</phase>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
<configuration>
<fork>true</fork>
<path>/</path>
</configuration>
</plugin>
<plugin>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-maven-plugin</artifactId>
<version>${tesla.version}</version>
<executions>
<execution>
<id>jrubydir</id>
<phase>initialize</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<taskId>jrubydir</taskId>
<nativePom>pom.rb</nativePom>
</configuration>
</execution>
<execution>
<id>download</id>
<phase>integration-test</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<taskId>download</taskId>
<nativePom>pom.rb</nativePom>
</configuration>
</execution>
<execution>
<id>check download</id>
<phase>verify</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<taskId>check download</taskId>
<nativePom>pom.rb</nativePom>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-ruby</artifactId>
<version>${tesla.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
1 change: 0 additions & 1 deletion maven/jruby/src/it/j2ee_tomcat_rack/.gitignore
View file

This file was deleted.

4 changes: 1 addition & 3 deletions maven/jruby/src/it/j2ee_tomcat_rack/.jrubydir
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
.
config.ru
gems
specifications
config.ru
11 changes: 5 additions & 6 deletions maven/jruby/src/it/j2ee_tomcat_rack/Mavenfile
View file
Original file line number Diff line number Diff line change
@@ -8,22 +8,18 @@ properties( 'jruby.plugins.version' => '1.0.10',
'project.build.sourceEncoding' => 'utf-8',
'public.dir' => '${basedir}/public' )

pom( 'org.jruby:jruby', '@project.version@' )
pom( 'org.jruby:jruby', '${jruby.version}' )

jar( 'org.jruby.rack:jruby-rack', '1.1.18',
:exclusions => [ 'org.jruby:jruby-complete' ] )


# ruby-maven will dump an equivalent pom.xml
properties[ 'tesla.dump.pom' ] = 'pom.xml'

# a gem to be used
gem 'flickraw', '0.9.7'

repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
:id => 'rubygems-releases' )

jruby_plugin :gem, :includeRubygemsInResources => true, :includeLibDirectoryInResources => true, :jrubyVersion => '1.7.19' do
jruby_plugin :gem, :includeRubygemsInResources => true, :includeLibDirectoryInResources => true, :jrubyVersion => '9.0.0.0' do
execute_goal :initialize
end

@@ -41,6 +37,9 @@ plugin( 'org.codehaus.mojo:tomcat-maven-plugin', '1.1',
execute_goals( 'run',
:id => 'run-tomcat',
:phase => 'pre-integration-test' )
execute_goals( 'shutdown',
:id => 'shutdown-tomcat',
:phase => 'post-integration-test' )
end

# download files during the tests
140 changes: 3 additions & 137 deletions maven/jruby/src/it/j2ee_tomcat_rack/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,140 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>no_group_id_given</groupId>
<artifactId>j2ee_tomcat_rack</artifactId>
<groupId>dummy</groupId>
<artifactId>dummy</artifactId>
<version>0.0.0</version>
<packaging>war</packaging>
<name>j2ee_tomcat_rack</name>
<properties>
<jruby.plugins.version>1.0.10</jruby.plugins.version>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
<public.dir>${basedir}/public</public.dir>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<tesla.version>0.1.1</tesla.version>
</properties>
<dependencies>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
<version>@project.version@</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.jruby.rack</groupId>
<artifactId>jruby-rack</artifactId>
<version>1.1.18</version>
<exclusions>
<exclusion>
<artifactId>jruby-complete</artifactId>
<groupId>org.jruby</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>flickraw</artifactId>
<version>0.9.7</version>
<type>gem</type>
</dependency>
</dependencies>
<repositories>
<repository>
<id>rubygems-releases</id>
<url>http://rubygems-proxy.torquebox.org/releases</url>
</repository>
</repositories>
<build>
<resources>
<resource>
<directory>${basedir}</directory>
<includes>
<include>config.ru</include>
<include>.jrubydir</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>${jruby.plugins.version}</version>
<executions>
<execution>
<goals>
<goal>initialize</goal>
</goals>
</execution>
</executions>
<configuration>
<includeRubygemsInResources>true</includeRubygemsInResources>
<includeLibDirectoryInResources>true</includeLibDirectoryInResources>
<jrubyVersion>1.7.19</jrubyVersion>
</configuration>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.2</version>
<configuration>
<warSourceDirectory>${public.dir}</warSourceDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
<version>1.1</version>
<executions>
<execution>
<id>run-tomcat</id>
<phase>pre-integration-test</phase>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
<configuration>
<fork>true</fork>
<path>/</path>
<warSourceDirectory>${public.dir}</warSourceDirectory>
</configuration>
</plugin>
<plugin>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-maven-plugin</artifactId>
<version>${tesla.version}</version>
<executions>
<execution>
<id>download</id>
<phase>integration-test</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<taskId>download</taskId>
<nativePom>Mavenfile</nativePom>
</configuration>
</execution>
<execution>
<id>check download</id>
<phase>verify</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<taskId>check download</taskId>
<nativePom>Mavenfile</nativePom>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-ruby</artifactId>
<version>${tesla.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
15 changes: 3 additions & 12 deletions maven/jruby/src/it/j2ee_wildfly/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# it is war-file
packaging 'war'

# get jruby dependencies
properties( 'jruby.version' => '@project.version@',
# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '1.0.10',
'project.build.sourceEncoding' => 'utf-8' )

pom( 'org.jruby:jruby', '${jruby.version}' )
@@ -13,19 +13,10 @@
repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
:id => 'rubygems-releases' )

jruby_plugin :gem, :includeRubygemsInResources => true do
jruby_plugin :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do
execute_goal :initialize
end

execute 'jrubydir', 'initialize' do |ctx|
require 'jruby/commands'
JRuby::Commands.generate_dir_info( ctx.project.build.directory.to_pathname + '/rubygems' )
end

# ruby-maven will dump an equivalent pom.xml
properties( 'tesla.dump.pom' => 'pom.xml',
'jruby.home' => '../../../../../' )

plugin( 'org.wildfly.plugins:wildfly-maven-plugin:1.0.2.Final' ) do
execute_goals( :start,
:id => 'wildfly-start',
126 changes: 3 additions & 123 deletions maven/jruby/src/it/j2ee_wildfly/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,126 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>no_group_id_given</groupId>
<artifactId>j2ee_wildfly</artifactId>
<groupId>dummy</groupId>
<artifactId>dummy</artifactId>
<version>0.0.0</version>
<packaging>war</packaging>
<name>j2ee_wildfly</name>
<properties>
<jruby.home>../../../../../</jruby.home>
<jruby.version>@project.version@</jruby.version>
<jruby.plugins.version>1.0.3</jruby.plugins.version>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<tesla.version>0.1.1</tesla.version>
</properties>
<dependencies>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
<version>${jruby.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>virtus</artifactId>
<version>0.5.5</version>
<type>gem</type>
</dependency>
</dependencies>
<repositories>
<repository>
<id>rubygems-releases</id>
<url>http://rubygems-proxy.torquebox.org/releases</url>
</repository>
</repositories>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>${jruby.plugins.version}</version>
<executions>
<execution>
<goals>
<goal>initialize</goal>
</goals>
</execution>
</executions>
<configuration>
<includeRubygemsInResources>true</includeRubygemsInResources>
</configuration>
</plugin>
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<version>1.0.2.Final</version>
<executions>
<execution>
<id>wildfly-start</id>
<phase>pre-integration-test</phase>
<goals>
<goal>start</goal>
</goals>
</execution>
<execution>
<id>wildfly-stop</id>
<phase>post-integration-test</phase>
<goals>
<goal>shutdown</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-maven-plugin</artifactId>
<version>${tesla.version}</version>
<executions>
<execution>
<id>jrubydir</id>
<phase>initialize</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<taskId>jrubydir</taskId>
<nativePom>pom.rb</nativePom>
</configuration>
</execution>
<execution>
<id>download</id>
<phase>integration-test</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<taskId>download</taskId>
<nativePom>pom.rb</nativePom>
</configuration>
</execution>
<execution>
<id>check download</id>
<phase>verify</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<taskId>check download</taskId>
<nativePom>pom.rb</nativePom>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-ruby</artifactId>
<version>${tesla.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
10 changes: 3 additions & 7 deletions maven/jruby/src/it/jetty/Mavenfile
View file
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@
# it is war-file
packaging 'war'

# get jruby dependencies
properties( 'jruby.version' => '@project.version@',
# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '1.0.10',
'project.build.sourceEncoding' => 'utf-8',
'public.dir' => '${basedir}/public' )

@@ -13,17 +13,13 @@ pom( 'org.jruby:jruby', '${jruby.version}' )
jar( 'org.jruby.rack:jruby-rack', '1.1.14',
:exclusions => [ 'org.jruby:jruby-complete' ] )


# ruby-maven will dump an equivalent pom.xml
properties[ 'tesla.dump.pom' ] = 'pom.xml'

# a gem to be used
gem 'flickraw', '0.9.7'

repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
:id => 'rubygems-releases' )

jruby_plugin :gem, :includeRubygemsInTestResources => false, :includeRubygemsInResources => true, :includeLibDirectoryInResources => true do
jruby_plugin :gem, :includeRubygemsInTestResources => false, :includeRubygemsInResources => true, :includeLibDirectoryInResources => true, :jrubyVersion => '9.0.0.0' do
execute_goal :initialize
end

175 changes: 3 additions & 172 deletions maven/jruby/src/it/jetty/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,175 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>no_group_id_given</groupId>
<artifactId>jetty</artifactId>
<groupId>dummy</groupId>
<artifactId>dummy</artifactId>
<version>0.0.0</version>
<packaging>war</packaging>
<name>jetty</name>
<properties>
<jruby.version>@project.version@</jruby.version>
<jruby.plugins.version>1.0.3</jruby.plugins.version>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
<public.dir>${basedir}/public</public.dir>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<tesla.version>0.1.1</tesla.version>
</properties>
<dependencies>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
<version>${jruby.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.jruby.rack</groupId>
<artifactId>jruby-rack</artifactId>
<version>1.1.14</version>
<exclusions>
<exclusion>
<artifactId>jruby-complete</artifactId>
<groupId>org.jruby</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>flickraw</artifactId>
<version>0.9.7</version>
<type>gem</type>
</dependency>
</dependencies>
<repositories>
<repository>
<id>rubygems-releases</id>
<url>http://rubygems-proxy.torquebox.org/releases</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</pluginRepository>
</pluginRepositories>
<build>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>${jruby.plugins.version}</version>
<executions>
<execution>
<goals>
<goal>initialize</goal>
</goals>
</execution>
</executions>
<configuration>
<includeRubygemsInTestResources>false</includeRubygemsInTestResources>
<includeRubygemsInResources>true</includeRubygemsInResources>
<includeLibDirectoryInResources>true</includeLibDirectoryInResources>
</configuration>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.2</version>
<configuration>
<warSourceDirectory>${public.dir}</warSourceDirectory>
<webResources>
<webResource>
<directory>${basedir}</directory>
<targetPath>WEB-INF</targetPath>
<includes>
<include>config.ru</include>
</includes>
</webResource>
</webResources>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.1.3.v20140225</version>
<executions>
<execution>
<id>start jetty</id>
<phase>pre-integration-test</phase>
<goals>
<goal>start</goal>
</goals>
<configuration>
<daemon>true</daemon>
</configuration>
</execution>
<execution>
<id>stop jetty</id>
<phase>post-integration-test</phase>
<goals>
<goal>stop</goal>
</goals>
</execution>
</executions>
<configuration>
<path>/</path>
<webAppSourceDirectory>${public.dir}</webAppSourceDirectory>
<stopPort>9999</stopPort>
<stopKey>foo</stopKey>
</configuration>
</plugin>
<plugin>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-maven-plugin</artifactId>
<version>${tesla.version}</version>
<executions>
<execution>
<id>copy config.ru for jruby-rack to find</id>
<phase>initialize</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<taskId>copy config.ru for jruby-rack to find</taskId>
<nativePom>Mavenfile</nativePom>
</configuration>
</execution>
<execution>
<id>download</id>
<phase>integration-test</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<taskId>download</taskId>
<nativePom>Mavenfile</nativePom>
</configuration>
</execution>
<execution>
<id>check download</id>
<phase>verify</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<taskId>check download</taskId>
<nativePom>Mavenfile</nativePom>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-ruby</artifactId>
<version>${tesla.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion maven/jruby/src/it/many_jars_with_embedded_gems/app/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
jar 'org.rubygems:zip', '2.0.2'

# jruby scripting container
pom 'org.jruby:jruby', '@project.version@'
pom 'org.jruby:jruby', '${jruby.version}'

# unit tests
jar 'junit:junit', '4.8.2', :scope => :test
40 changes: 0 additions & 40 deletions maven/jruby/src/it/many_jars_with_embedded_gems/app/pom.xml
View file

This file was deleted.

3 changes: 3 additions & 0 deletions maven/jruby/src/it/many_jars_with_embedded_gems/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#-*- mode: ruby -*-

# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '1.0.10' )

packaging :pom

modules [ 'zip_gem', 'app' ]
14 changes: 3 additions & 11 deletions maven/jruby/src/it/many_jars_with_embedded_gems/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>no_group_id_given</groupId>
<artifactId>many_jars_with_embedded_gems</artifactId>
<groupId>dummy</groupId>
<artifactId>dummy</artifactId>
<version>0.0.0</version>
<packaging>pom</packaging>
<name>many_jars_with_embedded_gems</name>
<modules>
<module>zip_gem</module>
<module>app</module>
</modules>
</project>
2 changes: 1 addition & 1 deletion maven/jruby/src/it/many_jars_with_embedded_gems/zip_gem/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -4,4 +4,4 @@

id 'org.rubygems:zip', VERSION

jruby_plugin! :gem, :includeRubygemsInResources => true
jruby_plugin! :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0'
47 changes: 0 additions & 47 deletions maven/jruby/src/it/many_jars_with_embedded_gems/zip_gem/pom.xml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion maven/jruby/src/it/many_jars_with_embedded_gems_ng/app/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
jar 'org.rubygems:gem2', '2'

# jruby scripting container
pom 'org.jruby:jruby', '@project.version@'
pom 'org.jruby:jruby', '${jruby.version}'

# unit tests
jar 'junit:junit', '4.8.2', :scope => :test
40 changes: 0 additions & 40 deletions maven/jruby/src/it/many_jars_with_embedded_gems_ng/app/pom.xml
View file

This file was deleted.

10 changes: 1 addition & 9 deletions maven/jruby/src/it/many_jars_with_embedded_gems_ng/gem1/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,4 @@

id 'org.rubygems:gem1', '1'

jruby_plugin! :gem, :includeRubygemsInResources => true

execute 'jrubydir', 'initialize' do |ctx|
require 'jruby/commands'
JRuby::Commands.generate_dir_info( ctx.project.build.directory.to_pathname + '/rubygems' )
end

properties( 'tesla.dump.pom' => 'pom.xml',
'jruby.home' => '../../../../../' )
jruby_plugin! :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0'
75 changes: 0 additions & 75 deletions maven/jruby/src/it/many_jars_with_embedded_gems_ng/gem1/pom.xml
View file

This file was deleted.

10 changes: 1 addition & 9 deletions maven/jruby/src/it/many_jars_with_embedded_gems_ng/gem2/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,4 @@

id 'org.rubygems:gem2', '2'

jruby_plugin! :gem, :includeRubygemsInResources => true

execute 'jrubydir', 'initialize' do |ctx|
require 'jruby/commands'
JRuby::Commands.generate_dir_info( ctx.project.build.directory.to_pathname + '/rubygems' )
end

properties( 'tesla.dump.pom' => 'pom.xml',
'jruby.home' => '../../../../../' )
jruby_plugin! :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0'
75 changes: 0 additions & 75 deletions maven/jruby/src/it/many_jars_with_embedded_gems_ng/gem2/pom.xml
View file

This file was deleted.

3 changes: 3 additions & 0 deletions maven/jruby/src/it/many_jars_with_embedded_gems_ng/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#-*- mode: ruby -*-

# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '1.0.10' )

packaging :pom

modules [ 'gem1', 'gem2', 'app' ]
15 changes: 3 additions & 12 deletions maven/jruby/src/it/many_jars_with_embedded_gems_ng/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>no_group_id_given</groupId>
<artifactId>many_jars_with_embedded_gems_ng</artifactId>
<groupId>dummy</groupId>
<artifactId>dummy</artifactId>
<version>0.0.0</version>
<packaging>pom</packaging>
<name>many_jars_with_embedded_gems_ng</name>
<modules>
<module>gem1</module>
<module>gem2</module>
<module>app</module>
</modules>
</project>
10 changes: 4 additions & 6 deletions maven/jruby/src/it/runnable/Mavenfile
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
#-*- mode: ruby -*-

properties( 'tesla.dump.pom' => 'pom.xml',
'tesla.dump.readOnly' => true,
'jruby.version' => '@project.version@',
'jruby.plugins.version' => '1.0.10' )
# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '1.0.10' )

gemfile

@@ -22,7 +20,7 @@ files = [ '.rspec', '*.rb', 'config.ru', '*file', '*file.lock', '.jbundler/class
jruby_plugin!( :gem,
# need a jruby-complete from maven central here
# TODO fix plugin to use the one from compile-artifacts
:jrubyVersion => '1.7.19',
:jrubyVersion => '9.0.0.0',
:includeRubygemsInResources => true ) do
execute_goals( 'generate-resources', 'process-resources', :includeBinStubs => true, :includeRubyResources => files )
end
@@ -54,7 +52,7 @@ if File.file?('Jarfile.lock')
end
end

plugin :shade do
plugin :shade, '2.1' do
execute_goals( 'shade',
:id => 'pack',
:artifactSet => { :excludes => ['rubygems:*'] },
349 changes: 3 additions & 346 deletions maven/jruby/src/it/runnable/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,349 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>no_group_id_given</groupId>
<artifactId>runnable</artifactId>
<groupId>dummy</groupId>
<artifactId>dummy</artifactId>
<version>0.0.0</version>
<name>runnable</name>
<properties>
<tesla.dump.readOnly>true</tesla.dump.readOnly>
<jruby.version>@project.version@</jruby.version>
<jruby.plugins.version>1.0.10</jruby.plugins.version>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
</properties>
<dependencies>
<dependency>
<groupId>rubygems</groupId>
<artifactId>bundler</artifactId>
<version>1.7.7</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
<version>${jruby.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>de.saumya.mojo</groupId>
<artifactId>jruby-mains</artifactId>
<version>0.3.1</version>
</dependency>
</dependencies>
<repositories>
<repository>
<id>rubygems-releases</id>
<url>http://rubygems-proxy.torquebox.org/releases</url>
</repository>
</repositories>
<build>
<directory>pkg</directory>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
<configuration>
<outputDirectory>.</outputDirectory>
<finalName>runnable</finalName>
</configuration>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>2.4</version>
<configuration>
<filesets>
<fileset>
<directory>.</directory>
<includes>
<include>runnable.jar</include>
<include>*/**/*.jar</include>
</includes>
</fileset>
</filesets>
</configuration>
</plugin>
<plugin>
<groupId>de.saumya.mojo</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>${jruby.plugins.version}</version>
<executions>
<execution>
<id>install gems</id>
<goals>
<goal>initialize</goal>
</goals>
</execution>
<execution>
<goals>
<goal>generate-resources</goal>
<goal>process-resources</goal>
</goals>
<configuration>
<includeBinStubs>true</includeBinStubs>
<includeRubyResources>
<includeRubyResource>.rspec</includeRubyResource>
<includeRubyResource>*.rb</includeRubyResource>
<includeRubyResource>config.ru</includeRubyResource>
<includeRubyResource>*file</includeRubyResource>
<includeRubyResource>*file.lock</includeRubyResource>
<includeRubyResource>.jbundler/classpath.rb</includeRubyResource>
<includeRubyResource>lib/**</includeRubyResource>
<includeRubyResource>app/**</includeRubyResource>
<includeRubyResource>config/**</includeRubyResource>
<includeRubyResource>vendor/**</includeRubyResource>
<includeRubyResource>spec/**</includeRubyResource>
</includeRubyResources>
</configuration>
</execution>
</executions>
<configuration>
<jrubyVersion>1.7.19</jrubyVersion>
<includeRubygemsInResources>true</includeRubygemsInResources>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy jar dependencies</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<type>jar</type>
<version>1.49</version>
<classifier />
<outputDirectory>${project.build.outputDirectory}/jars/org/bouncycastle/bcpkix-jdk15on/1.49</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<type>jar</type>
<version>1.6.4</version>
<classifier />
<outputDirectory>${project.build.outputDirectory}/jars/org/slf4j/slf4j-simple/1.6.4</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<type>jar</type>
<version>1.49</version>
<classifier />
<outputDirectory>${project.build.outputDirectory}/jars/org/bouncycastle/bcprov-jdk15on/1.49</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<type>jar</type>
<version>1.6.4</version>
<classifier />
<outputDirectory>${project.build.outputDirectory}/jars/org/slf4j/slf4j-api/1.6.4</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<id>pack</id>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<artifactSet>
<excludes>
<exclude>rubygems:*</exclude>
</excludes>
</artifactSet>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>de.saumya.mojo.mains.JarMain</mainClass>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2</version>
<executions>
<execution>
<id>rake -T</id>
<phase>package</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<arguments>
<argument>-jar</argument>
<argument>runnable.jar</argument>
<argument>-S</argument>
<argument>rake</argument>
<argument>-T</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>rake spec</id>
<phase>package</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<arguments>
<argument>-jar</argument>
<argument>runnable.jar</argument>
<argument>-S</argument>
<argument>rake</argument>
<argument>spec</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>rspec</id>
<phase>package</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<arguments>
<argument>-jar</argument>
<argument>runnable.jar</argument>
<argument>-S</argument>
<argument>rspec</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>nested IsolatedScriptingContainer</id>
<phase>package</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<arguments>
<argument>-jar</argument>
<argument>runnable.jar</argument>
<argument>nested.rb</argument>
</arguments>
</configuration>
</execution>
</executions>
<configuration>
<executable>java</executable>
<environmentVariables>
<HOME>${basedir}</HOME>
<GEM_PATH>${basedir}</GEM_PATH>
<GEM_HOME>${basedir}</GEM_HOME>
</environmentVariables>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>gemfile</id>
<activation>
<file>
<missing>Gemfile.lock</missing>
</file>
</activation>
<dependencies>
<dependency>
<groupId>rubygems</groupId>
<artifactId>rspec</artifactId>
<version>[3.0,3.99999]</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>rake</artifactId>
<version>[10.3,10.99999]</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>jbundler</artifactId>
<version>0.7.1</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>ruby-maven</artifactId>
<version>3.1.1.0.11</version>
<type>gem</type>
</dependency>
</dependencies>
</profile>
<profile>
<id>gemfile_lock</id>
<activation>
<file>
<exists>Gemfile.lock</exists>
</file>
</activation>
<build>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>${jruby.plugins.version}</version>
<executions>
<execution>
<id>install gem sets for compile</id>
<phase>initialize</phase>
<goals>
<goal>sets</goal>
</goals>
<configuration>
<scope>compile</scope>
<gems>
<rspec>3.3.0</rspec>
<rspec-core>3.3.1</rspec-core>
<rspec-support>3.3.0</rspec-support>
<rspec-expectations>3.3.0</rspec-expectations>
<diff-lcs>1.2.5</diff-lcs>
<rspec-mocks>3.3.1</rspec-mocks>
<rake>10.3.2</rake>
<jbundler>0.7.1</jbundler>
<jar-dependencies>0.1.13</jar-dependencies>
<maven-tools>1.0.8</maven-tools>
<virtus>1.0.5</virtus>
<axiom-types>0.1.1</axiom-types>
<descendants_tracker>0.0.4</descendants_tracker>
<thread_safe>0.3.5</thread_safe>
<ice_nine>0.11.1</ice_nine>
<coercible>1.0.0</coercible>
<equalizer>0.0.11</equalizer>
<ruby-maven>3.1.1.0.11</ruby-maven>
<ruby-maven-libs>3.1.1</ruby-maven-libs>
</gems>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
35 changes: 0 additions & 35 deletions maven/jruby/src/it/settings.xml
View file

This file was deleted.

12 changes: 6 additions & 6 deletions maven/jruby/src/it/tomcat/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@
# it is war-file
packaging 'war'

# get jruby dependencies
properties( 'jruby.version' => '@project.version@',
# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '1.0.10',
'project.build.sourceEncoding' => 'utf-8' )

pom( 'org.jruby:jruby', '${jruby.version}' )
@@ -15,19 +15,19 @@
repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
:id => 'rubygems-releases' )

jruby_plugin :gem, :includeRubygemsInTestResources => false, :includeRubygemsInResources => true do
jruby_plugin :gem, :includeRubygemsInTestResources => false, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do
execute_goal :initialize
end

# ruby-maven will dump an equivalent pom.xml
properties[ 'tesla.dump.pom' ] = 'pom.xml'

# start tomcat for the tests
plugin( 'org.codehaus.mojo:tomcat-maven-plugin', '1.1',
:fork => true, :path => '/' ) do
execute_goals( 'run',
:id => 'run-tomcat',
:phase => 'pre-integration-test' )
execute_goals( 'shutdown',
:id => 'shutdown-tomcat',
:phase => 'post-integration-test' )
end

# download files during the tests
111 changes: 0 additions & 111 deletions maven/jruby/src/it/tomcat/pom.xml
View file

This file was deleted.

6 changes: 6 additions & 0 deletions maven/jruby/src/it/tomcat/pom.xml.pending
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>dummy</groupId>
<artifactId>dummy</artifactId>
<version>0.0.0</version>
</project>
15 changes: 3 additions & 12 deletions maven/jruby/src/templates/j2ee_wlp/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# it is war-file
packaging 'war'

# get jruby dependencies
properties( 'jruby.version' => '@project.version@',
# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '1.0.10',
'project.build.sourceEncoding' => 'utf-8' )

pom( 'org.jruby:jruby', '${jruby.version}' )
@@ -13,19 +13,10 @@
repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
:id => 'rubygems-releases' )

jruby_plugin :gem, :includeRubygemsInResources => true do
jruby_plugin :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do
execute_goal :initialize
end

execute 'jrubydir', 'initialize' do |ctx|
require 'jruby/commands'
JRuby::Commands.generate_dir_info( ctx.project.build.directory.to_pathname + '/rubygems' )
end

# ruby-maven will dump an equivalent pom.xml
properties( 'tesla.dump.pom' => 'pom.xml',
'jruby.home' => '${basedir}/../../../../../' )

execute 'deploy', :phase => 'pre-integration-test' do |ctx|
wlp_home = ctx.basedir.to_pathname + '/../../wlp'
FileUtils.cp( 'target/j2ee_wlp.war', "#{wlp_home}/usr/servers/testing/dropins/packed.war" )
Loading

0 comments on commit 926fbb7

Please sign in to comment.