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
commit 61d023ba4e3a9047b23aab7b464f7a2d93320d16 Merge: 69486b5bf0 16f00de17c Author: Michael Bien <[email protected]> AuthorDate: Tue Feb 27 15:10:33 2024 +0100 Merge pull request #7004 from mbien/guava3300 Update guava from 32.1.2-jre to 33.0.0-jre ide/c.google.guava.failureaccess/external/binaries-list | 2 +- ...ailureaccess-1.0.1-license.txt => failureaccess-1.0.2-license.txt} | 2 +- ide/c.google.guava.failureaccess/nbproject/project.properties | 2 +- ide/c.google.guava.failureaccess/nbproject/project.xml | 2 +- ide/c.google.guava/external/binaries-list | 2 +- .../{guava-32.1.2-jre-license.txt => guava-33.0.0-jre-license.txt} | 2 +- ide/c.google.guava/nbproject/project.properties | 2 +- ide/c.google.guava/nbproject/project.xml | 2 +- nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --cc nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps index 773d2d9734,86137b6b0c..a365d04099 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps @@@ -49,9 -49,15 +49,9 @@@ enterprise/websvc.restlib/external/jaka # osgi.core-8.0.0.jar is used by multiple modules. enterprise/websvc.restlib/external/osgi.core-8.0.0.jar platform/libs.osgi/external/osgi.core-8.0.0.jar -#Struts taglib is used by both web.core.syntax and web.struts -enterprise/web.core.syntax/external/struts-taglib-1.3.10.jar enterprise/web.struts/external/struts-taglib-1.3.10.jar - -# Struts Tiles is used by both web.core.syntax and web.struts -enterprise/web.core.syntax/external/struts-tiles-1.3.10.jar enterprise/web.struts/external/struts-tiles-1.3.10.jar - # gradle is used at build-time, so we can ignore the duplicates extide/gradle/external/gradle-7.4-bin.zip enterprise/libs.amazon/external/ion-java-1.0.2.jar - extide/gradle/external/gradle-7.4-bin.zip ide/c.google.guava.failureaccess/external/failureaccess-1.0.1.jar + extide/gradle/external/gradle-7.4-bin.zip ide/c.google.guava.failureaccess/external/failureaccess-1.0.2.jar extide/gradle/external/gradle-7.4-bin.zip ide/c.jcraft.jzlib/external/jzlib-1.1.3.jar extide/gradle/external/gradle-7.4-bin.zip ide/libs.commons_compress/external/commons-compress-1.24.0.jar extide/gradle/external/gradle-7.4-bin.zip ide/o.apache.commons.lang/external/commons-lang-2.6.jar --------------------------------------------------------------------- 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
