From f2980cf2f92593239877220aaaa0398aa9bf412c Mon Sep 17 00:00:00 2001
From: Walter Oggioni <oggioni.walter@gmail.com>
Date: Sun, 26 Sep 2021 09:30:56 +0200
Subject: [PATCH] added version and JPMS module descriptor

---
 build.gradle                                  | 38 ++++++++++++-------
 gradle.properties                             |  3 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 settings.gradle                               |  3 +-
 .../java/net/woggioni/wdi/BeanContainer.java  |  2 +-
 src/main/java9/module-info.java               |  1 +
 6 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1a7dc0a..7ff8699 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,20 +1,34 @@
 plugins {
     id 'maven-publish'
-    id 'net.woggioni.plugins.multi-release-jar'
-    id 'net.woggioni.gradle.lombok'
+    id 'net.woggioni.gradle.multi-release-jar'
+    id 'net.woggioni.gradle.lombok' apply false
 }
 
-group = "net.woggioni"
+ext {
+    setProperty("jpms.module.name" , "net.woggioni.wdi")
+}
 
-repositories {
-    maven {
-        url = 'https://woggioni.net/mvn'
+allprojects {
+    apply plugin: 'net.woggioni.gradle.lombok'
+
+    group = "net.woggioni"
+    version = getProperty("wdi.version")
+
+    repositories {
+        mavenLocal()
+        maven {
+            url = 'https://woggioni.net/mvn'
+        }
+        mavenCentral()
     }
-    mavenCentral()
-}
 
-lombok {
-    version = getProperty('lombok.version')
+    lombok {
+        version = getProperty('lombok.version')
+    }
+
+    test {
+        useJUnitPlatform()
+    }
 }
 
 dependencies {
@@ -35,10 +49,6 @@ compileTestJava {
     options.compilerArgs << '-parameters'
 }
 
-test {
-    useJUnitPlatform()
-}
-
 publishing {
     repositories {
         maven {
diff --git a/gradle.properties b/gradle.properties
index 724efa9..8290efe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,5 @@
-gradle.version = 7.1.1
+gradle.version=7.2
+wdi.version=1.0
 jwo.version=1.0
 junit.jupiter.version=5.7.2
 lombok.version=1.18.16
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 05679dc..ffed3a2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
index 0d4560d..6de9dae 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,7 +9,8 @@ pluginManagement {
 
     plugins {
         id "net.woggioni.gradle.lombok" version "0.1"
-        id "net.woggioni.plugins.multi-release-jar" version "0.1"
+        id "net.woggioni.gradle.multi-release-jar" version "0.1"
+        id "net.woggioni.gradle.envelope" version "0.1"
     }
 }
 
diff --git a/src/main/java/net/woggioni/wdi/BeanContainer.java b/src/main/java/net/woggioni/wdi/BeanContainer.java
index af924af..85a2d18 100644
--- a/src/main/java/net/woggioni/wdi/BeanContainer.java
+++ b/src/main/java/net/woggioni/wdi/BeanContainer.java
@@ -29,7 +29,7 @@ public class BeanContainer {
         try {
             return with(beanFactoryClass.getConstructor().newInstance());
         } catch (NoSuchMethodException | IllegalAccessException ex) {
-            throw JWO.newThrowable(BeanConfigurationException.class,
+            throw JWO.newThrowable(BeanConfigurationException.class, ex,
                     "Bean factory class '%s' is required to have a public zero arguments constructor", beanFactoryClass.getName());
         }
     }
diff --git a/src/main/java9/module-info.java b/src/main/java9/module-info.java
index b2104a8..cdab6c6 100644
--- a/src/main/java9/module-info.java
+++ b/src/main/java9/module-info.java
@@ -1,3 +1,4 @@
 module net.woggioni.wdi {
+    requires net.woggioni.jwo;
     exports net.woggioni.wdi;
 }
\ No newline at end of file