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: 4f28d3c55dbd
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9214912d7bc6
Choose a head ref
  • 2 commits
  • 9 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
    bb6e3e0 View commit details

  2. let travis use those new osgi and j2ee targets

    @mkristian
    mkristian committed Sep 14, 2014
    Copy the full SHA
    9214912 View commit details
Showing with 98 additions and 2 deletions.
  1. +2 −0 .travis.yml
  2. +12 −0 build.xml
  3. +1 −1 maven/jruby-complete/pom.rb
  4. +2 −0 maven/jruby-complete/pom.xml
  5. +1 −1 maven/jruby/pom.rb
  6. +2 −0 maven/jruby/pom.xml
  7. +11 −0 maven/pom.rb
  8. +15 −0 maven/pom.xml
  9. +52 −0 pom.xml
2 changes: 2 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -19,6 +19,8 @@ env:
- TARGET='jruby-jars'
- TARGET='complete'
- TARGET='main'
- TARGET='osgi'
- TARGET='j2ee'

matrix:
fast_finish: true
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="j2ee" 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 maven/jruby-complete/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -110,6 +110,6 @@
activation do
jdk '1.8'
end
plugin :invoker, :pomExcludes => ['osgi_many_bundles_with_embedded_gems_felix-3.2/pom.xml']
plugin :invoker, :pomExcludes => ['osgi_many_bundles_with_embedded_gems_felix-3.2/pom.xml', '${its.j2ee}', '${its.osgi}']
end
end
2 changes: 2 additions & 0 deletions maven/jruby-complete/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -196,6 +196,8 @@
<configuration>
<pomExcludes>
<pomExclude>osgi_many_bundles_with_embedded_gems_felix-3.2/pom.xml</pomExclude>
<pomExclude>${its.j2ee}</pomExclude>
<pomExclude>${its.osgi}</pomExclude>
</pomExcludes>
</configuration>
</plugin>
2 changes: 1 addition & 1 deletion maven/jruby/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@
activation do
jdk '1.8'
end
plugin :invoker, :pomExcludes => ['osgi_all_inclusive_felix-3.2/pom.xml']
plugin :invoker, :pomExcludes => ['osgi_all_inclusive_felix-3.2/pom.xml', '${its.j2ee}', '${its.osgi}']
end
profile :id => :jdk6 do
activation do
2 changes: 2 additions & 0 deletions maven/jruby/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -126,6 +126,8 @@
<configuration>
<pomExcludes>
<pomExclude>osgi_all_inclusive_felix-3.2/pom.xml</pomExclude>
<pomExclude>${its.j2ee}</pomExclude>
<pomExclude>${its.osgi}</pomExclude>
</pomExcludes>
</configuration>
</plugin>
11 changes: 11 additions & 0 deletions maven/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -57,6 +57,17 @@

end

profile 'osgi' do
modules [ 'jruby',
'jruby-stdlib',
'jruby-complete' ]
end

profile 'j2ee' do
modules [ 'jruby',
'jruby-stdlib' ]
end

profile 'rake-plugin' do

modules [ 'jruby-rake-plugin' ]
15 changes: 15 additions & 0 deletions maven/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -58,6 +58,21 @@
<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>
</modules>
</profile>
<profile>
<id>rake-plugin</id>
<modules>
52 changes: 52 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -53,6 +53,8 @@
</organization>

<properties>
<its.j2ee>j2ee*/pom.xml</its.j2ee>
<its.osgi>osgi*/pom.xml</its.osgi>
<invoker.skip>true</invoker.skip>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<jruby.plugins.version>1.0.0-rc4</jruby.plugins.version>
@@ -339,6 +341,10 @@
<configuration>
<skip>true</skip>
<streamLogs>true</streamLogs>
<pomExcludes>
<pomExclude>${its.j2ee}</pomExclude>
<pomExclude>${its.osgi}</pomExclude>
</pomExcludes>
</configuration>
</plugin>

@@ -443,6 +449,52 @@
<defaultGoal>install</defaultGoal>
</build>
</profile>
<profile>
<id>osgi</id>
<modules>
<module>maven</module>
</modules>
<properties>
<invoker.skip>false</invoker.skip>
<its.osgi>no-excludes/pom.xml</its.osgi>
</properties>
<build>
<defaultGoal>install</defaultGoal>
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
<pomIncludes>
<pomInclude>osgi*/pom.xml</pomInclude>
</pomIncludes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>j2ee</id>
<modules>
<module>maven</module>
</modules>
<properties>
<invoker.skip>false</invoker.skip>
<its.j2ee>no-excludes/pom.xml</its.j2ee>
</properties>
<build>
<defaultGoal>install</defaultGoal>
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
<pomIncludes>
<pomInclude>j2ee*/pom.xml</pomInclude>
</pomIncludes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>jruby-jars</id>
<modules>