This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 3663c1d [NETBEANS-2883] Remove link to bits.netbeans.org/maven2 + test
3663c1d is described below
commit 3663c1d818d0c78d817560f6bbd9e0fe4a00942a
Author: Eric Barboni <[email protected]>
AuthorDate: Sun Aug 4 10:49:40 2019 +0200
[NETBEANS-2883] Remove link to bits.netbeans.org/maven2 + test
---
.../maven.apisupport/nbproject/project.properties | 2 +-
apisupport/maven.apisupport/nbproject/project.xml | 4 +
.../maven/apisupport/MavenNbModuleImpl.java | 4 +-
.../modules/maven/apisupport/NBMNativeMWI.java | 30 +--
.../maven/apisupport/NbmWizardPanelVisual.java | 1 -
.../modules/maven/apisupport/NBMNativeMWITest.java | 222 +++++++++++++++++++++
6 files changed, 239 insertions(+), 24 deletions(-)
diff --git a/apisupport/maven.apisupport/nbproject/project.properties
b/apisupport/maven.apisupport/nbproject/project.properties
index 5f7dca0..1f24984 100644
--- a/apisupport/maven.apisupport/nbproject/project.properties
+++ b/apisupport/maven.apisupport/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
is.eager=true
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
test.config.stableBTD.includes=**/*Test.class
diff --git a/apisupport/maven.apisupport/nbproject/project.xml
b/apisupport/maven.apisupport/nbproject/project.xml
index 3aa21f1..5b1e548 100644
--- a/apisupport/maven.apisupport/nbproject/project.xml
+++ b/apisupport/maven.apisupport/nbproject/project.xml
@@ -390,6 +390,10 @@
<test-dependency>
<code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
</test-dependency>
+ <test-dependency>
+
<code-name-base>org.netbeans.modules.xml.xdm</code-name-base>
+ <compile-dependency/>
+ </test-dependency>
</test-type>
</test-dependencies>
<public-packages/>
diff --git
a/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenNbModuleImpl.java
b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenNbModuleImpl.java
index 82d86f6..fea023a 100644
---
a/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenNbModuleImpl.java
+++
b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenNbModuleImpl.java
@@ -94,7 +94,6 @@ public class MavenNbModuleImpl implements NbModuleProvider {
private final RequestProcessor.Task tsk = RP.create(dependencyAdder);
- public static final String NETBEANS_REPO_ID = "netbeans";
public static final String MAVEN_CENTRAL = "central";
public static final String APACHE_SNAPSHOT_REPO_ID = "apache.snapshots";
// this repository is not good anymore, dev-SNAPSHOT version are buil on
apache snapshot
@@ -122,8 +121,7 @@ public class MavenNbModuleImpl implements NbModuleProvider {
static List<RepositoryInfo> netbeansRepo() {
return Arrays.asList(
-
RepositoryPreferences.getInstance().getRepositoryInfoById(MAVEN_CENTRAL),
-
RepositoryPreferences.getInstance().getRepositoryInfoById(NETBEANS_REPO_ID));
+
RepositoryPreferences.getInstance().getRepositoryInfoById(MAVEN_CENTRAL));
}
private File getModuleXmlLocation() {
diff --git
a/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NBMNativeMWI.java
b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NBMNativeMWI.java
index a9858f5..c3d0ac7 100644
---
a/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NBMNativeMWI.java
+++
b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NBMNativeMWI.java
@@ -162,23 +162,20 @@ final class NBMNativeMWI {
//add repository
boolean addRepository = true;
boolean isSnapshot =
NbmWizardIterator.SNAPSHOT_VERSION.equals(netbeansDependencyVersion);
- String repoUrl = isSnapshot ?
"https://repository.apache.org/content/repositories/snapshots/"; :
"http://bits.netbeans.org/nexus/content/groups/netbeans";;
- String oldRepoUrl = isSnapshot ?
"https://repository.apache.org/content/repositories/snapshots/"; :
"http://bits.netbeans.org/maven2";;
+ String snapshotRepoUrl =
"https://repository.apache.org/content/repositories/snapshots/";;
if (parent != null) {
List<ArtifactRepository> repos =
parent.getRemoteArtifactRepositories();
if (repos != null) {
OUTER :
for (ArtifactRepository repo : repos) {
- if (repoUrl.equals(repo.getUrl()) || (repoUrl +
"/").equals(repo.getUrl()) ||
- oldRepoUrl.equals(repo.getUrl()) ||
(oldRepoUrl + "/").equals(repo.getUrl()))
+ if (snapshotRepoUrl.equals(repo.getUrl()) ||
(snapshotRepoUrl + "/").equals(repo.getUrl()))
{
addRepository = false;
break;
}
if (repo.getMirroredRepositories() != null) {
for (ArtifactRepository mirr :
repo.getMirroredRepositories()) {
- if (repoUrl.equals(mirr.getUrl()) ||
(repoUrl + "/").equals(mirr.getUrl()) ||
- oldRepoUrl.equals(mirr.getUrl()) ||
(oldRepoUrl + "/").equals(mirr.getUrl()))
+ if (snapshotRepoUrl.equals(mirr.getUrl())
|| (snapshotRepoUrl + "/").equals(mirr.getUrl()))
{
addRepository = false;
break OUTER;
@@ -188,20 +185,14 @@ final class NBMNativeMWI {
}
}
}
- if (addRepository) {
+ if (addRepository && isSnapshot ) {
Repository repo = model.getFactory().createRepository();
- repo.setId(isSnapshot ?
MavenNbModuleImpl.APACHE_SNAPSHOT_REPO_ID : MavenNbModuleImpl.NETBEANS_REPO_ID);
+ repo.setId(MavenNbModuleImpl.APACHE_SNAPSHOT_REPO_ID);
repo.setName("Repository hosting NetBeans modules");
- repo.setUrl(repoUrl);
- if (isSnapshot) {
- RepositoryPolicy policy =
model.getFactory().createReleaseRepositoryPolicy();
- policy.setEnabled(false);
- repo.setReleases(policy);
- } else {
- RepositoryPolicy policy =
model.getFactory().createSnapshotRepositoryPolicy();
- policy.setEnabled(false);
- repo.setSnapshots(policy);
- }
+ repo.setUrl(snapshotRepoUrl);
+ RepositoryPolicy policy =
model.getFactory().createReleaseRepositoryPolicy();
+ policy.setEnabled(false);
+ repo.setReleases(policy);
root.addRepository(repo);
}
@@ -379,6 +370,7 @@ final class NBMNativeMWI {
p.setArtifactId(Constants.PLUGIN_JAR);
if (managedPVersion == null) {
p.setVersion(pVersion);
+ managedPVersion = pVersion;
}
Configuration c = model.getFactory().createConfiguration();
if (new ComparableVersion(managedPVersion).compareTo(new
ComparableVersion(JAR_PLUGIN_VERSION_MANIFEST_CONFIG_CHANGE)) >= 0) {
@@ -390,7 +382,7 @@ final class NBMNativeMWI {
manifestelement.setElementText("${project.build.outputDirectory}/META-INF/MANIFEST.MF");
archiveelement.addAnyElement(manifestelement, 0);
- c.getConfigurationElements().add(archiveelement);
+ c.addExtensibilityElement(archiveelement);
} else {
c.setSimpleParameter("useDefaultManifestFile", "true");
}
diff --git
a/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardPanelVisual.java
b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardPanelVisual.java
index e6696ec..da8b25d 100644
---
a/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardPanelVisual.java
+++
b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardPanelVisual.java
@@ -105,7 +105,6 @@ public class NbmWizardPanelVisual extends
javax.swing.JPanel {
final Object key = this;
if (info == null || info.contains(null)) {
try {
-
RepositoryPreferences.getInstance().addTransientRepository(key,
MavenNbModuleImpl.NETBEANS_REPO_ID, MavenNbModuleImpl.NETBEANS_REPO_ID,
"http://bits.netbeans.org/maven2/";, RepositoryInfo.MirrorStrategy.NON_WILDCARD);
//transient remove central, make central transient too
RepositoryPreferences.getInstance().addTransientRepository(key, "central",
"central", "https://repo1.maven.org/maven2";,
RepositoryInfo.MirrorStrategy.NON_WILDCARD);
info = MavenNbModuleImpl.netbeansRepo();
diff --git
a/apisupport/maven.apisupport/test/unit/src/org/netbeans/modules/maven/apisupport/NBMNativeMWITest.java
b/apisupport/maven.apisupport/test/unit/src/org/netbeans/modules/maven/apisupport/NBMNativeMWITest.java
new file mode 100644
index 0000000..ebf12c2
--- /dev/null
+++
b/apisupport/maven.apisupport/test/unit/src/org/netbeans/modules/maven/apisupport/NBMNativeMWITest.java
@@ -0,0 +1,222 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.maven.apisupport;
+
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.logging.Level;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import org.junit.Test;
+import org.netbeans.junit.NbTestCase;
+import org.netbeans.modules.maven.api.archetype.ProjectInfo;
+import org.openide.filesystems.FileObject;
+import org.openide.filesystems.FileUtil;
+
+public class NBMNativeMWITest extends NbTestCase {
+
+ private FileObject wd;
+
+ public NBMNativeMWITest(String testName) {
+ super(testName);
+ }
+
+ protected @Override
+ Level logLevel() {
+ return Level.FINE;
+ }
+
+ @Test
+ public void testPathNoParent() throws IOException, XmlPullParserException {
+ clearWorkDir();
+ wd = FileUtil.toFileObject(getWorkDir());
+ FileObject createData = wd.createFolder("test1");
+ ProjectInfo pi = new ProjectInfo("my.groupid", "artefact1", "1.0",
"my.packagename");
+ NBMNativeMWI.instantiate(pi, FileUtil.toFile(createData),
"RELEASE110", true, null);
+
+ FileObject builtpom = createData.getFileObject("pom", "xml");
+ MavenXpp3Reader reader = new MavenXpp3Reader();
+ Model model = reader.read(new FileReader(FileUtil.toFile(builtpom)));
+
+ assertEquals("nbm-maven-plugin",
model.getBuild().getPlugins().get(0).getArtifactId());
+ assertEquals(MavenNbModuleImpl.LATEST_NBM_PLUGIN_VERSION,
model.getBuild().getPlugins().get(0).getVersion());
+ assertEquals("maven-compiler-plugin",
model.getBuild().getPlugins().get(1).getArtifactId());
+ assertEquals("3.8.1",
model.getBuild().getPlugins().get(1).getVersion());
+ assertEquals(0, model.getRepositories().size());
+ }
+
+ @Test
+ public void testPathNoParentSnapshot() throws IOException,
XmlPullParserException {
+ clearWorkDir();
+ wd = FileUtil.toFileObject(getWorkDir());
+ FileObject createData = wd.createFolder("test1");
+ ProjectInfo pi = new ProjectInfo("my.groupid", "artefact1", "1.0",
"my.packagename");
+ NBMNativeMWI.instantiate(pi, FileUtil.toFile(createData),
"dev-SNAPSHOT", true, null);
+ FileObject builtpom = createData.getFileObject("pom", "xml");
+
+ MavenXpp3Reader reader = new MavenXpp3Reader();
+ Model model = reader.read(new FileReader(FileUtil.toFile(builtpom)));
+ assertEquals("nbm-maven-plugin",
model.getBuild().getPlugins().get(0).getArtifactId());
+ assertEquals(MavenNbModuleImpl.LATEST_NBM_PLUGIN_VERSION,
model.getBuild().getPlugins().get(0).getVersion());
+ assertEquals("maven-compiler-plugin",
model.getBuild().getPlugins().get(1).getArtifactId());
+ assertEquals("3.8.1",
model.getBuild().getPlugins().get(1).getVersion());
+ assertEquals(1, model.getRepositories().size());
+ }
+
+ @Test
+ public void testPathParent() throws IOException, XmlPullParserException {
+ clearWorkDir();
+ wd = FileUtil.toFileObject(getWorkDir());
+ FileObject createDatap = wd.createFolder("testp");
+ FileObject parentpomFile = createDatap.createData("pom", "xml");
+
+ FileObject createData = wd.createFolder("test2");
+ ProjectInfo pi = new ProjectInfo("my.groupid", "artefact1", "1.0",
"my.packagename");
+ MavenProject mp = new MavenProject();
+ mp.setVersion("3");
+ mp.setGroupId("mm");
+ mp.setArtifactId("aaa");
+ mp.setFile(FileUtil.toFile(parentpomFile));
+ NBMNativeMWI.instantiate(pi, FileUtil.toFile(createData),
"RELEASE110", true, mp);
+
+ MavenXpp3Reader reader = new MavenXpp3Reader();
+ FileObject builtpom = createData.getFileObject("pom", "xml");
+ Model model = reader.read(new FileReader(FileUtil.toFile(builtpom)));
+
+ assertEquals("nbm-maven-plugin",
model.getBuild().getPlugins().get(0).getArtifactId());
+ assertEquals(MavenNbModuleImpl.LATEST_NBM_PLUGIN_VERSION,
model.getBuild().getPlugins().get(0).getVersion());
+ assertEquals("maven-compiler-plugin",
model.getBuild().getPlugins().get(1).getArtifactId());
+ assertEquals("3.8.1",
model.getBuild().getPlugins().get(1).getVersion());
+ assertEquals(0, model.getRepositories().size());
+ }
+
+ @Test
+ public void testPathParentSnapshot() throws IOException,
XmlPullParserException {
+ clearWorkDir();
+ wd = FileUtil.toFileObject(getWorkDir());
+ FileObject createDatap = wd.createFolder("testp");
+ FileObject parentpomFile = createDatap.createData("pom", "xml");
+ FileObject createData = wd.createFolder("test2");
+ ProjectInfo pi = new ProjectInfo("my.groupid", "artefact1", "1.0",
"my.packagename");
+ MavenProject mp = new MavenProject();
+ mp.setVersion("3");
+ mp.setGroupId("mm");
+ mp.setArtifactId("aaa");
+ mp.setFile(FileUtil.toFile(parentpomFile));
+ NBMNativeMWI.instantiate(pi, FileUtil.toFile(createData),
"dev-SNAPSHOT", true, mp);
+
+ MavenXpp3Reader reader = new MavenXpp3Reader();
+ FileObject builtpom = createData.getFileObject("pom", "xml");
+ Model model = reader.read(new FileReader(FileUtil.toFile(builtpom)));
+
+ assertEquals("nbm-maven-plugin",
model.getBuild().getPlugins().get(0).getArtifactId());
+ assertEquals(MavenNbModuleImpl.LATEST_NBM_PLUGIN_VERSION,
model.getBuild().getPlugins().get(0).getVersion());
+ assertEquals("maven-compiler-plugin",
model.getBuild().getPlugins().get(1).getArtifactId());
+ assertEquals("3.8.1",
model.getBuild().getPlugins().get(1).getVersion());
+ assertEquals(1, model.getRepositories().size());
+ }
+
+ @Test
+ public void testPathParentCompiler() throws IOException,
XmlPullParserException {
+ clearWorkDir();
+ wd = FileUtil.toFileObject(getWorkDir());
+ FileObject createDatap = wd.createFolder("testp");
+ FileObject parentpomFile = createDatap.createData("pom", "xml");
+ try (OutputStream os = parentpomFile.getOutputStream()) {
+ os.write(POMCOMPILER.getBytes("UTF-8"));
+ }
+ MavenXpp3Reader reader = new MavenXpp3Reader();
+ Model model = reader.read(new
FileReader(FileUtil.toFile(parentpomFile)));
+ FileObject createData = wd.createFolder("test2");
+ ProjectInfo pi = new ProjectInfo("my.groupid", "artefact1", "1.0",
"my.packagename");
+ MavenProject mp = new MavenProject(model);
+ mp.setFile(FileUtil.toFile(parentpomFile));
+ NBMNativeMWI.instantiate(pi, FileUtil.toFile(createData),
"RELEASE110", true, mp);
+
+ MavenXpp3Reader readeroutput = new MavenXpp3Reader();
+ FileObject builtpom = createData.getFileObject("pom", "xml");
+ Model modeloutput = readeroutput.read(new
FileReader(FileUtil.toFile(builtpom)));
+
+ assertEquals("nbm-maven-plugin",
modeloutput.getBuild().getPlugins().get(0).getArtifactId());
+ assertEquals(MavenNbModuleImpl.LATEST_NBM_PLUGIN_VERSION,
modeloutput.getBuild().getPlugins().get(0).getVersion());
+ assertEquals("maven-compiler-plugin",
modeloutput.getBuild().getPlugins().get(1).getArtifactId());
+ assertEquals(null,
modeloutput.getBuild().getPlugins().get(1).getVersion());
+ assertEquals(0, model.getRepositories().size());
+ }
+
+ @Test
+ public void testPathParentJar() throws IOException, XmlPullParserException
{
+ clearWorkDir();
+ wd = FileUtil.toFileObject(getWorkDir());
+ FileObject createDatap = wd.createFolder("testp");
+ FileObject parentpomFile = createDatap.createData("pom", "xml");
+ try (OutputStream os = parentpomFile.getOutputStream()) {
+ os.write(POMJAR.getBytes("UTF-8"));
+ }
+ MavenXpp3Reader reader = new MavenXpp3Reader();
+ Model model = reader.read(new
FileReader(FileUtil.toFile(parentpomFile)));
+ FileObject createData = wd.createFolder("test2");
+ ProjectInfo pi = new ProjectInfo("my.groupid", "artefact1", "1.0",
"my.packagename");
+ MavenProject mp = new MavenProject(model);
+ mp.setFile(FileUtil.toFile(parentpomFile));
+ NBMNativeMWI.instantiate(pi, FileUtil.toFile(createData),
"RELEASE110", true, mp);
+ MavenXpp3Reader readeroutput = new MavenXpp3Reader();
+ FileObject builtpom = createData.getFileObject("pom", "xml");
+ Model modeloutput = readeroutput.read(new
FileReader(FileUtil.toFile(builtpom)));
+
+ assertEquals("nbm-maven-plugin",
modeloutput.getBuild().getPlugins().get(0).getArtifactId());
+ assertEquals(MavenNbModuleImpl.LATEST_NBM_PLUGIN_VERSION,
modeloutput.getBuild().getPlugins().get(0).getVersion());
+ assertEquals("maven-compiler-plugin",
modeloutput.getBuild().getPlugins().get(1).getArtifactId());
+ assertEquals("3.8.1",
modeloutput.getBuild().getPlugins().get(1).getVersion());
+ assertEquals(0, model.getRepositories().size());
+ }
+
+ private String POMCOMPILER
+ = "<project>\n"
+ + "<modelVersion>4.0.0</modelVersion>"
+ + "<build>"
+ + "<pluginManagement>"
+ + "<plugins>"
+ + "<plugin>"
+ + "<groupId>org.apache.maven.plugins</groupId>"
+ + "<artifactId>maven-compiler-plugin</artifactId>"
+ + "<version>3.3.1.1</version>"
+ + "</plugin></plugins>"
+ + "</pluginManagement>"
+ + "</build>"
+ + "</project>";
+
+ private String POMJAR
+ = "<project>\n"
+ + "<modelVersion>4.0.0</modelVersion>"
+ + "<build>"
+ + "<pluginManagement>"
+ + "<plugins>"
+ + "<plugin>"
+ + "<groupId>org.apache.maven.plugins</groupId>"
+ + "<artifactId>maven-jar-plugin</artifactId>"
+ + "<version>2.1.0</version>"
+ + "</plugin></plugins>"
+ + "</pluginManagement>"
+ + "</build>"
+ + "</project>";
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
