Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bb42321a32c0^
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9655fdf72fa0
Choose a head ref
  • 4 commits
  • 5 files changed
  • 1 contributor

Commits on Sep 14, 2014

  1. extract the osgi and j2ee integration tests into their own profile

    @mkristian
    mkristian committed Sep 14, 2014
    Copy the full SHA
    bb42321 View commit details

  2. let travis use those new osgi and j2ee targets

    @mkristian
    mkristian committed Sep 14, 2014
    Copy the full SHA
    e6262ff View commit details

  3. Revert "let travis use those new osgi and j2ee targets" 

    This reverts commit e6262ff.
    @mkristian
    mkristian committed Sep 14, 2014
    Copy the full SHA
    6f515f6 View commit details

  4. use legacy loading per default

    @mkristian
    mkristian committed Sep 14, 2014
    Copy the full SHA
    9655fdf View commit details
Showing with 67 additions and 1 deletion.
  1. +12 −0 build.xml
  2. +1 −1 core/src/main/java/org/jruby/util/cli/Options.java
  3. +8 −0 maven/pom.rb
  4. +16 −0 maven/pom.xml
  5. +30 −0 pom.xml
12 changes: 12 additions & 0 deletions build.xml
View file
Original file line number Diff line number Diff line change
@@ -470,6 +470,18 @@
</exec>
</target>

<target name="osgi" description="run osgi tests">
<exec executable="mvn" failonerror="true">
<arg line="-Posgi"/>
</exec>
</target>

<target name="osgi" description="run j2ee tests">
<exec executable="mvn" failonerror="true">
<arg line="-Pj2ee"/>
</exec>
</target>

<target name="complete" description="Create the jruby-complete.jar">
<exec executable="mvn" failonerror="true">
<arg line="-Pcomplete"/>
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/util/cli/Options.java
View file
Original file line number Diff line number Diff line change
@@ -148,7 +148,7 @@ public class Options {
public static final Option<Boolean> PREFER_IPV4 = bool(MISCELLANEOUS, "net.preferIPv4", true, "Prefer IPv4 network stack");
public static final Option<Boolean> FCNTL_LOCKING = bool(MISCELLANEOUS, "file.flock.fcntl", true, "Use fcntl rather than flock for File#flock");
public static final Option<Boolean> ADD_JARS_TO_LOAD_PATH = bool(MISCELLANEOUS, "add.jars.toLoadPath", true, "Add required to LOAD_PATH for the embdded ruby scripts");
public static final Option<Boolean> LEGACY_LOAD_SERVICE = bool(MISCELLANEOUS, "legacy.loadService", false, "Use legacy LoadService to find resources on classpath");
public static final Option<Boolean> LEGACY_LOAD_SERVICE = bool(MISCELLANEOUS, "legacy.loadService", true, "Use legacy LoadService to find resources on classpath");

public static final Option<Boolean> DEBUG_LOADSERVICE = bool(DEBUG, "debug.loadService", false, "Log require/load file searches.");
public static final Option<Boolean> DEBUG_LOADSERVICE_TIMING = bool(DEBUG, "debug.loadService.timing", false, "Log require/load parse+evaluate times.");
8 changes: 8 additions & 0 deletions maven/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -57,6 +57,14 @@

end

['osgi', 'j2ee'].each do |name|
profile name do
modules [ 'jruby',
'jruby-stdlib',
'jruby-complete' ]
end
end

profile 'rake-plugin' do

modules [ 'jruby-rake-plugin' ]
16 changes: 16 additions & 0 deletions maven/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -58,6 +58,22 @@
<module>jruby-complete</module>
</modules>
</profile>
<profile>
<id>osgi</id>
<modules>
<module>jruby</module>
<module>jruby-stdlib</module>
<module>jruby-complete</module>
</modules>
</profile>
<profile>
<id>j2ee</id>
<modules>
<module>jruby</module>
<module>jruby-stdlib</module>
<module>jruby-complete</module>
</modules>
</profile>
<profile>
<id>rake-plugin</id>
<modules>
30 changes: 30 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -339,6 +339,10 @@
<configuration>
<skip>true</skip>
<streamLogs>true</streamLogs>
<pomExcludes>
<pomExclude>j2ee*/pom.xml</pomExclude>
<pomExclude>osgi*/pom.xml</pomExclude>
</pomExcludes>
</configuration>
</plugin>

@@ -443,6 +447,32 @@
<defaultGoal>install</defaultGoal>
</build>
</profile>
<profile>
<id>osgi</id>
<modules>
<module>maven</module>
</modules>
<properties>
<invoker.test>osgi*</invoker.test>
<invoker.skip>false</invoker.skip>
</properties>
<build>
<defaultGoal>install</defaultGoal>
</build>
</profile>
<profile>
<id>j2ee</id>
<modules>
<module>maven</module>
</modules>
<properties>
<invoker.test>j2ee*</invoker.test>
<invoker.skip>false</invoker.skip>
</properties>
<build>
<defaultGoal>install</defaultGoal>
</build>
</profile>
<profile>
<id>jruby-jars</id>
<modules>