This is an automated email from the ASF dual-hosted git repository.
mbien 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 61c015d2b4 bump CI matrix from 20-ea to 21-ea.
new a70350ecb4 Merge pull request #5653 from mbien/ci-test-on-21
61c015d2b4 is described below
commit 61c015d2b4173721413161cdbe1d802407f975e3
Author: Michael Bien <[email protected]>
AuthorDate: Sat Mar 11 20:17:10 2023 +0100
bump CI matrix from 20-ea to 21-ea.
Next LTS release! :)
- updated javac warning settings where needed
- fixed groovy/libs.groovy and php/websvc.saas.codegen.php builds
Co-authored-by: Matthias Bläsing <[email protected]>
---
.github/workflows/main.yml | 6 +++---
groovy/libs.groovy/nbproject/project.xml | 4 ++--
php/websvc.saas.codegen.php/nbproject/project.xml | 19 ++++++++++++++-----
platform/api.search/nbproject/project.properties | 2 +-
platform/janitor/nbproject/project.properties | 2 +-
.../websvc.jaxwsmodelapi/nbproject/project.xml | 1 +
6 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0fc0e0f744..be9e3c21a4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -97,7 +97,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
- java: [ '11', '17', '20-ea' ]
+ java: [ '11', '17', '21-ea' ]
fail-fast: false
steps:
@@ -121,7 +121,7 @@ jobs:
restore-keys: ${{ runner.os }}-
- name: Setup Gradle Daemon to run on JDK 11
- if: ${{ matrix.java == '20-ea' }}
+ if: ${{ matrix.java == '21-ea' }}
run: |
mkdir -p ~/.gradle
#uses a preinstalled JDK 11 from the runner
@@ -193,7 +193,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
- java: [ '8', '11', '17', '20-ea' ]
+ java: [ '8', '11', '17', '21-ea' ]
fail-fast: false
steps:
diff --git a/groovy/libs.groovy/nbproject/project.xml
b/groovy/libs.groovy/nbproject/project.xml
index ee6e1a6dc8..a85eed42d5 100644
--- a/groovy/libs.groovy/nbproject/project.xml
+++ b/groovy/libs.groovy/nbproject/project.xml
@@ -30,7 +30,6 @@
<friend>org.netbeans.modules.groovy.editor</friend>
<friend>org.netbeans.modules.groovy.refactoring</friend>
<friend>org.netbeans.modules.groovy.support</friend>
- <package>groovy</package>
<package>groovy.beans</package>
<package>groovy.cli</package>
<package>groovy.grape</package>
@@ -49,6 +48,7 @@
<package>groovy.util.logging</package>
<package>groovy.xml</package>
<package>groovyjarjarantlr</package>
+ <package>groovyjarjarantlr.collections.impl</package>
<package>groovyjarjarasm.asm</package>
<package>org.codehaus.groovy</package>
<package>org.codehaus.groovy.ant</package>
@@ -72,8 +72,8 @@
<package>org.codehaus.groovy.tools</package>
<package>org.codehaus.groovy.transform</package>
<package>org.codehaus.groovy.transform.sc</package>
- <package>org.codehaus.groovy.transform.trait</package>
<package>org.codehaus.groovy.transform.stc</package>
+ <package>org.codehaus.groovy.transform.trait</package>
</friend-packages>
<class-path-extension>
<runtime-relative-path>ext/groovy-3.0.8.jar</runtime-relative-path>
diff --git a/php/websvc.saas.codegen.php/nbproject/project.xml
b/php/websvc.saas.codegen.php/nbproject/project.xml
index 00bae6ea32..8b0b4a6fee 100644
--- a/php/websvc.saas.codegen.php/nbproject/project.xml
+++ b/php/websvc.saas.codegen.php/nbproject/project.xml
@@ -43,6 +43,15 @@
<specification-version>1.18</specification-version>
</run-dependency>
</dependency>
+ <dependency>
+
<code-name-base>org.netbeans.modules.websvc.jaxwsmodelapi</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.47</specification-version>
+ </run-dependency>
+ </dependency>
<dependency>
<code-name-base>org.netbeans.modules.websvc.saas.api</code-name-base>
<build-prerequisite/>
@@ -93,7 +102,7 @@
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.openide.util.ui</code-name-base>
+ <code-name-base>org.openide.util</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
@@ -101,19 +110,19 @@
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.openide.util</code-name-base>
+ <code-name-base>org.openide.util.lookup</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>9.3</specification-version>
+ <specification-version>8.0</specification-version>
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
+ <code-name-base>org.openide.util.ui</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>8.0</specification-version>
+ <specification-version>9.3</specification-version>
</run-dependency>
</dependency>
</module-dependencies>
diff --git a/platform/api.search/nbproject/project.properties
b/platform/api.search/nbproject/project.properties
index b56cd50758..13888f495d 100644
--- a/platform/api.search/nbproject/project.properties
+++ b/platform/api.search/nbproject/project.properties
@@ -16,6 +16,6 @@
# under the License.
is.autoload=true
javac.source=1.8
-javac.compilerargs=-Xlint:all -Xlint:-serial -Xlint:-processing
-Xlint:-options -Werror
+javac.compilerargs=-Xlint:all -Xlint:-serial -Xlint:-processing -Xlint:-options
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
diff --git a/platform/janitor/nbproject/project.properties
b/platform/janitor/nbproject/project.properties
index dfd12fcb89..7f5883babe 100644
--- a/platform/janitor/nbproject/project.properties
+++ b/platform/janitor/nbproject/project.properties
@@ -16,4 +16,4 @@
# under the License.
is.autoload=true
javac.source=1.8
-javac.compilerargs=-Xlint:all -Xlint:-serial -Xlint:-processing
-Xlint:-options -Werror
+javac.compilerargs=-Xlint:all -Xlint:-serial -Xlint:-processing -Xlint:-options
diff --git a/websvccommon/websvc.jaxwsmodelapi/nbproject/project.xml
b/websvccommon/websvc.jaxwsmodelapi/nbproject/project.xml
index fc1d27a741..ea090d5c10 100644
--- a/websvccommon/websvc.jaxwsmodelapi/nbproject/project.xml
+++ b/websvccommon/websvc.jaxwsmodelapi/nbproject/project.xml
@@ -63,6 +63,7 @@
<friend>org.netbeans.modules.websvc.saas.codegen</friend>
<friend>org.netbeans.modules.websvc.saas.codegen.j2ee</friend>
<friend>org.netbeans.modules.websvc.saas.codegen.java</friend>
+ <friend>org.netbeans.modules.websvc.saas.codegen.php</friend>
<friend>org.netbeans.modules.websvc.saas.ui</friend>
<friend>org.netbeans.modules.websvc.wsitconf</friend>
<package>org.netbeans.modules.websvc.jaxwsmodelapi</package>
---------------------------------------------------------------------
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
