DELTASPIKE-1323 upgrade to more recent OSGi

The old maven-bundle-plugin didn't work for Java8.
When upgrading to a more recent version tons of different
things broke apart.

I had to change the packaging from 'bundle' to 'jar'
to make things compile again.
This should get fixed and we should fix OSGi again.


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/00f2ba3f
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/00f2ba3f
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/00f2ba3f

Branch: refs/heads/master
Commit: 00f2ba3ffc0a6b8e6e1c1762ae886e78d7101e2b
Parents: 7adfab6
Author: Mark Struberg <strub...@apache.org>
Authored: Tue Mar 6 14:48:04 2018 +0100
Committer: Mark Struberg <strub...@apache.org>
Committed: Tue Mar 6 14:48:04 2018 +0100

----------------------------------------------------------------------
 deltaspike/core/api/pom.xml                     | 2 +-
 deltaspike/core/impl/pom.xml                    | 2 +-
 deltaspike/modules/bean-validation/impl/pom.xml | 2 +-
 deltaspike/modules/data/api/pom.xml             | 2 +-
 deltaspike/modules/data/impl/pom.xml            | 2 +-
 deltaspike/modules/jpa/api/pom.xml              | 2 +-
 deltaspike/modules/jpa/impl/pom.xml             | 2 +-
 deltaspike/modules/partial-bean/api/pom.xml     | 2 +-
 deltaspike/modules/partial-bean/impl/pom.xml    | 2 +-
 deltaspike/modules/proxy/api/pom.xml            | 2 +-
 deltaspike/modules/proxy/impl-asm/pom.xml       | 2 +-
 deltaspike/modules/scheduler/api/pom.xml        | 2 +-
 deltaspike/modules/scheduler/impl/pom.xml       | 2 +-
 deltaspike/modules/security/api/pom.xml         | 2 +-
 deltaspike/modules/security/impl/pom.xml        | 2 +-
 deltaspike/modules/test-control/api/pom.xml     | 2 +-
 deltaspike/modules/test-control/impl/pom.xml    | 2 +-
 deltaspike/parent/pom.xml                       | 4 ++--
 18 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/core/api/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/pom.xml b/deltaspike/core/api/pom.xml
index 00e7f70..1de2eaa 100644
--- a/deltaspike/core/api/pom.xml
+++ b/deltaspike/core/api/pom.xml
@@ -48,7 +48,7 @@
 
     <groupId>org.apache.deltaspike.core</groupId>
     <artifactId>deltaspike-core-api</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <name>Apache DeltaSpike Core-API</name>
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/core/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/pom.xml b/deltaspike/core/impl/pom.xml
index 5ee522a..e4bcb90 100644
--- a/deltaspike/core/impl/pom.xml
+++ b/deltaspike/core/impl/pom.xml
@@ -29,7 +29,7 @@
 
     <groupId>org.apache.deltaspike.core</groupId>
     <artifactId>deltaspike-core-impl</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <name>Apache DeltaSpike Core-Implementation</name>
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/bean-validation/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/bean-validation/impl/pom.xml 
b/deltaspike/modules/bean-validation/impl/pom.xml
index 41571b8..45942ec 100644
--- a/deltaspike/modules/bean-validation/impl/pom.xml
+++ b/deltaspike/modules/bean-validation/impl/pom.xml
@@ -27,7 +27,7 @@
        </parent>
 
        <artifactId>deltaspike-bean-validation-module-impl</artifactId>
-        <packaging>bundle</packaging>
+        <packaging>jar</packaging>
        <name>Apache DeltaSpike BeanValidation-Module Impl</name>
         <properties>
             
<deltaspike.osgi.export.pkg>org.apache.deltaspike.beanvalidation.impl.*</deltaspike.osgi.export.pkg>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/data/api/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/data/api/pom.xml 
b/deltaspike/modules/data/api/pom.xml
index 0398812..d3eafe5 100755
--- a/deltaspike/modules/data/api/pom.xml
+++ b/deltaspike/modules/data/api/pom.xml
@@ -27,7 +27,7 @@
     </parent>
 
     <artifactId>deltaspike-data-module-api</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <name>Apache DeltaSpike Data-Module API</name>
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/data/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/data/impl/pom.xml 
b/deltaspike/modules/data/impl/pom.xml
index 4ab2fa1..5f7b82a 100755
--- a/deltaspike/modules/data/impl/pom.xml
+++ b/deltaspike/modules/data/impl/pom.xml
@@ -27,7 +27,7 @@
     </parent>
 
     <artifactId>deltaspike-data-module-impl</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <name>Apache DeltaSpike Data-Module Impl</name>
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/jpa/api/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/api/pom.xml 
b/deltaspike/modules/jpa/api/pom.xml
index 74b3982..74bbb5e 100644
--- a/deltaspike/modules/jpa/api/pom.xml
+++ b/deltaspike/modules/jpa/api/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>org.apache.deltaspike.modules</groupId>
     <artifactId>deltaspike-jpa-module-api</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <name>Apache DeltaSpike JPA-Module API</name>
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/jpa/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/pom.xml 
b/deltaspike/modules/jpa/impl/pom.xml
index f113f94..2326ccd 100644
--- a/deltaspike/modules/jpa/impl/pom.xml
+++ b/deltaspike/modules/jpa/impl/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>org.apache.deltaspike.modules</groupId>
     <artifactId>deltaspike-jpa-module-impl</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <name>Apache DeltaSpike JPA-Module Impl</name>
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/partial-bean/api/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/partial-bean/api/pom.xml 
b/deltaspike/modules/partial-bean/api/pom.xml
index bad5f51..0f7f7cc 100644
--- a/deltaspike/modules/partial-bean/api/pom.xml
+++ b/deltaspike/modules/partial-bean/api/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>org.apache.deltaspike.modules</groupId>
     <artifactId>deltaspike-partial-bean-module-api</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <name>Apache DeltaSpike Partial-Bean-Module API</name>
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/partial-bean/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/partial-bean/impl/pom.xml 
b/deltaspike/modules/partial-bean/impl/pom.xml
index a8d6a3c..0aa7236 100644
--- a/deltaspike/modules/partial-bean/impl/pom.xml
+++ b/deltaspike/modules/partial-bean/impl/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>org.apache.deltaspike.modules</groupId>
     <artifactId>deltaspike-partial-bean-module-impl</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <name>Apache DeltaSpike Partial-Bean-Module Impl</name>
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/proxy/api/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/proxy/api/pom.xml 
b/deltaspike/modules/proxy/api/pom.xml
index 8222358..4752056 100644
--- a/deltaspike/modules/proxy/api/pom.xml
+++ b/deltaspike/modules/proxy/api/pom.xml
@@ -27,7 +27,7 @@
        </parent>
 
        <artifactId>deltaspike-proxy-module-api</artifactId>
-       <packaging>bundle</packaging>
+       <packaging>jar</packaging>
 
        <name>Apache DeltaSpike Proxy-Module API</name>
     

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/proxy/impl-asm/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/proxy/impl-asm/pom.xml 
b/deltaspike/modules/proxy/impl-asm/pom.xml
index ad472b3..7912f82 100644
--- a/deltaspike/modules/proxy/impl-asm/pom.xml
+++ b/deltaspike/modules/proxy/impl-asm/pom.xml
@@ -27,7 +27,7 @@
     </parent>
 
     <artifactId>deltaspike-proxy-module-impl-asm</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <name>Apache DeltaSpike Proxy-Module Impl ASM</name>
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/scheduler/api/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/api/pom.xml 
b/deltaspike/modules/scheduler/api/pom.xml
index 10256b2..2b9a0ec 100644
--- a/deltaspike/modules/scheduler/api/pom.xml
+++ b/deltaspike/modules/scheduler/api/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>org.apache.deltaspike.modules</groupId>
     <artifactId>deltaspike-scheduler-module-api</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <name>Apache DeltaSpike Scheduler-Module API</name>
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/scheduler/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/pom.xml 
b/deltaspike/modules/scheduler/impl/pom.xml
index f582688..1fa8c0b 100644
--- a/deltaspike/modules/scheduler/impl/pom.xml
+++ b/deltaspike/modules/scheduler/impl/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>org.apache.deltaspike.modules</groupId>
     <artifactId>deltaspike-scheduler-module-impl</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <name>Apache DeltaSpike Scheduler-Module Impl</name>
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/security/api/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/pom.xml 
b/deltaspike/modules/security/api/pom.xml
index f004ed6..5881a34 100644
--- a/deltaspike/modules/security/api/pom.xml
+++ b/deltaspike/modules/security/api/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>org.apache.deltaspike.modules</groupId>
     <artifactId>deltaspike-security-module-api</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <name>Apache DeltaSpike Security-Module API</name>
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/security/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/pom.xml 
b/deltaspike/modules/security/impl/pom.xml
index 9d3158a..2366197 100644
--- a/deltaspike/modules/security/impl/pom.xml
+++ b/deltaspike/modules/security/impl/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>org.apache.deltaspike.modules</groupId>
     <artifactId>deltaspike-security-module-impl</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <name>Apache DeltaSpike Security-Module Impl</name>
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/test-control/api/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/test-control/api/pom.xml 
b/deltaspike/modules/test-control/api/pom.xml
index 6d37e20..b1aa250 100644
--- a/deltaspike/modules/test-control/api/pom.xml
+++ b/deltaspike/modules/test-control/api/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>org.apache.deltaspike.modules</groupId>
     <artifactId>deltaspike-test-control-module-api</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <name>Apache DeltaSpike Test-Control-Module API</name>
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/test-control/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/test-control/impl/pom.xml 
b/deltaspike/modules/test-control/impl/pom.xml
index 11552a9..a8b7c55 100644
--- a/deltaspike/modules/test-control/impl/pom.xml
+++ b/deltaspike/modules/test-control/impl/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>org.apache.deltaspike.modules</groupId>
     <artifactId>deltaspike-test-control-module-impl</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <name>Apache DeltaSpike Test-Control-Module Impl</name>
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/parent/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index d8ce300..1f0cefc 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -91,10 +91,10 @@
 
         
<maven.jetty.plugin.version>7.1.5.v20100705</maven.jetty.plugin.version>
         <maven.surefire.plugin.version>2.19.1</maven.surefire.plugin.version>
-        <maven.bundle.plugin.version>2.3.7</maven.bundle.plugin.version>
+        <maven.bundle.plugin.version>3.5.0</maven.bundle.plugin.version>
         <maven.jar.plugin.version>2.4</maven.jar.plugin.version>
         <maven.dependency.plugin.version>2.4</maven.dependency.plugin.version>
-        <maven.checkstyle.plugin.version>2.17</maven.checkstyle.plugin.version>
+        <maven.checkstyle.plugin.version>2.16</maven.checkstyle.plugin.version>
         <maven.compiler.plugin.version>2.5</maven.compiler.plugin.version>
         <maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
         <maven.artifact.version>3.0</maven.artifact.version>

Reply via email to