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: 57dfc0d783c1
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3c0289352e4e
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 7, 2014

  1. [build] make sure we have jruby-core artifact with noasm classifier i… 

    …nstalled for subsequent tests
    @mkristian
    mkristian committed Oct 7, 2014
    Copy the full SHA
    3c02893 View commit details
Showing with 35 additions and 0 deletions.
  1. +35 −0 core/pom.xml
35 changes: 35 additions & 0 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -686,6 +686,41 @@
</plugins>
</build>
</profile>
<profile>
<id>osgi</id>
<build>
<plugins>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<id>pack jruby-noasm.jar</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>noasm</shadedClassifierName>
<artifactSet>
<includes>
<include>com.github.jnr:jnr-ffi</include>
<include>org.ow2.asm:*</include>
</includes>
</artifactSet>
<relocations>
<relocation>
<pattern>org.objectweb</pattern>
<shadedPattern>org.jruby.org.objectweb</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>dist</id>
<build>