You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2022/04/27 10:12:40 UTC
[netbeans-mavenutils-nbm-maven-harness] branch master updated: use copy goal + ant adaptation
This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-nbm-maven-harness.git
The following commit(s) were added to refs/heads/master by this push:
new fc5ac6a use copy goal + ant adaptation
new c86951e Merge pull request #8 from ebarboni/antfix
fc5ac6a is described below
commit fc5ac6abd9466d90cd912b96f88ce3d0f1de6f7c
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Thu Apr 7 12:52:51 2022 +0200
use copy goal + ant adaptation
---
pom.xml | 68 ++++++++++++++++++++++++++++++-----------------------------------
1 file changed, 31 insertions(+), 37 deletions(-)
diff --git a/pom.xml b/pom.xml
index a9f3ba9..70097ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,39 +58,33 @@ under the License.
<phase>generate-resources</phase>
<id>unpack-harness</id>
<goals>
- <goal>get</goal>
+ <goal>copy</goal>
</goals>
<configuration>
- <artifact>org.netbeans.modules:org-netbeans-modules-apisupport-harness:${netbeans.version}:nbm</artifact>
- <transitive>false</transitive>
- <remoteRepositories>${netbeans.repo}</remoteRepositories>
- <destination>${project.build.directory}/harness.nbm</destination>
- </configuration>
- </execution>
- <execution>
- <phase>generate-resources</phase>
- <id>unpack-installer</id>
- <goals>
- <goal>get</goal>
- </goals>
- <configuration>
- <artifact>org.netbeans.modules:org-netbeans-libs-nbi-ant:${netbeans.version}:nbm</artifact>
- <transitive>false</transitive>
- <remoteRepositories>${netbeans.repo}</remoteRepositories>
- <destination>${project.build.directory}/nbi-ant.nbm</destination>
- </configuration>
- </execution>
- <execution>
- <phase>generate-resources</phase>
- <id>unpack-installer-engine</id>
- <goals>
- <goal>get</goal>
- </goals>
- <configuration>
- <artifact>org.netbeans.modules:org-netbeans-libs-nbi-engine:${netbeans.version}:nbm</artifact>
- <transitive>false</transitive>
- <remoteRepositories>${netbeans.repo}</remoteRepositories>
- <destination>${project.build.directory}/nbi-engine.nbm</destination>
+ <!-- copy to ${project.build.directory}/dependency folder by default -->
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.netbeans.modules</groupId>
+ <artifactId>org-netbeans-modules-apisupport-harness</artifactId>
+ <version>${netbeans.version}</version>
+ <type>nbm</type>
+ <destFileName>harness.nbm</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.netbeans.modules</groupId>
+ <artifactId>org-netbeans-libs-nbi-ant</artifactId>
+ <version>${netbeans.version}</version>
+ <type>nbm</type>
+ <destFileName>nbi-ant.nbm</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.netbeans.modules</groupId>
+ <artifactId>org-netbeans-libs-nbi-engine</artifactId>
+ <version>${netbeans.version}</version>
+ <type>nbm</type>
+ <destFileName>nbi-engine.nbm</destFileName>
+ </artifactItem>
+ </artifactItems>
</configuration>
</execution>
</executions>
@@ -107,7 +101,8 @@ under the License.
</goals>
<configuration>
<target>
- <unzip src="${project.build.directory}/harness.nbm" dest="${project.build.directory}/classes">
+ <property name="dependency.directory" value="${project.build.directory}/dependency/" />
+ <unzip src="${dependency.directory}harness.nbm" dest="${project.build.directory}/classes">
<patternset>
<include name="netbeans/etc/app.conf" />
<include name="netbeans/etc/applicationIcon.icns" />
@@ -116,7 +111,7 @@ under the License.
</patternset>
<mapper type="glob" from="netbeans/*" to="harness/*" />
</unzip>
- <unzip src="${project.build.directory}/harness.nbm" dest="${project.build.directory}">
+ <unzip src="${dependency.directory}harness.nbm" dest="${project.build.directory}">
<patternset>
<include name="netbeans/tasks.jar" />
<include name="netbeans/jnlp/jnlp-launcher.jar" />
@@ -125,14 +120,14 @@ under the License.
</unzip>
<mkdir dir="${project.build.directory}/classes/harness/jnlp" />
<unzip src="${project.build.directory}/tasks.jar" dest="${project.build.directory}/classes" />
- <unzip src="${project.build.directory}/nbi-ant.nbm" dest="${project.build.directory}/classes">
+ <unzip src="${dependency.directory}nbi-ant.nbm" dest="${project.build.directory}/classes">
<patternset>
<include name="netbeans/modules/" />
<include name="netbeans/nbi/" />
</patternset>
<mapper type="glob" from="netbeans/*" to="harness/*" />
</unzip>
- <unzip src="${project.build.directory}/nbi-engine.nbm" dest="${project.build.directory}/classes">
+ <unzip src="${dependency.directory}nbi-engine.nbm" dest="${project.build.directory}/classes">
<patternset>
<include name="netbeans/modules/" />
</patternset>
@@ -240,7 +235,6 @@ under the License.
</reporting>
<properties>
<!-- XXX SHOULD BE RELEASE 9.0 and superior artefacts changes to Apache Licence -->
- <netbeans.repo>netbeans::default::https://repo1.maven.org/maven2/</netbeans.repo>
- <netbeans.version>RELEASE122</netbeans.version>
+ <netbeans.version>RELEASE130</netbeans.version>
</properties>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists