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: 309bd600ad84
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8311cd62e302
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Oct 11, 2017

  1. Update to jar plugin 3.0 for Java 9 fixes.

    @headius
    headius committed Oct 11, 2017
    Copy the full SHA
    187059e View commit details

  2. Use reflection to compile under JDK9.

    @headius
    headius committed Oct 11, 2017
    Copy the full SHA
    8311cd6 View commit details
Showing with 5 additions and 3 deletions.
  1. +3 −1 core/src/main/java/org/jruby/management/BeanManagerImpl.java
  2. +1 −1 pom.rb
  3. +1 −1 pom.xml
4 changes: 3 additions & 1 deletion core/src/main/java/org/jruby/management/BeanManagerImpl.java
View file
Original file line number Diff line number Diff line change
@@ -84,7 +84,9 @@ public boolean tryShutdownAgent() {

public boolean tryRestartAgent() {
try {
sun.management.Agent.startAgent();
Class agent = Class.forName("sun.management.Agent");
Method start = agent.getMethod("startAgent");
start.invoke(null);
return true;
} catch (Exception e) {
return false;
2 changes: 1 addition & 1 deletion pom.rb
View file
Original file line number Diff line number Diff line change
@@ -117,7 +117,7 @@
plugin :clean, '2.5'
plugin :dependency, '2.8'
plugin :release, '2.4.1'
plugin :jar, '2.6'
plugin :jar, '3.0.0'

rules = { :requireMavenVersion => { :version => '[3.3.0,)' } }
unless model.version =~ /-SNAPSHOT/
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
@@ -256,7 +256,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<version>3.0.0</version>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>