Merge remote-tracking branch 'origin/master' into 8.0

eclipse-ee4j · Mar 21, 2024 · e698703 · e698703
2 parents 6535c64 + e0a5cfc
commit e698703
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 29 deletions.
diff --git a/appserver/microprofile/config/pom.xml b/appserver/microprofile/config/pom.xml
@@ -77,42 +77,23 @@
 
                         <!-- A list of packages that are exposed to classes outside the bundle -->
                         <Export-Package>
-                            org.glassfish.microprofile.config,
-                            io.helidon.common.config,
+                            io.helidon.config,
                             io.helidon.config.mp,
-                            io.helidon.config
                         </Export-Package>
 
                         <!-- A list of dependencies to include in the bundle (as they're not native OSGI bundles) -->
                         <Embed-Dependency>
                             <!--
                                 The helidon MP config dependency tree, illustrating what we actually output to the GF bundle
                             -->
-                            groupId=io.helidon.microprofile.config,
-                                groupId=io.helidon.config;artifactId=helidon-config-mp,
-                                    groupId=io.helidon.common;artifactId=helidon-common,
-                                    groupId=io.helidon.common;artifactId=helidon-common-service-loader,
-                                    groupId=io.helidon.config;artifactId=helidon-config-yaml-mp,
-                                    groupId=io.helidon.config;artifactId=helidon-config,
-                                        groupId=io.helidon.inject;artifactId=helidon-inject-api,
-                                        groupId=io.helidon.logging;artifactId=helidon-logging-common,
-                                        groupId=io.helidon.common;artifactId=helidon-common-types,
-                                            groupId=io.helidon.builder;artifactId=helidon-builder-api,
-                                        groupId=io.helidon.common;artifactId=helidon-common-config,
-                                            groupId=io.helidon.common;artifactId=helidon-common-mapper,
-                                        <!--
-                                        groupId=io.helidon.common;artifactId=helidon-common-reactive,
-                                            groupId=io.helidon.common;artifactId=helidon-common-mapper, -->
-                                        groupId=io.helidon.common;artifactId=helidon-common-media-type,
+                            groupId=io.helidon.config;artifactId=helidon-config-mp,
+                            groupId=io.helidon.common;artifactId=helidon-common,
+                            groupId=io.helidon.common;artifactId=helidon-common-service-loader,
+                            groupId=io.helidon.config;artifactId=helidon-config-yaml-mp,
+                            groupId=io.helidon.config;artifactId=helidon-config,
+                            groupId=io.helidon.common;artifactId=helidon-common-media-type,
                             groupId=io.helidon.config;artifactId=helidon-config-yaml,
-                                artifactId=snakeyaml,
-                            <!--
-                            groupId=io.helidon.config;artifactId=helidon-config-encryption,
-                                groupId=io.helidon.common;artifactId=helidon-common-key-util,
-                                    groupId=io.helidon.common;artifactId=helidon-common-configurable,
-                                        groupId=io.helidon.common;artifactId=helidon-common-context,
-                                groupId=io.helidon.common;artifactId=helidon-common-crypto,
-                            groupId=io.helidon.config;artifactId=helidon-config-object-mapping, -->
+                            artifactId=snakeyaml,
                         </Embed-Dependency>
 
                         <!--

diff --git a/appserver/tests/tck/concurrency/pom.xml b/appserver/tests/tck/concurrency/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /*
- * Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -35,7 +35,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
         <glassfish.version>${project.version}</glassfish.version>
         <glassfish.root>${project.build.directory}</glassfish.root>
         <glassfish.home>${glassfish.root}/glassfish8</glassfish.home>