Skip to content

Commit f4b146b

Browse files
monkstonemonkstone
committed
simplify pom
1 parent c87f035 commit f4b146b

File tree

2 files changed

+54
-67
lines changed

2 files changed

+54
-67
lines changed

‎pom.rb‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,47 +6,48 @@
66

77
description 'toxiclibs-library for JRubyArt'
88

9-
organization 'ruby-processing', 'https://ruby-processing.github.io'
10-
119
developer 'monkstone' do
1210
name 'Martin Prout'
1311
email 'mamba2928@yahoo.co.uk'
1412
roles 'developer'
1513
end
1614

17-
license 'LGPL 2', 'http://www.gnu.org/licenses/lgpl-2.1-standalone.html'
18-
1915
issue_management 'https://github.com/ruby-processing/toxiclibs/issues', 'Github'
2016

2117
source_control( :url => 'https://github.com/ruby-processing/toxiclibs',
2218
:connection => 'scm:git:git://github.com/ruby-processing/toxiclibs.git',
2319
:developer_connection => 'scm:git:git@github.com:ruby-processing/toxiclibs.git' )
2420

2521
properties( 'source.directory' => 'src',
26-
'target.release' => '11',
22+
'polyglot.dump.pom' => 'pom.xml',
2723
'project.build.sourceEncoding' => 'UTF-8',
24+
'target.release' => '11',
2825
'polyglot.dump.pom' => 'pom.xml'
2926
)
3027

3128
jar 'org.processing:core:3.3.7'
3229

30+
overrides do
31+
plugin( :compiler, '3.8.1',
32+
'release' => '11' )
33+
plugin :javadoc, '2.10.4'
34+
plugin(
35+
:jar, '3.2.0',
36+
'archive' => {
37+
'manifestFile' => 'MANIFEST.MF'
38+
}
39+
)
40+
plugin :jdeps, '3.1.2' do
41+
execute_goals 'jdkinternals', 'test-jdkinternals'
42+
end
43+
44+
end
3345

34-
plugin(:compiler, '3.8.1',
35-
'release' => '${target.release}')
36-
plugin(:javadoc, '2.10.4',
37-
'detectOfflineLinks' => 'false',
38-
'links' => ['${processing.api}',
39-
'${jruby.api}'])
40-
plugin :jdeps, '3.1.2' do
41-
execute_goals 'jdkinternals', 'test-jdkinternals'
42-
end
4346

4447
build do
45-
resource do
46-
excludes '**/**/*.java'
47-
end
4848
default_goal 'package'
4949
source_directory '${source.directory}/main/java'
5050
final_name 'toxiclibs'
5151
end
52+
5253
end

‎pom.xml‎

Lines changed: 36 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,6 @@ DO NOT MODIFIY - GENERATED CODE
1414
<version>2.0.0</version>
1515
<name>toxiclibs</name>
1616
<description>toxiclibs-library for JRubyArt</description>
17-
<organization>
18-
<name>ruby-processing</name>
19-
<url>https://ruby-processing.github.io</url>
20-
</organization>
21-
<licenses>
22-
<license>
23-
<name>LGPL 2</name>
24-
<url>http://www.gnu.org/licenses/lgpl-2.1-standalone.html</url>
25-
</license>
26-
</licenses>
2717
<developers>
2818
<developer>
2919
<id>monkstone</id>
@@ -59,46 +49,42 @@ DO NOT MODIFIY - GENERATED CODE
5949
<build>
6050
<sourceDirectory>${source.directory}/main/java</sourceDirectory>
6151
<defaultGoal>package</defaultGoal>
62-
<resources>
63-
<resource>
64-
<directory>${basedir}</directory>
65-
<excludes>
66-
<exclude>**/**/*.java</exclude>
67-
</excludes>
68-
</resource>
69-
</resources>
7052
<finalName>toxiclibs</finalName>
71-
<plugins>
72-
<plugin>
73-
<artifactId>maven-compiler-plugin</artifactId>
74-
<version>3.8.1</version>
75-
<configuration>
76-
<release>${target.release}</release>
77-
</configuration>
78-
</plugin>
79-
<plugin>
80-
<artifactId>maven-javadoc-plugin</artifactId>
81-
<version>2.10.4</version>
82-
<configuration>
83-
<detectOfflineLinks>false</detectOfflineLinks>
84-
<links>
85-
<link>${processing.api}</link>
86-
<link>${jruby.api}</link>
87-
</links>
88-
</configuration>
89-
</plugin>
90-
<plugin>
91-
<artifactId>maven-jdeps-plugin</artifactId>
92-
<version>3.1.2</version>
93-
<executions>
94-
<execution>
95-
<goals>
96-
<goal>jdkinternals</goal>
97-
<goal>test-jdkinternals</goal>
98-
</goals>
99-
</execution>
100-
</executions>
101-
</plugin>
102-
</plugins>
53+
<pluginManagement>
54+
<plugins>
55+
<plugin>
56+
<artifactId>maven-compiler-plugin</artifactId>
57+
<version>3.8.1</version>
58+
<configuration>
59+
<release>11</release>
60+
</configuration>
61+
</plugin>
62+
<plugin>
63+
<artifactId>maven-javadoc-plugin</artifactId>
64+
<version>2.10.4</version>
65+
</plugin>
66+
<plugin>
67+
<artifactId>maven-jar-plugin</artifactId>
68+
<version>3.2.0</version>
69+
<configuration>
70+
<archive>
71+
<manifestFile>MANIFEST.MF</manifestFile>
72+
</archive>
73+
</configuration>
74+
</plugin>
75+
<plugin>
76+
<artifactId>maven-jdeps-plugin</artifactId>
77+
<version>3.1.2</version>
78+
<executions>
79+
<execution>
80+
<goals>
81+
<goal>jdkinternals</goal>
82+
<goal>test-jdkinternals</goal>
83+
</goals>
84+
</execution>
85+
</executions>
86+
</plugin>
87+
</plugins>
88+
</pluginManagement>
10389
</build>
10490
</project>

0 commit comments

Comments
 (0)