This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 90d28b1  ISIS-1951 cleanup objenesis and javassist references in POMs
90d28b1 is described below

commit 90d28b10b56a49151e6dc34a493b6fbf284e8111
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Wed May 30 11:49:07 2018 +0200

    ISIS-1951 cleanup objenesis and javassist references in POMs
---
 core/legacy/unittestsupport-legacy/pom.xml |  1 +
 core/mavendeps/testing/pom.xml             |  4 ----
 core/plugins/codegen-bytebuddy/pom.xml     |  8 +++++---
 core/plugins/codegen-javassist/pom.xml     |  6 ++++++
 core/pom.xml                               | 21 +--------------------
 core/unittestsupport-test/pom.xml          |  7 -------
 6 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/core/legacy/unittestsupport-legacy/pom.xml 
b/core/legacy/unittestsupport-legacy/pom.xml
index 08c1494..98f59e2 100644
--- a/core/legacy/unittestsupport-legacy/pom.xml
+++ b/core/legacy/unittestsupport-legacy/pom.xml
@@ -77,6 +77,7 @@
         <dependency>
             <groupId>org.objenesis</groupId>
             <artifactId>objenesis</artifactId>
+            <version>2.4</version>
             <optional>true</optional>
         </dependency>
 
diff --git a/core/mavendeps/testing/pom.xml b/core/mavendeps/testing/pom.xml
index 4740d4c..f5f99c6 100644
--- a/core/mavendeps/testing/pom.xml
+++ b/core/mavendeps/testing/pom.xml
@@ -62,10 +62,6 @@
                 </dependency>
 
                 <dependency>
-                    <groupId>org.objenesis</groupId>
-                    <artifactId>objenesis</artifactId>
-                </dependency>
-                <dependency>
                     <groupId>org.hamcrest</groupId>
                     <artifactId>hamcrest-library</artifactId>
                 </dependency>
diff --git a/core/plugins/codegen-bytebuddy/pom.xml 
b/core/plugins/codegen-bytebuddy/pom.xml
index 699c718..4d021f7 100644
--- a/core/plugins/codegen-bytebuddy/pom.xml
+++ b/core/plugins/codegen-bytebuddy/pom.xml
@@ -30,7 +30,8 @@
 
        <properties>
                <bytebuddy.version>1.8.0</bytebuddy.version>
-       
+               <objenesis.version>2.4</objenesis.version>
+
                
<jar-plugin.automaticModuleName>org.apache.isis.plugins.codegen-bytebuddy</jar-plugin.automaticModuleName>
                
<git-plugin.propertiesDir>org/apache/isis/plugins/codegen-bytebuddy</git-plugin.propertiesDir>
        </properties>
@@ -61,12 +62,13 @@
                        <artifactId>byte-buddy</artifactId>
                        <version>${bytebuddy.version}</version>
                </dependency>
-               
+
                <dependency>
                        <groupId>org.objenesis</groupId>
                        <artifactId>objenesis</artifactId>
+                       <version>${objenesis.version}</version>
                </dependency>
-
+       
                <dependency>
                        <groupId>org.apache.isis.core</groupId>
                        <artifactId>isis-core-commons</artifactId>
diff --git a/core/plugins/codegen-javassist/pom.xml 
b/core/plugins/codegen-javassist/pom.xml
index eaad977..bbce5a7 100644
--- a/core/plugins/codegen-javassist/pom.xml
+++ b/core/plugins/codegen-javassist/pom.xml
@@ -28,6 +28,10 @@
     </description>
 
        <properties>
+               <objenesis.version>2.4</objenesis.version>
+               <javassist.version>3.20.0-GA</javassist.version>
+               
+       
                
<jar-plugin.automaticModuleName>org.apache.isis.plugins.codegen-javassist</jar-plugin.automaticModuleName>
                
<git-plugin.propertiesDir>org/apache/isis/plugins/codegen-javassist</git-plugin.propertiesDir>
        </properties>
@@ -58,11 +62,13 @@
                <dependency>
                        <groupId>org.javassist</groupId>
                        <artifactId>javassist</artifactId>
+                       <version>${javassist.version}</version>
                </dependency>
                
                <dependency>
                        <groupId>org.objenesis</groupId>
                        <artifactId>objenesis</artifactId>
+                       <version>${objenesis.version}</version>
                </dependency>
 
                <dependency>
diff --git a/core/pom.xml b/core/pom.xml
index 4926a93..36dc623 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -129,10 +129,8 @@
         <guava.version>19.0</guava.version>
 
         <hamcrest.version>1.3</hamcrest.version>
-
         <assertj.version>3.6.2</assertj.version>
-        <objenesis.version>2.4</objenesis.version>
-        <javassist.version>3.20.0-GA</javassist.version>
+        
         <reflections.version>0.9.10</reflections.version>
         <findbugs-annotations.version>2.0.1</findbugs-annotations.version>
 
@@ -1658,18 +1656,6 @@ ${license.additional-notes}
                 <version>${picocontainer.version}</version>
             </dependency>
             
-            <!-- Bytecode libraries -->
-            <dependency>
-                <groupId>org.objenesis</groupId>
-                <artifactId>objenesis</artifactId>
-                <version>${objenesis.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.javassist</groupId>
-                <artifactId>javassist</artifactId>
-                <version>${javassist.version}</version>
-            </dependency>
-
             <!-- JSON libraries -->
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
@@ -2183,11 +2169,6 @@ ${license.additional-notes}
             <artifactId>jmock-junit4</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.objenesis</groupId>
-            <artifactId>objenesis</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <profiles>
diff --git a/core/unittestsupport-test/pom.xml 
b/core/unittestsupport-test/pom.xml
index b55dc28..aa63136 100644
--- a/core/unittestsupport-test/pom.xml
+++ b/core/unittestsupport-test/pom.xml
@@ -60,17 +60,10 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-                       <groupId>org.javassist</groupId>
-                       <artifactId>javassist</artifactId>
-                       <scope>test</scope>
-                       <optional>true</optional>
-               </dependency>
-        <dependency>
             <groupId>org.apache.isis.core</groupId>
             <artifactId>isis-core-plugins-codegen-bytebuddy</artifactId>
             <scope>runtime</scope>
         </dependency>
-        
 
                <!-- JUPITER -->
                <dependency>

-- 
To stop receiving notification emails like this one, please contact
ahu...@apache.org.

Reply via email to