From bc4e02a317793a7b089b2a259a07376eef781304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Mon, 11 Apr 2022 15:45:13 +0200 Subject: [PATCH 1/5] mvn package should pass after mvn clean install -Pfastest -T4C too - processing annotations of generated classes moved to own execution as the current compiler plugin supports that --- appserver/jdbc/jdbc-ra/jdbc40/pom.xml | 7 ------- appserver/pom.xml | 7 ------- nucleus/admin/rest/rest-service/pom.xml | 14 +------------- nucleus/parent/pom.xml | 22 ++++++++++++++++++++++ 4 files changed, 23 insertions(+), 27 deletions(-) diff --git a/appserver/jdbc/jdbc-ra/jdbc40/pom.xml b/appserver/jdbc/jdbc-ra/jdbc40/pom.xml index abb4865a010..5fcfac44afd 100644 --- a/appserver/jdbc/jdbc-ra/jdbc40/pom.xml +++ b/appserver/jdbc/jdbc-ra/jdbc40/pom.xml @@ -54,12 +54,5 @@ - - - maven-compiler-plugin - - diff --git a/appserver/pom.xml b/appserver/pom.xml index 41db196860e..47550559006 100644 --- a/appserver/pom.xml +++ b/appserver/pom.xml @@ -661,13 +661,6 @@ - - maven-compiler-plugin - - 11 - 11 - - org.glassfish.build spec-version-maven-plugin diff --git a/nucleus/admin/rest/rest-service/pom.xml b/nucleus/admin/rest/rest-service/pom.xml index ade651e581e..ea57da6b675 100644 --- a/nucleus/admin/rest/rest-service/pom.xml +++ b/nucleus/admin/rest/rest-service/pom.xml @@ -33,6 +33,7 @@ Rest Interface for GlassFish Management and Monitoring + org.glassfish.hk2 hk2 @@ -145,19 +146,6 @@ - - maven-resources-plugin - - - default-resources - process-classes - - resources - - - - maven-jar-plugin diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml index 256b172f9b0..c60dbc36ec7 100644 --- a/nucleus/parent/pom.xml +++ b/nucleus/parent/pom.xml @@ -701,6 +701,28 @@ **/.ade_path/** + + + default-compile + compile + + compile + + + none + + + + process-annotations + process-classes + + compile + + + only + + + maven-dependency-plugin From b30e3f6ab6bc9fdfe36cccc1f7c2c266cc242a7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Mon, 11 Apr 2022 15:47:31 +0200 Subject: [PATCH 2/5] Updated >project< artifact to 1.0.7 --- .../tests/appserv-tests/util/reportbuilder/pom.xml | 11 +++++------ appserver/tests/quicklook/pom.xml | 2 +- nucleus/parent/pom.xml | 3 +-- pom.xml | 8 ++++---- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/appserver/tests/appserv-tests/util/reportbuilder/pom.xml b/appserver/tests/appserv-tests/util/reportbuilder/pom.xml index 68857b32c49..bc0cdac128e 100644 --- a/appserver/tests/appserv-tests/util/reportbuilder/pom.xml +++ b/appserver/tests/appserv-tests/util/reportbuilder/pom.xml @@ -21,18 +21,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.eclipse.ee4j - project - 1.0 + org.glassfish.main.tests + ant-tests + 6.2.6-SNAPSHOT 4.0.0 org.glassfish.devtests - 4.0-SNAPSHOT report-builder jar report-builder - ${artifactId} + ${project.artifactId} install @@ -42,7 +41,7 @@ install - + diff --git a/appserver/tests/quicklook/pom.xml b/appserver/tests/quicklook/pom.xml index 95189c36284..5e055a8d519 100644 --- a/appserver/tests/quicklook/pom.xml +++ b/appserver/tests/quicklook/pom.xml @@ -22,7 +22,7 @@ org.eclipse.ee4j project - 1.0 + 1.0.7 org.glassfish.quicklook diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml index c60dbc36ec7..36adcc7e8bd 100644 --- a/nucleus/parent/pom.xml +++ b/nucleus/parent/pom.xml @@ -24,7 +24,7 @@ org.eclipse.ee4j project - 1.0.6 + 1.0.7 @@ -955,7 +955,6 @@ maven-enforcer-plugin - 3.0.0 enforce-maven diff --git a/pom.xml b/pom.xml index 272c634c003..f477e405429 100644 --- a/pom.xml +++ b/pom.xml @@ -23,12 +23,12 @@ org.eclipse.ee4j project - 1.0.6 + 1.0.7 org.glassfish.main glassfish-main-aggregator - 6.2.6-SNAPSHOT + 6.2.6-SNAPSHOT-brekeke pom GlassFish Project @@ -134,9 +134,9 @@ appserver nucleus/hk2/config-generator docs - appserver/admingui/devtests appserver/extras/embedded/common - nucleus/tests + appserver/tests/appserv-tests/util/reportbuilder + appserver/tests/tck From 74adc519bb2334707531f198a9b6bf33430d2615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Mon, 11 Apr 2022 16:29:16 +0200 Subject: [PATCH 3/5] RestModelExtensionProcessor class cleanup --- .../RestModelExtensionProcessor.java | 61 ++++++++----------- 1 file changed, 27 insertions(+), 34 deletions(-) diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/annotation/processor/RestModelExtensionProcessor.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/annotation/processor/RestModelExtensionProcessor.java index 89ab4701451..64a332c1cac 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/annotation/processor/RestModelExtensionProcessor.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/annotation/processor/RestModelExtensionProcessor.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2022 Contributors to the Eclipse Foundation * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -23,9 +24,9 @@ import java.util.List; import java.util.Map; import java.util.Set; + import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.Filer; -import javax.annotation.processing.Messager; import javax.annotation.processing.RoundEnvironment; import javax.annotation.processing.SupportedAnnotationTypes; import javax.lang.model.SourceVersion; @@ -33,57 +34,49 @@ import javax.lang.model.element.TypeElement; import javax.tools.Diagnostic.Kind; import javax.tools.FileObject; -import javax.tools.StandardLocation; + import org.glassfish.admin.rest.composite.RestModelExtension; -/** - * Hello world! - * - */ +import static javax.tools.StandardLocation.CLASS_OUTPUT; + + @SupportedAnnotationTypes("org.glassfish.admin.rest.composite.RestModelExtension") public class RestModelExtensionProcessor extends AbstractProcessor { @Override - public boolean process(Set elements, RoundEnvironment env) { - Messager messager = processingEnv.getMessager(); - BufferedWriter bw = null; + public boolean process(final Set elements, final RoundEnvironment env) { try { - Map> classes = new HashMap>(); - - for (TypeElement te : elements) { - for (Element e : env.getElementsAnnotatedWith(te)) { - final RestModelExtension annotation = e.getAnnotation(RestModelExtension.class); + final Map> classes = new HashMap<>(); + for (final TypeElement typeElement : elements) { + for (final Element element : env.getElementsAnnotatedWith(typeElement)) { + final RestModelExtension annotation = element.getAnnotation(RestModelExtension.class); final String parent = annotation.parent(); List list = classes.get(parent); if (list == null) { - list = new ArrayList(); + list = new ArrayList<>(); classes.put(parent, list); } - list.add(e.toString()); + list.add(element.toString()); } } - - if (!classes.isEmpty()) { - final Filer filer = processingEnv.getFiler(); - FileObject fo = filer.createResource(StandardLocation.CLASS_OUTPUT, "", "META-INF/restmodelextensions"); - bw = new BufferedWriter(fo.openWriter()); + if (classes.isEmpty()) { + return true; + } + final Filer filer = processingEnv.getFiler(); + final FileObject file = filer.createResource(CLASS_OUTPUT, "", "META-INF/restmodelextensions"); + try (BufferedWriter bw = new BufferedWriter(file.openWriter())) { // parent model:model extension - for (Map.Entry> entry : classes.entrySet()) { + for (final Map.Entry> entry : classes.entrySet()) { final String key = entry.getKey(); - for (String ext : entry.getValue()) { - bw.write(key + ":" + ext + "\n"); + for (final String ext : entry.getValue()) { + bw.write(key); + bw.write(":"); + bw.write(ext); + bw.write('\n'); } } - bw.close(); - } - } catch (IOException ex) { - messager.printMessage(Kind.ERROR, ex.getLocalizedMessage()); - if (bw != null) { - try { - bw.close(); - } catch (Exception e) { - - } } + } catch (final IOException ex) { + processingEnv.getMessager().printMessage(Kind.ERROR, ex.getLocalizedMessage()); } return true; From 2282b1ee266e1acd3d365f287478f0b712df697b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Mon, 11 Apr 2022 17:15:07 +0200 Subject: [PATCH 4/5] Fixed build_re_dev used on Eclipse's Jenkins - respecting MVN_EXTRA --- appserver/tests/gftest.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/appserver/tests/gftest.sh b/appserver/tests/gftest.sh index 79572057630..2fcb499f817 100755 --- a/appserver/tests/gftest.sh +++ b/appserver/tests/gftest.sh @@ -54,8 +54,11 @@ if [ ! -z "${JENKINS_HOME}" ] ; then fi echo "Removing old glassfish directory: ${S1AS_HOME}"; rm -rf "${S1AS_HOME}"; + if [ -z "${MVN_EXTRA}" ]; then + export MVN_EXTRA=""; + fi if [ -z "${GF_VERSION}" ]; then - export GF_VERSION="$(mvn help:evaluate -f \"${APS_HOME}/pom.xml\" -Dexpression=project.version -q -DforceStdout)" + export GF_VERSION="$(mvn help:evaluate -f \"${APS_HOME}/pom.xml\" -Dexpression=project.version -q -DforceStdout ${MVN_EXTRA})" fi if [ -z "${MVN_REPOSITORY}" ]; then export MVN_REPOSITORY="${HOME}/.m2/repository"; From f429eb6c23c3314670b1783f5edc0ff499e685b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Mon, 11 Apr 2022 17:24:24 +0200 Subject: [PATCH 5/5] Fixed mistake committed after recent experiments --- docs/pom.xml | 1 - pom.xml | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index ff95d022951..413089b9ab5 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -70,7 +70,6 @@ maven-enforcer-plugin - 3.0.0 enforce-versions diff --git a/pom.xml b/pom.xml index f477e405429..4d76f95957d 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.glassfish.main glassfish-main-aggregator - 6.2.6-SNAPSHOT-brekeke + 6.2.6-SNAPSHOT pom GlassFish Project @@ -73,7 +73,6 @@ maven-enforcer-plugin - 3.0.0 enforce-maven