Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 522f220f30a8
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 573752a57af4
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Aug 31, 2015

  1. Revert "Oops. Commit for the pom.rb changes I made in 145518e." 

    This reverts commit 9c613b1.
    @nirvdrum
    nirvdrum committed Aug 31, 2015
    Copy the full SHA
    d7e02ce View commit details

  2. Revert "Disable doclint for javadoc on JDK 8." 

    This reverts commit 145518e.
    @nirvdrum
    nirvdrum committed Aug 31, 2015
    Copy the full SHA
    573752a View commit details
Showing with 1 addition and 5 deletions.
  1. +0 −1 maven/jruby-complete/pom.rb
  2. +1 −1 pom.rb
  3. +0 −3 pom.xml
1 change: 0 additions & 1 deletion maven/jruby-complete/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -117,6 +117,5 @@
jdk '1.8'
end
plugin :invoker, :pomExcludes => ['osgi_many_bundles_with_embedded_gems_felix-3.2/pom.xml', '${its.j2ee}', '${its.osgi}']
properties 'javadoc.opts' => '-Xdoclint:none'
end
end
2 changes: 1 addition & 1 deletion pom.rb
View file
Original file line number Diff line number Diff line change
@@ -288,7 +288,7 @@
execute_goals('jar-no-fork', :id => 'attach-sources')
end
plugin(:javadoc) do
execute_goals('jar', :id => 'attach-javadocs', :configuration => [ xml('<additionalparam>${javadoc.opts}</additionalparam>') ])
execute_goals('jar', :id => 'attach-javadocs')
end
end

3 changes: 0 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -841,9 +841,6 @@ DO NOT MODIFIY - GENERATED CODE
<goals>
<goal>jar</goal>
</goals>
<configuration>
<additionalparam>${javadoc.opts}</additionalparam>
</configuration>
</execution>
</executions>
</plugin>