diff -Nru hk2-hk2-parent-2.4.0-b31/bom/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/bom/pom.xml
--- hk2-hk2-parent-2.4.0-b31/bom/pom.xml 2015-08-19 15:09:19.769765723 +0200
+++ hk2-hk2-parent-2.4.0-b31.hk2_external/bom/pom.xml 2015-08-19 15:14:34.498066159 +0200
@@ -170,9 +170,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>aopalliance-repackaged</artifactId>
- <version>${project.version}</version>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>${aopalliance.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
@@ -180,29 +180,19 @@
<version>${asm.version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>bean-validator</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>bean-validator-cdi</artifactId>
- <version>${project.version}</version>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator-cdi</artifactId>
+ <version>${hibernate-validator.version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
+ <groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
- <version>${project.version}</version>
+ <version>${javax.inject.version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2</groupId>
- <artifactId>external</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.hk2</groupId>
- <artifactId>tiger-types-osgi</artifactId>
- <version>${project.version}</version>
+ <groupId>org.jvnet</groupId>
+ <artifactId>tiger-types</artifactId>
+ <version>${tiger-types.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-api/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-api/pom.xml
--- hk2-hk2-parent-2.4.0-b31/hk2-api/pom.xml 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-api/pom.xml 2015-08-19 15:18:08.077633513 +0200
@@ -98,8 +98,8 @@
<artifactId>hk2-utils</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>aopalliance-repackaged</artifactId>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
</dependency>
</dependencies>
</project>
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-configuration/persistence/hk2-xml-dom/hk2-config/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-configuration/persistence/hk2-xml-dom/hk2-config/pom.xml
--- hk2-hk2-parent-2.4.0-b31/hk2-configuration/persistence/hk2-xml-dom/hk2-config/pom.xml 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-configuration/persistence/hk2-xml-dom/hk2-config/pom.xml 2015-08-19 15:20:19.128618519 +0200
@@ -120,8 +120,8 @@
use hk2:run goal and that requires javax.valiation to be found. Only, the APIs are not
enough. We need the full provider as well.
-->
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>bean-validator</artifactId>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
</dependency>
<!-- hk2-config tests use hibernate-validator which requires javax.el-api -->
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-configuration/persistence/hk2-xml-dom/hub-integration/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-configuration/persistence/hk2-xml-dom/hub-integration/pom.xml
--- hk2-hk2-parent-2.4.0-b31/hk2-configuration/persistence/hk2-xml-dom/hub-integration/pom.xml 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-configuration/persistence/hk2-xml-dom/hub-integration/pom.xml 2015-08-19 15:21:16.002574127 +0200
@@ -127,8 +127,8 @@
<artifactId>hk2-configuration-hub</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>bean-validator</artifactId>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-extras/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-extras/pom.xml
--- hk2-hk2-parent-2.4.0-b31/hk2-extras/pom.xml 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-extras/pom.xml 2015-08-19 15:21:58.654291034 +0200
@@ -99,8 +99,8 @@
<artifactId>hk2-api</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>aopalliance-repackaged</artifactId>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
</dependency>
</dependencies>
</project>
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-inhabitant-generator/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-inhabitant-generator/pom.xml
--- hk2-hk2-parent-2.4.0-b31/hk2-inhabitant-generator/pom.xml 2015-08-19 15:09:19.793764553 +0200
+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-inhabitant-generator/pom.xml 2015-08-19 15:22:22.050038689 +0200
@@ -73,7 +73,7 @@
<dependencies>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
+ <groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-locator/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-locator/pom.xml
--- hk2-hk2-parent-2.4.0-b31/hk2-locator/pom.xml 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-locator/pom.xml 2015-08-19 15:23:04.287777756 +0200
@@ -94,12 +94,12 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
+ <groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>aopalliance-repackaged</artifactId>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-metadata-generator/main/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-metadata-generator/main/pom.xml
--- hk2-hk2-parent-2.4.0-b31/hk2-metadata-generator/main/pom.xml 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-metadata-generator/main/pom.xml 2015-08-19 15:23:34.539158438 +0200
@@ -74,7 +74,7 @@
<dependencies>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
+ <groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-metadata-generator/test1/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-metadata-generator/test1/pom.xml
--- hk2-hk2-parent-2.4.0-b31/hk2-metadata-generator/test1/pom.xml 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-metadata-generator/test1/pom.xml 2015-08-19 15:23:51.811233885 +0200
@@ -68,7 +68,7 @@
<dependencies>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
+ <groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-junitrunner/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-junitrunner/pom.xml
--- hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-junitrunner/pom.xml 2015-08-19 15:09:19.816763433 +0200
+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-junitrunner/pom.xml 2015-08-19 15:24:47.184269836 +0200
@@ -85,7 +85,7 @@
<artifactId>hk2-api</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
+ <groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-locator-extras/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-locator-extras/pom.xml
--- hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-locator-extras/pom.xml 2015-08-19 15:09:19.817763384 +0200
+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-locator-extras/pom.xml 2015-08-19 15:25:09.863055869 +0200
@@ -85,7 +85,7 @@
<artifactId>hk2-api</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
+ <groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-locator-no-proxies/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-locator-no-proxies/pom.xml
--- hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-locator-no-proxies/pom.xml 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-locator-no-proxies/pom.xml 2015-08-19 15:25:55.208628577 +0200
@@ -85,8 +85,8 @@
<artifactId>javassist</artifactId>
</exclusion>
<exclusion>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>aopalliance-repackaged</artifactId>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -95,13 +95,13 @@
<artifactId>hk2-api</artifactId>
<exclusions>
<exclusion>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>aopalliance-repackaged</artifactId>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
+ <groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
</dependencies>
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-locator-no-proxies2/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-locator-no-proxies2/pom.xml
--- hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-locator-no-proxies2/pom.xml 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-locator-no-proxies2/pom.xml 2015-08-19 15:26:14.847577329 +0200
@@ -91,7 +91,7 @@
<artifactId>hk2-api</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
+ <groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
</dependencies>
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-mockito/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-mockito/pom.xml
--- hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-mockito/pom.xml 2015-08-19 15:09:19.818763335 +0200
+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-mockito/pom.xml 2015-08-19 15:26:35.748458531 +0200
@@ -102,7 +102,7 @@
<artifactId>hk2-api</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
+ <groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-runlevel-extras/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-runlevel-extras/pom.xml
--- hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-runlevel-extras/pom.xml 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-runlevel-extras/pom.xml 2015-08-19 15:27:01.592075155 +0200
@@ -98,7 +98,7 @@
<artifactId>hk2-api</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
+ <groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-testng/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-testng/pom.xml
--- hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-testng/pom.xml 2015-08-19 15:09:19.818763335 +0200
+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-testng/pom.xml 2015-08-19 15:27:28.594629742 +0200
@@ -100,7 +100,7 @@
<artifactId>hk2-api</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
+ <groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-testing/interceptor-events/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/interceptor-events/pom.xml
--- hk2-hk2-parent-2.4.0-b31/hk2-testing/interceptor-events/pom.xml 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/interceptor-events/pom.xml 2015-08-19 15:27:44.632771240 +0200
@@ -84,7 +84,7 @@
<artifactId>hk2-api</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
+ <groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
diff -Nru hk2-hk2-parent-2.4.0-b31/osgi/adapter-tests/no-hk2-bundle/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/osgi/adapter-tests/no-hk2-bundle/pom.xml
--- hk2-hk2-parent-2.4.0-b31/osgi/adapter-tests/no-hk2-bundle/pom.xml 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.hk2_external/osgi/adapter-tests/no-hk2-bundle/pom.xml 2015-08-19 15:28:57.048894896 +0200
@@ -78,7 +78,7 @@
<dependencies>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
+ <groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
</dependencies>
diff -Nru hk2-hk2-parent-2.4.0-b31/osgi/adapter-tests/osgi-adapter-test/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/osgi/adapter-tests/osgi-adapter-test/pom.xml
--- hk2-hk2-parent-2.4.0-b31/osgi/adapter-tests/osgi-adapter-test/pom.xml 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.hk2_external/osgi/adapter-tests/osgi-adapter-test/pom.xml 2015-08-19 15:29:47.207209985 +0200
@@ -123,8 +123,8 @@
<artifactId>sdp-management-bundle</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>aopalliance-repackaged</artifactId>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
</dependency>
<dependency>
<groupId>javax.inject</groupId>