diff --git a/appserver/admingui/cluster/pom.xml b/appserver/admingui/cluster/pom.xml index 200c5f4f004..86744788d9b 100644 --- a/appserver/admingui/cluster/pom.xml +++ b/appserver/admingui/cluster/pom.xml @@ -47,4 +47,13 @@ provided + + + + dev + + false + + + diff --git a/appserver/admingui/common/pom.xml b/appserver/admingui/common/pom.xml index 5b6cf5d6317..f62d5d3daff 100644 --- a/appserver/admingui/common/pom.xml +++ b/appserver/admingui/common/pom.xml @@ -33,6 +33,10 @@ Admin Console Common This bundle contains common code that may be shared across plugins. + + false + + org.glassfish.main.common diff --git a/appserver/admingui/community-theme/pom.xml b/appserver/admingui/community-theme/pom.xml index 31d3dddc0aa..54c83599f18 100644 --- a/appserver/admingui/community-theme/pom.xml +++ b/appserver/admingui/community-theme/pom.xml @@ -32,7 +32,7 @@ Admin Console Community Edition Theme Plugin Custom Theme Plugin for GlassFish Admin Console - + @@ -103,4 +103,13 @@ + + + + dev + + false + + + diff --git a/appserver/admingui/core/pom.xml b/appserver/admingui/core/pom.xml index 6d5e79cb7b6..d624d582414 100644 --- a/appserver/admingui/core/pom.xml +++ b/appserver/admingui/core/pom.xml @@ -2,7 +2,7 @@ + + false + + org.glassfish.main.admingui diff --git a/appserver/admingui/plugin-service/pom.xml b/appserver/admingui/plugin-service/pom.xml index a06b60013a1..39d1f5dfa13 100644 --- a/appserver/admingui/plugin-service/pom.xml +++ b/appserver/admingui/plugin-service/pom.xml @@ -54,4 +54,13 @@ ${project.version} + + + + dev + + false + + + diff --git a/appserver/admingui/war/pom.xml b/appserver/admingui/war/pom.xml index 6399a6a978b..b28ef6846ca 100644 --- a/appserver/admingui/war/pom.xml +++ b/appserver/admingui/war/pom.xml @@ -171,4 +171,33 @@ + + + + dev + + + + org.apache.maven.plugins + maven-antrun-plugin + + + copy-main-artifact + package + + + + + + + + run + + + + + + + + diff --git a/appserver/connectors/connectors-runtime/pom.xml b/appserver/connectors/connectors-runtime/pom.xml index 96ecaae9cd3..895f183fba4 100644 --- a/appserver/connectors/connectors-runtime/pom.xml +++ b/appserver/connectors/connectors-runtime/pom.xml @@ -211,4 +211,13 @@ + + + + dev + + false + + + diff --git a/appserver/deployment/dol/pom.xml b/appserver/deployment/dol/pom.xml index 116dc541e85..441617f0c38 100755 --- a/appserver/deployment/dol/pom.xml +++ b/appserver/deployment/dol/pom.xml @@ -194,4 +194,13 @@ + + + + dev + + false + + + diff --git a/appserver/microprofile/config/pom.xml b/appserver/microprofile/config/pom.xml index 882fa336a58..18cece1136c 100644 --- a/appserver/microprofile/config/pom.xml +++ b/appserver/microprofile/config/pom.xml @@ -122,4 +122,12 @@ + + + dev + + false + + + diff --git a/appserver/persistence/jpa-container/pom.xml b/appserver/persistence/jpa-container/pom.xml index 705525478fc..1746c5b3263 100644 --- a/appserver/persistence/jpa-container/pom.xml +++ b/appserver/persistence/jpa-container/pom.xml @@ -117,4 +117,13 @@ + + + + dev + + false + + + diff --git a/appserver/web/web-core/pom.xml b/appserver/web/web-core/pom.xml index 2f7a7c0dd47..3897c36e9d7 100755 --- a/appserver/web/web-core/pom.xml +++ b/appserver/web/web-core/pom.xml @@ -150,4 +150,13 @@ + + + + dev + + false + + + diff --git a/appserver/web/web-glue/pom.xml b/appserver/web/web-glue/pom.xml index ef40b0bf888..5e9cf86021f 100755 --- a/appserver/web/web-glue/pom.xml +++ b/appserver/web/web-glue/pom.xml @@ -277,4 +277,13 @@ + + + + dev + + false + + + diff --git a/appserver/web/weld-integration/pom.xml b/appserver/web/weld-integration/pom.xml index 610e0ff8202..c567bc9c90f 100644 --- a/appserver/web/weld-integration/pom.xml +++ b/appserver/web/weld-integration/pom.xml @@ -203,4 +203,13 @@ + + + + dev + + false + + + diff --git a/nucleus/admin/cli/pom.xml b/nucleus/admin/cli/pom.xml index 88b631388c8..9747dbe75f2 100755 --- a/nucleus/admin/cli/pom.xml +++ b/nucleus/admin/cli/pom.xml @@ -217,4 +217,13 @@ + + + + dev + + false + + + diff --git a/nucleus/admin/config-api/pom.xml b/nucleus/admin/config-api/pom.xml index 2ab2af1d60f..27157214437 100644 --- a/nucleus/admin/config-api/pom.xml +++ b/nucleus/admin/config-api/pom.xml @@ -154,4 +154,13 @@ + + + + dev + + false + + + diff --git a/nucleus/admin/launcher/pom.xml b/nucleus/admin/launcher/pom.xml index c3bfe1609b0..8d3479a2820 100644 --- a/nucleus/admin/launcher/pom.xml +++ b/nucleus/admin/launcher/pom.xml @@ -63,4 +63,13 @@ hamcrest + + + + dev + + false + + + diff --git a/nucleus/admin/rest/rest-service/pom.xml b/nucleus/admin/rest/rest-service/pom.xml index fc0fa7843d5..7b3eda4fba2 100644 --- a/nucleus/admin/rest/rest-service/pom.xml +++ b/nucleus/admin/rest/rest-service/pom.xml @@ -201,4 +201,14 @@ - + + + + dev + + false + ../../../.. + + + + \ No newline at end of file diff --git a/nucleus/admin/server-mgmt/pom.xml b/nucleus/admin/server-mgmt/pom.xml index 8c51d721806..96abc7d8271 100644 --- a/nucleus/admin/server-mgmt/pom.xml +++ b/nucleus/admin/server-mgmt/pom.xml @@ -214,4 +214,14 @@ + + + + dev + + false + ${basedir}/../../..//${glassfish.distribution.dir}/lib/asadmin/server-mgmt.jar + + + diff --git a/nucleus/admin/util/pom.xml b/nucleus/admin/util/pom.xml index bc69c776fbd..36fad09ea43 100755 --- a/nucleus/admin/util/pom.xml +++ b/nucleus/admin/util/pom.xml @@ -48,6 +48,7 @@ false + false diff --git a/nucleus/cluster/common/pom.xml b/nucleus/cluster/common/pom.xml index 37d242baf26..499c9ddac54 100644 --- a/nucleus/cluster/common/pom.xml +++ b/nucleus/cluster/common/pom.xml @@ -31,6 +31,10 @@ cluster-common + + false + + org.glassfish.hk2 diff --git a/nucleus/common/common-util/pom.xml b/nucleus/common/common-util/pom.xml index 8cd481a1858..24bfacd98ea 100755 --- a/nucleus/common/common-util/pom.xml +++ b/nucleus/common/common-util/pom.xml @@ -108,4 +108,13 @@ + + + + dev + + false + + + diff --git a/nucleus/common/internal-api/pom.xml b/nucleus/common/internal-api/pom.xml index df46206626c..9e12edf84df 100644 --- a/nucleus/common/internal-api/pom.xml +++ b/nucleus/common/internal-api/pom.xml @@ -112,4 +112,13 @@ + + + + dev + + false + + + diff --git a/nucleus/core/bootstrap/pom.xml b/nucleus/core/bootstrap/pom.xml index 2afd59efc2c..3e1742e29ec 100755 --- a/nucleus/core/bootstrap/pom.xml +++ b/nucleus/core/bootstrap/pom.xml @@ -158,4 +158,13 @@ + + + + dev + + false + + + diff --git a/nucleus/core/kernel/pom.xml b/nucleus/core/kernel/pom.xml index 43a9f4a1ab3..9385c95fcbb 100755 --- a/nucleus/core/kernel/pom.xml +++ b/nucleus/core/kernel/pom.xml @@ -271,4 +271,13 @@ + + + + dev + + false + + + diff --git a/nucleus/extras/command-logger/pom.xml b/nucleus/extras/command-logger/pom.xml index afc9660271c..8f53009407f 100644 --- a/nucleus/extras/command-logger/pom.xml +++ b/nucleus/extras/command-logger/pom.xml @@ -42,4 +42,13 @@ ${project.version} + + + + dev + + false + + + diff --git a/nucleus/grizzly/config/pom.xml b/nucleus/grizzly/config/pom.xml index 9d537ce1ab4..dc760715c11 100644 --- a/nucleus/grizzly/config/pom.xml +++ b/nucleus/grizzly/config/pom.xml @@ -114,4 +114,31 @@ + + + + dev + + + + maven-antrun-plugin + + + dev-echo + install + + run + + + + To patch the GlassFish build, build the parent "nucleus-grizzly" artifact with submodules instead + + + + + + + + + diff --git a/nucleus/grizzly/nucleus-grizzly-all/pom.xml b/nucleus/grizzly/nucleus-grizzly-all/pom.xml index aa442c5510e..72b033f4709 100644 --- a/nucleus/grizzly/nucleus-grizzly-all/pom.xml +++ b/nucleus/grizzly/nucleus-grizzly-all/pom.xml @@ -144,5 +144,11 @@ + + dev + + false + + diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml index 6f05613dd77..8160cea1bcd 100644 --- a/nucleus/parent/pom.xml +++ b/nucleus/parent/pom.xml @@ -189,6 +189,7 @@ java.util.logging.LogManager INFO true + appserver/distributions/glassfish/target/stage/glassfish7/glassfish @@ -846,7 +847,7 @@ org.glassfish.build glassfishbuild-maven-plugin - 4.0.1 + 4.1.0 true @@ -954,7 +955,7 @@ true **/generated-sources/**/*, **/module-info.java + adds all property files in the tree --> **/appserver/**/src/main/resources/**/*, **/deployment/**/src/main/resources/**/*, @@ -2049,8 +2050,8 @@ org.glassfish.hk2 osgiversion-maven-plugin + following goal to populate a project property with an OSGi version which is equivalent to maven version without qualifier + and then use that property in osgi.bundle while exporting. --> qualifier project.osgi.version @@ -2306,5 +2307,47 @@ + + dev + + true + ../../.. + ${basedir}/${copy.modules.to.distribution.path.to.root}/${glassfish.distribution.dir}/modules/${project.build.finalName}.jar + + + + + + org.glassfish.build + glassfishbuild-maven-plugin + + + copy-module-to-distribution + install + + copy-file + + + ${copy.modules.to.distribution.skip} + ${copy.modules.to.distribution.destFile} + + + + + + + + + org.glassfish.build + glassfishbuild-maven-plugin + + + copy-module-to-distribution + + + + + +