@@ -13,7 +13,7 @@ if [ -e netbeans ]; then
13
13
cd netbeans
14
14
git fetch
15
15
else
16
- git clone https://github.com/apache/incubator- netbeans/ netbeans
16
+ git clone https://github.com/apache/netbeans netbeans
17
17
cd netbeans
18
18
fi
19
19
@@ -98,6 +98,46 @@ index 48b940b88152..b5101f2abe25 100644
98
98
openide.windows,\
99
99
options.api,\
100
100
options.keymap,\
101
+ diff --git a/platform/o.n.bootstrap/launcher/unix/nbexec b/platform/o.n.bootstrap/launcher/unix/nbexec
102
+ index df47fa01ef..228e255976 100644
103
+ --- a/platform/o.n.bootstrap/launcher/unix/nbexec
104
+ +++ b/platform/o.n.bootstrap/launcher/unix/nbexec
105
+ @@ -137,7 +137,7 @@ if [ -z "$jdkhome" ] ; then
106
+ Darwin*)
107
+ # read Java Preferences
108
+ if [ -x "/usr/libexec/java_home" ]; then
109
+ - jdkhome=`/usr/libexec/java_home --version 1.8.0+ --failfast`
110
+ + jdkhome=`/usr/libexec/java_home --version 1.8.0+`
111
+
112
+ # JDK1.8 as a fallback
113
+ elif [ -f "/Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home/bin/java" ] ; then
114
+ diff --git a/harness/apisupport.harness/nbproject/project.properties b/harness/apisupport.harness/nbproject/project.properties
115
+ index 7db6d57275..4b8b94fa03 100644
116
+ --- a/harness/apisupport.harness/nbproject/project.properties
117
+ +++ b/harness/apisupport.harness/nbproject/project.properties
118
+ @@ -90,7 +90,10 @@ bundled.tasks=\
119
+ org/netbeans/nbbuild/VerifyJNLP*.class,\
120
+ org/netbeans/nbbuild/XMLUtil*.class,\
121
+ org/netbeans/nbbuild/extlibs/DownloadBinaries*.class,\
122
+ - org/netbeans/nbbuild/extlibs/ConfigureProxy*.class
123
+ + org/netbeans/nbbuild/extlibs/ConfigureProxy*.class,\
124
+ + org/netbeans/nbbuild/extlibs/ReleaseFilesCopy*.class,\
125
+ + org/netbeans/nbbuild/extlibs/ReleaseFilesExtra*.class,\
126
+ + org/netbeans/nbbuild/extlibs/ReleaseFilesLicense*.class
127
+
128
+ test.unit.cp.extra=${netbeans.dest.dir}/harness/jnlp/jnlp-launcher.jar
129
+ javadoc.arch=${basedir}/arch.xml
130
+ diff --git a/harness/apisupport.harness/taskdefs.properties b/harness/apisupport.harness/taskdefs.properties
131
+ index 19a01429c9..0d8b86adef 100644
132
+ --- a/harness/apisupport.harness/taskdefs.properties
133
+ +++ b/harness/apisupport.harness/taskdefs.properties
134
+ @@ -40,3 +40,6 @@ parsemanifest=org.netbeans.nbbuild.ParseManifest
135
+ autoupdate=org.netbeans.nbbuild.AutoUpdate
136
+ downloadbinaries=org.netbeans.nbbuild.extlibs.DownloadBinaries
137
+ processjsannotation=org.netbeans.nbbuild.ProcessJsAnnotationsTask
138
+ +releasefilescopy=org.netbeans.nbbuild.extlibs.ReleaseFilesCopy
139
+ +releasefilesextra=org.netbeans.nbbuild.extlibs.ReleaseFilesExtra
140
+ +releasefileslicense=org.netbeans.nbbuild.extlibs.ReleaseFilesLicense
101
141
EOF
102
142
git status
103
143
0 commit comments