[build] get the javadoc for jruby-complete and -Psnapshots in place a…

…gain
jruby · Jul 17, 2015 · 697d33e · 697d33e
1 parent 102da2f
commit 697d33e
Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/maven/jruby-complete/pom.rb b/maven/jruby-complete/pom.rb
@@ -81,8 +81,7 @@
 
       # use the javadocs and sources from jruby-core !!!
       phase :package do
-        set = ['sources']
-        set << 'javadocs' if name != 'snapshots'
+        set = ['sources', 'javadoc' ]
         plugin :dependency do
           items = set.collect do |classifier|
             { 'groupId' =>  '${project.groupId}',

diff --git a/pom.rb b/pom.rb
@@ -108,6 +108,7 @@
     plugin :assembly, '2.4'
     plugin :install, '2.4'
     plugin :deploy, '2.7'
+    plugin :javadoc, '2.7'
     plugin :resources, '2.6'
     plugin :clean, '2.5'
     plugin :dependency, '2.8'
@@ -284,9 +285,12 @@
       default_goal :deploy
     end
 
-    plugin(:source, '2.1.2') do
+    plugin(:source) do
       execute_goals('jar-no-fork', :id => 'attach-sources')
     end
+    plugin(:javadoc) do
+      execute_goals('jar', :id => 'attach-javadocs')
+    end
   end
 
   profile 'single invoker test' do

diff --git a/pom.xml b/pom.xml
@@ -235,6 +235,10 @@ DO NOT MODIFIY - GENERATED CODE
           <artifactId>maven-deploy-plugin</artifactId>
           <version>2.7</version>
         </plugin>
+        <plugin>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.7</version>
+        </plugin>
         <plugin>
           <artifactId>maven-resources-plugin</artifactId>
           <version>2.6</version>
@@ -821,7 +825,6 @@ DO NOT MODIFIY - GENERATED CODE
         <plugins>
           <plugin>
             <artifactId>maven-source-plugin</artifactId>
-            <version>2.1.2</version>
             <executions>
               <execution>
                 <id>attach-sources</id>
@@ -831,6 +834,17 @@ DO NOT MODIFIY - GENERATED CODE
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-javadocs</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
       <modules>