Skip to content

Commit 42e5d96

Browse files
committed
fixes a build issue with 9k
1 parent 5db25f7 commit 42e5d96

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Mavenfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ plugin( 'org.codehaus.mojo:exec-maven-plugin', '1.3.2' ) do
2121
invoker_main << ' org.jruby.anno.InvokerGenerator'
2222
invoker_main << " #{gen_sources}/annotated_classes.txt ${project.build.outputDirectory}"
2323
24-
dependency 'org.jruby', 'jruby-core', '1.7.17'
24+
dependency 'org.jruby', 'jruby-core', '${jruby.version}'
2525
2626
execute_goal :java, :id => 'invoker-generator', :phase => 'process-classes',
2727
:mainClass => 'org.jruby.anno.InvokerGenerator', :classpathScope => 'compile',
@@ -84,7 +84,9 @@ jar 'junit:junit', '4.11', :scope => :test
8484
jruby_plugin! :gem do
8585
# when installing dependent gems we want to use the built in openssl
8686
# not the one from this lib directory
87-
execute_goal :id => 'default-initialize', :libDirectory => 'something-which-does-not-exists'
87+
# we compile against jruby-core-1.7.17 and want to keep this out of
88+
# the plugin execution here
89+
execute_goal :id => 'default-initialize', :addProjectClasspath => false, :libDirectory => 'something-which-does-not-exists'
8890
execute_goals :id => 'default-push', :skip => true
8991
end
9092

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@
185185
<execution>
186186
<id>default-initialize</id>
187187
<configuration>
188+
<addProjectClasspath>false</addProjectClasspath>
188189
<libDirectory>something-which-does-not-exists</libDirectory>
189190
</configuration>
190191
</execution>

0 commit comments

Comments
 (0)