Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import java.io.OutputStream;
import java.util.Collections;
import java.util.List;
import java.util.Properties;
import javax.xml.namespace.QName;
import org.apache.maven.artifact.versioning.ComparableVersion;
import org.apache.maven.model.Dependency;
Expand All @@ -45,6 +44,7 @@
import org.netbeans.modules.maven.model.pom.POMQName;
import org.netbeans.modules.maven.model.pom.Plugin;
import org.netbeans.modules.maven.model.pom.Project;
import org.netbeans.modules.maven.model.pom.Properties;
import org.netbeans.modules.maven.model.pom.Repository;
import org.netbeans.modules.maven.model.pom.RepositoryPolicy;
import org.netbeans.modules.maven.options.MavenVersionSettings;
Expand Down Expand Up @@ -118,8 +118,7 @@ public void run() {
File res = new File(src, path);
res.mkdirs();
try (OutputStream os = new BufferedOutputStream(new FileOutputStream(new File(res, "Bundle.properties")))) {
Properties p = new Properties();
p.store(os, EMPTY_BUNDLE_FILE);
new java.util.Properties().store(os, EMPTY_BUNDLE_FILE);
} catch (IOException ex) {
Exceptions.printStackTrace(ex);
}
Expand Down Expand Up @@ -309,7 +308,7 @@ public void performOperation(POMModel model) {
p.setVersion(settings.getVersion(Constants.GROUP_APACHE_PLUGINS, Constants.PLUGIN_COMPILER));
}
getOrCreateBuild(model).addPlugin(p);
model.getProject().getProperties().setProperty("maven.compiler.release", "17");
getOrCreateProperties(model).setProperty("maven.compiler.release", "17");
}

//now the jar plugin
Expand Down Expand Up @@ -385,6 +384,15 @@ private Build getOrCreateBuild(POMModel model) {
}
return bld;
}

private Properties getOrCreateProperties(POMModel model) {
Properties props = model.getProject().getProperties();
if (props == null) {
props = model.getFactory().createProperties();
model.getProject().setProperties(props);
}
return props;
}
}

}