Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contrib/groovy.grails/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
javac.release=21
nbm.homepage=http://wiki.netbeans.org/groovy
nbm.module.author=Martin Adamek, Petr Hejl, Matthias Schmidt

Expand Down
2 changes: 1 addition & 1 deletion contrib/groovy.grails/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>1.11</specification-version>
<specification-version>1.77</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ public JavaPlatform getJavaPlatform() {
return JavaPlatform.getDefault();
}

JavaPlatform[] platforms = PLATFORM_MANAGER.getPlatforms(null, new Specification("j2se", null)); //NOI18N
Comment thread
mbien marked this conversation as resolved.
Resolved
JavaPlatform[] platforms = PLATFORM_MANAGER.getPlatforms(null, new Specification("j2se")); //NOI18N
for (JavaPlatform platform : platforms) {
if (platform.getInstallFolders().size() > 0) {
String antName = platform.getProperties().get("platform.ant.name"); //NOI18N
Expand Down
2 changes: 1 addition & 1 deletion contrib/j2ee.jboss4/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.

javac.source=1.8
javac.release=21
#javac.compilerargs=-Xlint:unchecked


Expand Down
1 change: 1 addition & 0 deletions contrib/j2ee.jboss4/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>1.77</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public void loadJvmModel() {
jvmModel.removeAllElements();

// feed the combo with sorted platform list
JavaPlatform[] j2sePlatforms = jpm.getPlatforms(null, new Specification("J2SE", null)); // NOI18N
JavaPlatform[] j2sePlatforms = jpm.getPlatforms(null, new Specification("J2SE")); // NOI18N
JavaPlatformAdapter[] platformAdapters = new JavaPlatformAdapter[j2sePlatforms.length];
for (int i = 0; i < platformAdapters.length; i++) {
platformAdapters[i] = new JavaPlatformAdapter(j2sePlatforms[i]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
import org.openide.execution.NbProcessDescriptor;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.modules.SpecificationVersion;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
import org.openide.util.Utilities;
Expand Down Expand Up @@ -96,8 +95,8 @@ class JBStartRunnable implements Runnable {
private static final String NEW_IF_CONDITION_STRING =
"\"xx\" == \"x\""; // NOI18N

private static final SpecificationVersion
JDK_14 = new SpecificationVersion("1.4"); // NOI18N
private static final Runtime.Version
JDK_14 = Runtime.Version.parse("1.4"); // NOI18N

private static final Logger LOGGER = Logger.getLogger(JBStartRunnable.class.getName());

Expand Down Expand Up @@ -191,7 +190,8 @@ private String[] createEnvironment(final InstanceProperties ip) {

if (startServer.getMode() == JBStartServer.MODE.DEBUG && !haveDebugOptions(javaOptsBuilder.toString())) {
// if in debug mode and the debug options not specified manually
if (platform.getSpecification().getVersion().compareTo(JDK_14) <= 0) {
Runtime.Version platformVersion = platform.getSpecification().getJdkVersion();
if (platformVersion != null && platformVersion.compareTo(JDK_14) <= 0) {
javaOptsBuilder.append(" -classic");
javaOptsBuilder.append(" -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address="). // NOI18N
append(dm.getDebuggingPort()).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public void setProxyEnabled(boolean enabled) {
public JavaPlatform getJavaPlatform() {
String currentJvm = ip.getProperty(PROP_JAVA_PLATFORM);
JavaPlatformManager jpm = JavaPlatformManager.getDefault();
JavaPlatform[] installedPlatforms = jpm.getPlatforms(null, new Specification("J2SE", null)); // NOI18N
JavaPlatform[] installedPlatforms = jpm.getPlatforms(null, new Specification("J2SE")); // NOI18N
for (int i = 0; i < installedPlatforms.length; i++) {
String platformName = (String)installedPlatforms[i].getProperties().get(PLAT_PROP_ANT_NAME);
if (platformName != null && platformName.equals(currentJvm)) {
Expand Down
2 changes: 1 addition & 1 deletion enterprise/glassfish.common/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>1.36</specification-version>
<specification-version>1.77</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,7 @@ public class JavaUtils {
* @return Installed Java SE platforms.
*/
public static JavaPlatform[] getInstalledJavaSEPlatforms() {
return JavaPlatformManager.getDefault()
.getPlatforms(null, new Specification(
JAVA_SE_SPECIFICATION_NAME, null));
return JavaPlatformManager.getDefault().getPlatforms(null, new Specification(JAVA_SE_SPECIFICATION_NAME));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion enterprise/glassfish.javaee/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>1.10</specification-version>
<specification-version>1.77</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public String getGlassfishRoot() {
public JavaPlatform getJavaPlatform() {
String currentJvm = ip.getProperty(PROP_JAVA_PLATFORM);
JavaPlatformManager jpm = JavaPlatformManager.getDefault();
JavaPlatform[] installedPlatforms = jpm.getPlatforms(null, new Specification("J2SE", null)); // NOI18N
JavaPlatform[] installedPlatforms = jpm.getPlatforms(null, new Specification("J2SE")); // NOI18N

for (int i = 0; i < installedPlatforms.length; i++) {
String platformName = installedPlatforms[i].getProperties().get(PLAT_PROP_ANT_NAME);
Expand Down
2 changes: 1 addition & 1 deletion enterprise/j2ee.clientproject/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec.version.base=1.81.0
javadoc.arch=${basedir}/arch.xml
javadoc.preview=true
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
javac.release=21

test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
Expand Down
1 change: 1 addition & 0 deletions enterprise/j2ee.clientproject/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>1.77</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.openide.WizardDescriptor;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;

import org.openide.util.NbBundle;
import org.openide.util.Parameters;

Expand Down Expand Up @@ -174,7 +175,7 @@ public static JavaPlatform getActivePlatform (final String activePlatformId) {
return pm.getDefaultPlatform();
}
else {
JavaPlatform[] installedPlatforms = pm.getPlatforms(null, new Specification ("j2se",null)); //NOI18N
JavaPlatform[] installedPlatforms = pm.getPlatforms(null, new Specification("j2se")); //NOI18N
for (int i=0; i<installedPlatforms.length; i++) {
String antName = installedPlatforms[i].getProperties().get("platform.ant.name"); //NOI18N
if (antName != null && antName.equals(activePlatformId)) {
Expand Down
2 changes: 1 addition & 1 deletion enterprise/j2ee.earproject/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# under the License.

javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
javac.release=21
javadoc.arch=${basedir}/arch.xml

# need masterfs to support FileUtil.fromFile...
Expand Down
2 changes: 1 addition & 1 deletion enterprise/j2ee.ejbjarproject/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# under the License.

javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
javac.release=21
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml

Expand Down
5 changes: 4 additions & 1 deletion enterprise/javaee.project/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
javac.source=1.8

javac.release=21
requires.nb.javac=true

javac.compilerargs=-Xlint -Xlint:-serial
2 changes: 1 addition & 1 deletion enterprise/javaee.project/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>1.32</specification-version>
<specification-version>1.77</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ public static JavaPlatform getActivePlatform (final String activePlatformId) {
return pm.getDefaultPlatform();
}
else {
JavaPlatform[] installedPlatforms = pm.getPlatforms(null, new Specification ("j2se",null)); //NOI18N
JavaPlatform[] installedPlatforms = pm.getPlatforms(null, new Specification ("j2se")); //NOI18N
for (JavaPlatform p : installedPlatforms) {
String antName = p.getProperties().get("platform.ant.name"); // NOI18N
if (antName != null && antName.equals(activePlatformId)) {
Expand Down
2 changes: 1 addition & 1 deletion enterprise/javaee.wildfly/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter.eclipseFormatterLocatio
auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter.enableFormatAsSaveAction=false
auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter.showNotifications=true
auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter.useProjectSettings=false
javac.source=1.8
javac.release=21
#javac.compilerargs=-Xlint:unchecked


Expand Down
1 change: 1 addition & 0 deletions enterprise/javaee.wildfly/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>1.77</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public void loadJvmModel() {
jvmModel.removeAllElements();

// feed the combo with sorted platform list
JavaPlatform[] j2sePlatforms = jpm.getPlatforms(null, new Specification("J2SE", null)); // NOI18N
JavaPlatform[] j2sePlatforms = jpm.getPlatforms(null, new Specification("J2SE")); // NOI18N
JavaPlatformAdapter[] platformAdapters = new JavaPlatformAdapter[j2sePlatforms.length];
for (int i = 0; i < platformAdapters.length; i++) {
platformAdapters[i] = new JavaPlatformAdapter(j2sePlatforms[i]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
import org.netbeans.modules.javaee.wildfly.util.WildFlyProperties;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.modules.SpecificationVersion;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
import org.openide.util.Utilities;
Expand Down Expand Up @@ -88,7 +87,7 @@ class WildflyStartRunnable implements Runnable {
private static final String NEW_IF_CONDITION_STRING
= "\"xx\" == \"x\""; // NOI18N

private static final SpecificationVersion JDK_18 = new SpecificationVersion("1.8");
private static final Runtime.Version JDK_18 = Runtime.Version.parse("1.8");

private final WildflyDeploymentManager dm;
private final String instanceName;
Expand Down Expand Up @@ -141,7 +140,8 @@ private void setupEnvironment(final InstanceProperties ip, Environment env) {
javaOptsBuilder.append(" -Dlogging.configuration=").append(loggingProperties.toURL());
}
}
if (platform.getSpecification().getVersion().compareTo(JDK_18) < 0) {
Runtime.Version platformVersion = platform.getSpecification().getJdkVersion();
if (platformVersion != null && platformVersion.compareTo(JDK_18) < 0) {
javaOptsBuilder.append(" -XX:MaxPermSize=256m");
}
if ("64".equals(platform.getSystemProperties().get("sun.arch.data.model"))) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import org.openide.filesystems.FileUtil;
import org.openide.filesystems.URLMapper;
import org.openide.modules.InstalledFileLocator;

import org.openide.util.NbCollections;

/**
Expand Down Expand Up @@ -176,7 +177,7 @@ public void setProxyEnabled(boolean enabled) {
public JavaPlatform getJavaPlatform() {
String currentJvm = ip.getProperty(PROP_JAVA_PLATFORM);
JavaPlatformManager jpm = JavaPlatformManager.getDefault();
JavaPlatform[] installedPlatforms = jpm.getPlatforms(null, new Specification("J2SE", null)); // NOI18N
JavaPlatform[] installedPlatforms = jpm.getPlatforms(null, new Specification("J2SE")); // NOI18N
for (int i = 0; i < installedPlatforms.length; i++) {
String platformName = (String) installedPlatforms[i].getProperties().get(PLAT_PROP_ANT_NAME);
if (platformName != null && platformName.equals(currentJvm)) {
Expand Down
Loading
Loading