commit 1954282cf66e9dd7cfd0776ed41a91cd47ca27d5
author Maxim Nesen <maxim.nesen@oracle.com> Mon May 04 12:27:00 2020 +0200
committer Maxim Nesen <maxim.nesen@oracle.com> Mon May 04 13:15:34 2020 +0200
tree 5cc06af6c06ae795099fd87a56d0c93d46bbab5b
parent d07e88024cf52c7269a85bba2a945010d01c3318

Jakartification: jakarta.annotation, jakarta.injection, org.glassfish.hk2

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>

examples/cdi-webapp/pom.xml

diff --git a/examples/cdi-webapp/pom.xml b/examples/cdi-webapp/pom.xml
index 9f99432..d773ba8 100644
--- a/examples/cdi-webapp/pom.xml
+++ b/examples/cdi-webapp/pom.xml
@@ -145,8 +145,8 @@
                     <scope>compile</scope>
                 </dependency>
                 <dependency>
-                    <groupId>org.glassfish.hk2.external</groupId>
-                    <artifactId>jakarta.inject</artifactId>
+                    <groupId>jakarta.inject</groupId>
+                    <artifactId>jakarta.inject-api</artifactId>
                     <scope>provided</scope>
                 </dependency>
                 <dependency>
@@ -170,6 +170,23 @@
                 </dependency>
             </dependencies>
         </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>
 
     <build>