[build] make sure we only attache sources on snapshots profile (no ja…

…vadocs)
jruby · Jul 15, 2015 · b9f8d72 · b9f8d72
1 parent 66de408
commit b9f8d72
Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/maven/jruby-complete/pom.rb b/maven/jruby-complete/pom.rb
@@ -81,8 +81,10 @@
 
       # use the javadocs and sources from jruby-core !!!
       phase :package do
+        set = ['sources']
+        set << 'javadocs' if name != 'snapshots'
         plugin :dependency do
-          items = [ 'sources', 'javadoc' ].collect do |classifier|
+          items = set.collect do |classifier|
             { 'groupId' =>  '${project.groupId}',
               'artifactId' =>  'jruby-core',
               'version' =>  '${project.version}',
@@ -96,12 +98,12 @@
         end
 
         plugin 'org.codehaus.mojo:build-helper-maven-plugin' do
+          artifacts = set.collect do |classifier|
+            { 'file' =>  "${project.build.directory}/jruby-core-${project.version}-#{classifier}.jar", 'classifier' =>  classifier }
+          end
           execute_goals( 'attach-artifact',
                          :id => 'attach-artifacts',
-                         'artifacts' => [ { 'file' =>  '${project.build.directory}/jruby-core-${project.version}-sources.jar',
-                                            'classifier' =>  'sources' },
-                                          { 'file' =>  '${project.build.directory}/jruby-core-${project.version}-javadoc.jar',
-                                            'classifier' =>  'javadoc' } ] )
+                         'artifacts' => artifacts )
         end
       end
     end

diff --git a/maven/pom.rb b/maven/pom.rb
@@ -25,10 +25,10 @@
   end
 
   # module to profile map
-  map = { 'jruby' => [ :release, :main, :osgi, :j2ee ],
+  map = { 'jruby' => [ :release, :main, :osgi, :j2ee, :snapshots ],
     'jruby-complete' => [ :release, :complete, :osgi, :'jruby_complete_jar_extended', :snapshots],
     'jruby-jars' => [ :release, :'jruby-jars', :snapshots ],
-    'jruby-dist' => [ :release, :dist ]
+    'jruby-dist' => [ :release, :dist, :snapshots ]
   }
 
   profile :all do