Update orb-gmbal-pfl to 4.1.1
Signed-off-by: hs536 <sawamura.hiroki@fujitsu.com>
diff --git a/appserver/extras/embedded/all/pom.xml b/appserver/extras/embedded/all/pom.xml
index 5d4aba4..d32b7ee 100644
--- a/appserver/extras/embedded/all/pom.xml
+++ b/appserver/extras/embedded/all/pom.xml
@@ -516,11 +516,6 @@
</dependency>
<dependency>
<groupId>org.glassfish.pfl</groupId>
- <artifactId>pfl-asm</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-basic</artifactId>
<optional>true</optional>
</dependency>
diff --git a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
index 5725fff..d0cb76f 100755
--- a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
+++ b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
@@ -364,11 +364,6 @@
</dependency>
<dependency>
<groupId>org.glassfish.pfl</groupId>
- <artifactId>pfl-asm</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-basic</artifactId>
<optional>true</optional>
</dependency>
diff --git a/appserver/extras/embedded/web/pom.xml b/appserver/extras/embedded/web/pom.xml
index 69ec9e8..5a0e31e 100644
--- a/appserver/extras/embedded/web/pom.xml
+++ b/appserver/extras/embedded/web/pom.xml
@@ -899,11 +899,6 @@
</dependency>
<dependency>
<groupId>org.glassfish.pfl</groupId>
- <artifactId>pfl-asm</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-basic</artifactId>
<optional>true</optional>
</dependency>
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/CompositeUtil.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/CompositeUtil.java
index 3aa2cdd..c88d980 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/CompositeUtil.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/CompositeUtil.java
@@ -76,7 +76,7 @@
import org.glassfish.internal.api.Globals;
import org.glassfish.jersey.media.sse.EventOutput;
-import static org.glassfish.pfl.objectweb.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.*;
import org.jvnet.hk2.config.Attribute;
import org.jvnet.hk2.config.MessageInterpolatorImpl;
import org.objectweb.asm.AnnotationVisitor;
diff --git a/nucleus/featuresets/nucleus/pom.xml b/nucleus/featuresets/nucleus/pom.xml
index 88c5138..380d891 100644
--- a/nucleus/featuresets/nucleus/pom.xml
+++ b/nucleus/featuresets/nucleus/pom.xml
@@ -258,16 +258,6 @@
</dependency>
<dependency>
<groupId>org.glassfish.pfl</groupId>
- <artifactId>pfl-asm</artifactId>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-basic</artifactId>
<exclusions>
<exclusion>
diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml
index c6329ea..368976c 100644
--- a/nucleus/parent/pom.xml
+++ b/nucleus/parent/pom.xml
@@ -123,7 +123,7 @@
<glassfish-management-api.version>3.2.3</glassfish-management-api.version>
<hk2.version>3.0.0-M2</hk2.version>
<hk2.plugin.version>3.0.0-M2</hk2.plugin.version>
- <pfl.version>4.1.0</pfl.version>
+ <pfl.version>4.1.1</pfl.version>
<gmbal.version>4.0.2</gmbal.version>
<shoal.version>1.6.53</shoal.version>
<ha-api.version>3.1.12</ha-api.version>
@@ -888,11 +888,6 @@
</dependency>
<dependency>
<groupId>org.glassfish.pfl</groupId>
- <artifactId>pfl-asm</artifactId>
- <version>${pfl.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-tf</artifactId>
<version>${pfl.version}</version>
</dependency>
