Skip to content

Commit da240cb

Browse files
committed
fix dependency copy
1 parent 12023a8 commit da240cb

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

Rakefile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,26 @@ def create_manifest
1010
end
1111
end
1212

13-
task default: [:init, :compile, :gem]
13+
task default: [:init, :compile, :install, :gem]
1414

1515
desc 'Create Manifest'
1616
task :init do
1717
create_manifest
1818
end
1919

2020
desc 'Build gem'
21-
task :gem do
21+
task :gem => [:install, :compile] do
2222
sh "gem build joonsrenderer.gemspec"
2323
end
2424

2525
desc 'Compile'
26-
task :compile do
26+
task :compile => [:init] do
2727
sh "mvn package"
28+
end
29+
30+
desc 'Install'
31+
task :install do
32+
sh "mvn dependency:copy"
2833
sh "mv target/joonsrenderer.jar lib"
2934
end
3035

pom.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
'processing.version' => '3.2.3'
2727
)
2828

29-
jar 'org.codehaus.janino:janino:${janino.version}'
3029
jar 'org.processing:core:${processing.version}'
3130
jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
3231
jar 'org.jogamp.gluegen:gluegen-rt:${jogl.version}'
@@ -36,9 +35,8 @@
3635
overrides do
3736
plugin :resources, '2.6'
3837
plugin :dependency, '2.10' do
39-
execute_goals( id: 'maven-dependency-plugin',
40-
goal: 'copy-dependencies',
41-
artifactItems: [
38+
execute_goals( id: 'default-cli',
39+
artifactItems:[
4240
{ groupId: 'org.codehaus.janino',
4341
artifactId: 'janino',
4442
version: '${janino.version}',

pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@ DO NOT MODIFIY - GENERATED CODE
7070
<maven.compiler.source>1.8</maven.compiler.source>
7171
</properties>
7272
<dependencies>
73-
<dependency>
74-
<groupId>org.codehaus.janino</groupId>
75-
<artifactId>janino</artifactId>
76-
<version>${janino.version}</version>
77-
</dependency>
7873
<dependency>
7974
<groupId>org.processing</groupId>
8075
<artifactId>core</artifactId>
@@ -116,9 +111,8 @@ DO NOT MODIFIY - GENERATED CODE
116111
<version>2.10</version>
117112
<executions>
118113
<execution>
119-
<id>maven-dependency-plugin</id>
114+
<id>default-cli</id>
120115
<configuration>
121-
<goal>copy-dependencies</goal>
122116
<artifactItems>
123117
<artifactItem>
124118
<groupId>org.codehaus.janino</groupId>

0 commit comments

Comments
 (0)