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 dca6c64 [NETBEANS-2863] Use RELEASE112 to fix installers with Java
11+.
new cc442c2 Merge pull request #1 from oyarzun/NETBEANS-2863
dca6c64 is described below
commit dca6c64c19ebe5b3ffe93e72eb33b9cf6d11654e
Author: Christian Oyarzun <[email protected]>
AuthorDate: Fri Dec 13 11:07:45 2019 -0500
[NETBEANS-2863] Use RELEASE112 to fix installers with Java 11+.
---
pom.xml | 37 +++----------------------------------
1 file changed, 3 insertions(+), 34 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7158de2..9557a51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,20 +117,12 @@ under the License.
</unzip>
<unzip
src="${project.build.directory}/harness.nbm" dest="${project.build.directory}">
<patternset>
- <include
name="netbeans/tasks.jar.pack.gz" />
- <include
name="netbeans/jnlp/jnlp-launcher.jar.pack.gz" />
+ <include name="netbeans/tasks.jar" />
+ <include
name="netbeans/jnlp/jnlp-launcher.jar" />
</patternset>
<flattenmapper />
</unzip>
- <exec executable="unpack200"
failonerror="true">
- <arg
file="${project.build.directory}/tasks.jar.pack.gz" />
- <arg
file="${project.build.directory}/tasks.jar" />
- </exec>
<mkdir
dir="${project.build.directory}/classes/harness/jnlp" />
- <exec executable="unpack200"
failonerror="true">
- <arg
file="${project.build.directory}/jnlp-launcher.jar.pack.gz" />
- <arg
file="${project.build.directory}/classes/harness/jnlp/jnlp-launcher.jar" />
- </exec>
<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">
<patternset>
@@ -145,29 +137,6 @@ under the License.
</patternset>
<mapper type="glob" from="netbeans/*"
to="harness/*" />
</unzip>
- <exec executable="unpack200"
failonerror="true">
- <arg
file="${project.build.directory}/classes/harness/modules/org-netbeans-libs-nbi-ant.jar.pack.gz"
/>
- <arg
file="${project.build.directory}/classes/harness/modules/org-netbeans-libs-nbi-ant.jar"
/>
- </exec>
- <exec executable="unpack200"
failonerror="true">
- <arg
file="${project.build.directory}/classes/harness/modules/org-netbeans-libs-nbi-engine.jar.pack.gz"
/>
- <arg
file="${project.build.directory}/classes/harness/modules/org-netbeans-libs-nbi-engine.jar"
/>
- </exec>
- <exec executable="unpack200"
failonerror="true">
- <arg
file="${project.build.directory}/classes/harness/modules/ext/nbi-engine.jar.pack.gz"
/>
- <arg
file="${project.build.directory}/classes/harness/modules/ext/nbi-engine.jar" />
- </exec>
- <exec executable="unpack200"
failonerror="true">
- <arg
file="${project.build.directory}/classes/harness/modules/ext/nbi-registries-management.jar.pack.gz"
/>
- <arg
file="${project.build.directory}/classes/harness/modules/ext/nbi-registries-management.jar"
/>
- </exec>
- <exec executable="unpack200"
failonerror="true">
- <arg
file="${project.build.directory}/classes/harness/modules/ext/nbi-ant-tasks.jar.pack.gz"
/>
- <arg
file="${project.build.directory}/classes/harness/modules/ext/nbi-ant-tasks.jar"
/>
- </exec>
- <delete>
- <fileset
dir="${project.build.directory}/classes/harness/modules"
includes="**/*.pack.gz" />
- </delete>
<!-- patch product.xml - unable to delete temp
files after build finishes -->
<replace
file="${project.build.directory}/classes/harness/nbi/.common/product.xml">
<replacetoken
expandProperties="false"><![CDATA[<delete
dir="${current.temp.dir}>"]]></replacetoken>
@@ -271,6 +240,6 @@ under the License.
<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>RELEASE111</netbeans.version>
+ <netbeans.version>RELEASE112</netbeans.version>
</properties>
</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
