diff --git a/api-only/pom.xml b/api-only/pom.xml
index b783d66..7a288c4 100644
--- a/api-only/pom.xml
+++ b/api-only/pom.xml
@@ -42,9 +42,6 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Name>${project.name}</Bundle-Name>
-                        <Bundle-Version>${project.version}</Bundle-Version>
-                        <Export-Package>org.glassfish.gmbal,org.glassfish.pfl.tf.timer.spi</Export-Package>
                     </instructions>
                 </configuration>
                 <executions>
@@ -55,8 +52,8 @@
                     </execution>
                 </executions>
             </plugin>
-            
-            <plugin> 
+
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
                 <executions>
diff --git a/impl/pom.xml b/impl/pom.xml
index a32b9ce..b4d0a18 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -126,27 +126,21 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.glassfish.gmbal, org.glassfish.gmbal.impl.trace</Export-Package>
+                        <Private-Package>
+                            org.glassfish.gmbal.util, org.glassfish.gmbal.impl, org.glassfish.gmbal.typelib
+                        </Private-Package>
+                    </instructions>
+                </configuration>
                 <executions>
                     <execution>
                         <id>generate-manifest</id>
                         <goals>
                             <goal>manifest</goal>
                         </goals>
-                        <configuration>
-                            <instructions>
-                                <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-                                <Bundle-Name>${project.name}</Bundle-Name>
-                                <Bundle-Version>${project.version}</Bundle-Version>
-                                <Export-Package>org.glassfish.gmbal, org.glassfish.gmbal.impl.trace</Export-Package>
-                                <Private-Package>
-                                    org.glassfish.gmbal.util, org.glassfish.gmbal.impl, org.glassfish.gmbal.typelib
-                                </Private-Package>
-                                <!-- Include-Resource>
-                                        TODO: Use PFL ExceptionResourceGenerator to automatically generate resource files
-                                        under src/main/resources.  See build.xml for sample usage.
-                                </Include-Resource -->
-                            </instructions>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
diff --git a/impl/src/main/java/module-info.java b/impl/src/main/java/module-info.java
index 5f5625c..d7067cd 100644
--- a/impl/src/main/java/module-info.java
+++ b/impl/src/main/java/module-info.java
@@ -12,6 +12,6 @@
     requires java.logging;
     requires transitive org.glassfish.external.management.api;
 
-    exports org.glassfish.gmbal;
+    exports org.glassfish.gmbal.impl;
     exports org.glassfish.gmbal.impl.trace;
 }
diff --git a/pom.xml b/pom.xml
index 91ed684..a575b57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.8</version>
+        <version>1.0.9</version>
         <relativePath/>
     </parent>
 
@@ -83,9 +83,9 @@
     </mailingLists>
 
     <properties>
-        <jdkVersion>8</jdkVersion>
-        <pfl.version>4.1.2</pfl.version>
-        <gmbal.commons.version>3.2.3</gmbal.commons.version>
+        <jdkVersion>11</jdkVersion>
+        <pfl.version>5.0.1-SNAPSHOT</pfl.version>
+        <gmbal.commons.version>3.3.0-SNAPSHOT</gmbal.commons.version>
         <legal.doc.source>${project.basedir}/..</legal.doc.source>
     </properties>
 
@@ -150,7 +150,10 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
+                    <version>3.13.0</version>
+                    <configuration>
+                        <release>11</release>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.felix</groupId>
@@ -160,7 +163,6 @@
                         <niceManifest>true</niceManifest>
                     </configuration>
                 </plugin>
-                <!-- override default "built-by" entry, which points to a developer's user id -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
@@ -210,30 +212,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <release>9</release>
+                    <release>11</release>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>default-compile</id>
-                        <configuration>
-                            <compilerArgs>
-                                <arg>-Xlint:all</arg>
-                            </compilerArgs>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>base-compile</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <release>${jdkVersion}</release>
-                            <excludes>
-                                <exclude>module-info.java</exclude>
-                            </excludes>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
 
             <!-- prevent the site plugin from deploying to the scm url -->