simplify pom

ruby-processing · May 3, 2020 · f4b146b · f4b146b
1 parent c87f035
commit f4b146b
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 67 deletions.
diff --git a/pom.rb b/pom.rb
@@ -6,47 +6,48 @@
 
   description 'toxiclibs-library for JRubyArt'
 
-  organization 'ruby-processing', 'https://ruby-processing.github.io'
-
   developer 'monkstone' do
     name 'Martin Prout'
     email 'mamba2928@yahoo.co.uk'
     roles 'developer'
   end
 
-  license 'LGPL 2', 'http://www.gnu.org/licenses/lgpl-2.1-standalone.html'
-
   issue_management 'https://github.com/ruby-processing/toxiclibs/issues', 'Github'
 
   source_control( :url => 'https://github.com/ruby-processing/toxiclibs',
                   :connection => 'scm:git:git://github.com/ruby-processing/toxiclibs.git',
                   :developer_connection => 'scm:git:git@github.com:ruby-processing/toxiclibs.git' )
 
   properties( 'source.directory' => 'src',
-              'target.release' => '11',
+              'polyglot.dump.pom' => 'pom.xml',
               'project.build.sourceEncoding' => 'UTF-8',
+              'target.release' => '11',
               'polyglot.dump.pom' => 'pom.xml'
             )
 
   jar 'org.processing:core:3.3.7'
 
+  overrides do
+    plugin( :compiler, '3.8.1',
+            'release' =>  '11' )
+    plugin :javadoc, '2.10.4'
+    plugin(
+      :jar, '3.2.0',
+      'archive' => {
+        'manifestFile' =>  'MANIFEST.MF'
+      }
+    )
+    plugin :jdeps, '3.1.2' do
+      execute_goals 'jdkinternals', 'test-jdkinternals'
+    end
+
+  end
 
-  plugin(:compiler, '3.8.1',
-         'release' => '${target.release}')
-  plugin(:javadoc, '2.10.4',
-         'detectOfflineLinks' => 'false',
-         'links' => ['${processing.api}',
-                     '${jruby.api}'])
-          plugin :jdeps, '3.1.2' do
-            execute_goals 'jdkinternals', 'test-jdkinternals'
-          end
 
   build do
-    resource do
-      excludes '**/**/*.java'
-    end
     default_goal 'package'
     source_directory '${source.directory}/main/java'
     final_name 'toxiclibs'
   end
+
 end
diff --git a/pom.xml b/pom.xml
@@ -14,16 +14,6 @@ DO NOT MODIFIY - GENERATED CODE
   <version>2.0.0</version>
   <name>toxiclibs</name>
   <description>toxiclibs-library for JRubyArt</description>
-  <organization>
-    <name>ruby-processing</name>
-    <url>https://ruby-processing.github.io</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>LGPL 2</name>
-      <url>http://www.gnu.org/licenses/lgpl-2.1-standalone.html</url>
-    </license>
-  </licenses>
   <developers>
     <developer>
       <id>monkstone</id>
@@ -59,46 +49,42 @@ DO NOT MODIFIY - GENERATED CODE
   <build>
     <sourceDirectory>${source.directory}/main/java</sourceDirectory>
     <defaultGoal>package</defaultGoal>
-    <resources>
-      <resource>
-        <directory>${basedir}</directory>
-        <excludes>
-          <exclude>**/**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
     <finalName>toxiclibs</finalName>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
-        <configuration>
-          <release>${target.release}</release>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.10.4</version>
-        <configuration>
-          <detectOfflineLinks>false</detectOfflineLinks>
-          <links>
-            <link>${processing.api}</link>
-            <link>${jruby.api}</link>
-          </links>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jdeps-plugin</artifactId>
-        <version>3.1.2</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>jdkinternals</goal>
-              <goal>test-jdkinternals</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.1</version>
+          <configuration>
+            <release>11</release>
+          </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.10.4</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.2.0</version>
+          <configuration>
+            <archive>
+              <manifestFile>MANIFEST.MF</manifestFile>
+            </archive>
+          </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jdeps-plugin</artifactId>
+          <version>3.1.2</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>jdkinternals</goal>
+                <goal>test-jdkinternals</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
   </build>
 </project>