fix exclusions for jaxrs bundle, removed commented profiles from poms
Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/bundles/jaxrs-ri/pom.xml b/bundles/jaxrs-ri/pom.xml
index 0b694af..6d5f596 100644
--- a/bundles/jaxrs-ri/pom.xml
+++ b/bundles/jaxrs-ri/pom.xml
@@ -320,11 +320,11 @@
<excludes>
<exclude>META-INF/DEPENDENCIES.txt</exclude>
<exclude>META-INF/LICENSE.md</exclude>
- <exclude>javax/annotation/**</exclude>
- <exclude>javax/decorator/**</exclude>
- <exclude>jakarta.el/**</exclude>
- <exclude>javax/enterprise/**</exclude>
- <exclude>javax/interceptor/**</exclude>
+ <exclude>jakarta/annotation/**</exclude>
+ <exclude>jakarta/decorator/**</exclude>
+ <exclude>jakarta/el/**</exclude>
+ <exclude>jakarta/enterprise/**</exclude>
+ <exclude>jakarta/interceptor/**</exclude>
</excludes>
</filter>
</filters>
diff --git a/examples/helloworld-cdi2-se/pom.xml b/examples/helloworld-cdi2-se/pom.xml
index a962f84..d8e73eb 100644
--- a/examples/helloworld-cdi2-se/pom.xml
+++ b/examples/helloworld-cdi2-se/pom.xml
@@ -80,23 +80,6 @@
</plugins>
</build>
</profile>
- <!--<profile>
- <id>jakartification_exclude_tests</id> <!– TODO remove after jakartification –>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>-->
</profiles>
</project>
diff --git a/inject/cdi2-se/pom.xml b/inject/cdi2-se/pom.xml
index c8c6e87..d8a3390 100644
--- a/inject/cdi2-se/pom.xml
+++ b/inject/cdi2-se/pom.xml
@@ -114,23 +114,4 @@
</plugin>
</plugins>
</build>
- <!--<profiles>
- <profile>
- <id>jakartification_exclude_tests</id> <!– TODO remove after jakartification –>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>-->
</project>
diff --git a/inject/cdi2-se/src/main/java/org/glassfish/jersey/inject/cdi/se/SeBeanRegisterExtension.java b/inject/cdi2-se/src/main/java/org/glassfish/jersey/inject/cdi/se/SeBeanRegisterExtension.java
index 6ba09c8..e804387 100644
--- a/inject/cdi2-se/src/main/java/org/glassfish/jersey/inject/cdi/se/SeBeanRegisterExtension.java
+++ b/inject/cdi2-se/src/main/java/org/glassfish/jersey/inject/cdi/se/SeBeanRegisterExtension.java
@@ -132,7 +132,7 @@
List<InjectionResolver> injectionResolvers = bindings.stream()
.filter(binding -> InjectionResolverBinding.class.isAssignableFrom(binding.getClass()))
.map(InjectionResolverBinding.class::cast)
- .map((InjectionResolverBinding injectionResolverBinding) -> injectionResolverBinding.getResolver())
+ .map(InjectionResolverBinding::getResolver)
.collect(Collectors.toList());
/*
diff --git a/tests/integration/cdi-integration/cdi-manually-bound/pom.xml b/tests/integration/cdi-integration/cdi-manually-bound/pom.xml
index 4f81033..05b342d 100644
--- a/tests/integration/cdi-integration/cdi-manually-bound/pom.xml
+++ b/tests/integration/cdi-integration/cdi-manually-bound/pom.xml
@@ -79,25 +79,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <!--<profiles>
- <profile>
- <id>jakartification_exclude_tests</id> <!– TODO remove after jakartification –>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>-->
-
</project>
\ No newline at end of file
