matthiasblaesing commented on a change in pull request #3326: URL: https://github.com/apache/netbeans/pull/3326#discussion_r753693992
########## File path: extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java ########## @@ -0,0 +1,643 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.netbeans.modules.gradle.tooling; + +import groovy.lang.MissingPropertyException; +import java.io.File; +import java.io.Serializable; +import java.util.ArrayList; +import static java.util.Arrays.asList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import org.codehaus.groovy.runtime.InvokerHelper; Review comment: I jumped into the `getProperty` method in the helper and it contains special handling code to deal with the specialities of groovy - I doubt, that java reflection is just some lines. My gut feeling is, that the groovy code base is pretty stable. The issue we saw came from building against 3 and expecting it to work on 2. ########## File path: nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps ########## @@ -65,24 +65,49 @@ enterprise/web.core.syntax/external/struts-taglib-1.3.10.jar enterprise/web.stru 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-6.7-bin.zip enterprise/libs.amazon/external/ion-java-1.0.2.jar -extide/gradle/external/gradle-6.7-bin.zip extide/o.apache.tools.ant.module/external/ant-1.10.8.jar -extide/gradle/external/gradle-6.7-bin.zip extide/o.apache.tools.ant.module/external/ant-launcher-1.10.8.jar -extide/gradle/external/gradle-6.7-bin.zip ide/bcpg/external/bcpg-jdk15on-1.64.jar -extide/gradle/external/gradle-6.7-bin.zip ide/bcprov/external/bcprov-jdk15on-1.64.jar -extide/gradle/external/gradle-6.7-bin.zip ide/c.google.gson/external/gson-2.8.5.jar -extide/gradle/external/gradle-6.7-bin.zip ide/c.jcraft.jsch/external/jsch-0.1.55.jar -extide/gradle/external/gradle-6.7-bin.zip ide/c.jcraft.jzlib/external/jzlib-1.1.3.jar -extide/gradle/external/gradle-6.7-bin.zip ide/libs.commons_compress/external/commons-compress-1.19.jar -extide/gradle/external/gradle-6.7-bin.zip ide/o.apache.commons.lang/external/commons-lang-2.6.jar -extide/gradle/external/gradle-6.7-bin.zip ide/slf4j.api/external/slf4j-api-1.7.28.jar -extide/gradle/external/gradle-6.7-bin.zip java/maven/external/aether-api-1.13.1.jar -extide/gradle/external/gradle-6.7-bin.zip java/maven.embedder/external/apache-maven-3.6.3-bin.zip -extide/gradle/external/gradle-6.7-bin.zip platform/api.annotations.common/external/jsr305-3.0.2.jar -extide/gradle/external/gradle-6.7-bin.zip platform/libs.junit4/external/hamcrest-core-1.3.jar -extide/gradle/external/gradle-6.7-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.13.jar -extide/gradle/external/gradle-6.7-bin.zip platform/o.apache.commons.io/external/commons-io-2.6.jar -extide/gradle/external/gradle-6.7-bin.zip ide/o.eclipse.jgit/external/org.eclipse.jgit-5.7.0.202003110725-r.jar +extide/gradle/external/gradle-7.3-bin.zip extide/libs.gradle/external/gradle-7.3-bin.zip +extide/gradle/external/gradle-7.3-bin.zip enterprise/libs.amazon/external/ion-java-1.0.2.jar +extide/gradle/external/gradle-7.3-bin.zip extide/o.apache.tools.ant.module/external/ant-1.10.8.jar +extide/gradle/external/gradle-7.3-bin.zip extide/o.apache.tools.ant.module/external/ant-launcher-1.10.8.jar +extide/gradle/external/gradle-7.3-bin.zip ide/bcpg/external/bcpg-jdk15on-1.64.jar +extide/gradle/external/gradle-7.3-bin.zip ide/bcprov/external/bcprov-jdk15on-1.64.jar +extide/gradle/external/gradle-7.3-bin.zip ide/c.google.gson/external/gson-2.8.5.jar +extide/gradle/external/gradle-7.3-bin.zip ide/c.jcraft.jsch/external/jsch-0.1.55.jar +extide/gradle/external/gradle-7.3-bin.zip ide/c.jcraft.jzlib/external/jzlib-1.1.3.jar +extide/gradle/external/gradle-7.3-bin.zip ide/libs.commons_compress/external/commons-compress-1.19.jar +extide/gradle/external/gradle-7.3-bin.zip ide/o.apache.commons.lang/external/commons-lang-2.6.jar +extide/gradle/external/gradle-7.3-bin.zip ide/slf4j.api/external/slf4j-api-1.7.28.jar +extide/gradle/external/gradle-7.3-bin.zip java/maven/external/aether-api-1.13.1.jar +extide/gradle/external/gradle-7.3-bin.zip java/maven.embedder/external/apache-maven-3.6.3-bin.zip +extide/gradle/external/gradle-7.3-bin.zip platform/api.annotations.common/external/jsr305-3.0.2.jar +extide/gradle/external/gradle-7.3-bin.zip platform/libs.junit4/external/hamcrest-core-1.3.jar +extide/gradle/external/gradle-7.3-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.13.jar +extide/gradle/external/gradle-7.3-bin.zip platform/o.apache.commons.io/external/commons-io-2.6.jar +extide/gradle/external/gradle-7.3-bin.zip ide/libs.antlr4.runtime/external/antlr4-runtime-4.7.2.jar +extide/gradle/external/gradle-7.3-bin.zip platform/libs.junit4/external/junit-4.13.2.jar +extide/gradle/external/gradle-7.3-bin.zip platform/libs.testng/external/jcommander-1.78.jar +extide/gradle/external/gradle-7.3-bin.zip ide/o.eclipse.jgit/external/org.eclipse.jgit-5.7.0.202003110725-r.jar Review comment: You are right - sometime between I tried to extract the tooling from `gradle-7.3-bin.jar`, but that failed miserably, as the embedded tooling is not identical to the independently runnable jar. So it is downloaded again. I also checked the other `ignored-overlaps` for gradle again and could reduce the list considerably. With this cleanup, I squashed the changes together and think now it is ready to be merged. When Travis agrees I'll merge. Thanks for the check and patience :-) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- 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
