File tree Expand file tree Collapse file tree 2 files changed +7
-27
lines changed
src/test/java/org/scijava/plugins/scripting/java Expand file tree Collapse file tree 2 files changed +7
-27
lines changed Original file line number Diff line number Diff line change 55 <parent >
66 <groupId >org.scijava</groupId >
77 <artifactId >pom-scijava</artifactId >
8- <version >9.1.0 </version >
8+ <version >10.0.1 </version >
99 <relativePath />
1010 </parent >
1111
1212 <artifactId >scripting-java</artifactId >
13- <version >0.3.7 -SNAPSHOT</version >
13+ <version >0.4.0 -SNAPSHOT</version >
1414
1515 <name >SciJava Scripting: Java</name >
1616 <description >JSR-223-compliant Java scripting language plugin.</description >
8787 <url >http://jenkins.imagej.net/job/scripting-Java/</url >
8888 </ciManagement >
8989
90+ <properties >
91+ <scijava .jvm.version>1.8</scijava .jvm.version>
92+ </properties >
93+
9094 <dependencies >
9195 <!-- SciJava dependencies -->
9296 <dependency >
@@ -137,28 +141,4 @@ Institute of Molecular Cell Biology and Genetics.</organizationName>
137141 </plugins >
138142 </build >
139143
140- <!--
141- NB: Enable dependency on tools.jar. See:
142- http://maven.apache.org/general.html#tools-jar-dependency
143- -->
144- <profiles >
145- <profile >
146- <id >tools-jar</id > <!-- required for MiniMaven -->
147- <activation >
148- <file >
149- <!-- NB: Custom properties do not work here, so we hardcode. -->
150- <exists >${java.home} /../lib/tools.jar</exists >
151- </file >
152- </activation >
153- <dependencies >
154- <dependency >
155- <groupId >com.sun</groupId >
156- <artifactId >tools</artifactId >
157- <version >1.4.2</version >
158- <scope >system</scope >
159- <systemPath >${java.home} /../lib/tools.jar</systemPath >
160- </dependency >
161- </dependencies >
162- </profile >
163- </profiles >
164144</project >
Original file line number Diff line number Diff line change @@ -70,7 +70,7 @@ public void assumeJavaC() {
7070 boolean found = false ;
7171 try {
7272 final ClassLoader classLoader = getClass ().getClassLoader ();
73- found = classLoader .loadClass ("com.sun. tools.javac.Main " ) != null ;
73+ found = classLoader .loadClass ("javax. tools.ToolProvider " ) != null ;
7474 }
7575 catch (final Throwable t ) {
7676 // NB: No action needed.
You can’t perform that action at this time.
0 commit comments