You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2013/02/20 10:37:51 UTC
svn commit: r1448058 - in /openwebbeans/trunk: pom.xml webbeans-impl/pom.xml
webbeans-jsf/pom.xml webbeans-tck/pom.xml
Author: struberg
Date: Wed Feb 20 09:37:50 2013
New Revision: 1448058
URL: http://svn.apache.org/r1448058
Log:
OWB-781 remove usage of scannotation and javassist
Modified:
openwebbeans/trunk/pom.xml
openwebbeans/trunk/webbeans-impl/pom.xml
openwebbeans/trunk/webbeans-jsf/pom.xml
openwebbeans/trunk/webbeans-tck/pom.xml
Modified: openwebbeans/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/pom.xml?rev=1448058&r1=1448057&r2=1448058&view=diff
==============================================================================
--- openwebbeans/trunk/pom.xml (original)
+++ openwebbeans/trunk/pom.xml Wed Feb 20 09:37:50 2013
@@ -69,7 +69,6 @@
<dom4j.version>1.6.1</dom4j.version>
<geronimo_ejb.version>1.0.2</geronimo_ejb.version>
<geronimo_el.version>1.0.2</geronimo_el.version>
- <scannatation.version>1.0.2</scannatation.version>
<geronimo_annotation.version>1.0.1</geronimo_annotation.version>
<geronimo_jpa.version>1.1</geronimo_jpa.version>
<geronimo_jta.version>1.1.1</geronimo_jta.version>
@@ -78,7 +77,6 @@
<geronimo_atinject.version>1.0</geronimo_atinject.version>
<geronimo_interceptor.version>1.0</geronimo_interceptor.version>
<geronimo_validation.version>1.1</geronimo_validation.version>
- <javassist.version>3.12.0.GA</javassist.version>
<openejb.version>3.1.4</openejb.version>
<myfaces.version>2.0.7</myfaces.version>
</properties>
@@ -547,38 +545,11 @@
</dependency>
<dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>${javassist.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder-shaded</artifactId>
<version>3.13-SNAPSHOT</version>
</dependency>
- <!--X TODO use a shaded version of:
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>4.1</version>
- <optional>true</optional>
- </dependency>
- -->
-
- <dependency>
- <groupId>net.sf.scannotation</groupId>
- <artifactId>scannotation</artifactId>
- <version>${scannatation.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: openwebbeans/trunk/webbeans-impl/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/pom.xml?rev=1448058&r1=1448057&r2=1448058&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/pom.xml (original)
+++ openwebbeans/trunk/webbeans-impl/pom.xml Wed Feb 20 09:37:50 2013
@@ -38,11 +38,6 @@
</dependency>
<dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder-shaded</artifactId>
</dependency>
Modified: openwebbeans/trunk/webbeans-jsf/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/pom.xml?rev=1448058&r1=1448057&r2=1448058&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf/pom.xml (original)
+++ openwebbeans/trunk/webbeans-jsf/pom.xml Wed Feb 20 09:37:50 2013
@@ -103,8 +103,7 @@
<Export-Package>!org.apache.webbeans.internal.*,org.apache.webbeans.*;version="${project.version}"</Export-Package>
<Private-Package>org.apache.webbeans.internal.*</Private-Package>
<Import-Package>
- *,
- javassist.util.proxy
+ *
</Import-Package>
</instructions>
</configuration>
Modified: openwebbeans/trunk/webbeans-tck/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/pom.xml?rev=1448058&r1=1448057&r2=1448058&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tck/pom.xml (original)
+++ openwebbeans/trunk/webbeans-tck/pom.xml Wed Feb 20 09:37:50 2013
@@ -248,22 +248,6 @@
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
- <!-- javassist -->
- <artifactItem>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
-
- <!-- scannotation -->
- <artifactItem>
- <groupId>net.sf.scannotation</groupId>
- <artifactId>scannotation</artifactId>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
-
<!-- commons-logging -->
<artifactItem>
<groupId>commons-logging</groupId>