[weld-commits] Weld SVN: r4102 - core/trunk/osgi-bundle.

weld-commits at lists.jboss.org weld-commits at lists.jboss.org
Wed Oct 14 17:29:23 EDT 2009


Author: pete.muir at jboss.org
Date: 2009-10-14 17:29:23 -0400 (Wed, 14 Oct 2009)
New Revision: 4102

Modified:
   core/trunk/osgi-bundle/pom.xml
Log:
revert, lost too much info

Modified: core/trunk/osgi-bundle/pom.xml
===================================================================
--- core/trunk/osgi-bundle/pom.xml	2009-10-14 21:16:38 UTC (rev 4101)
+++ core/trunk/osgi-bundle/pom.xml	2009-10-14 21:29:23 UTC (rev 4102)
@@ -1,155 +1,146 @@
-<!--
-/*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-*
-* Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
-*
-* Use is subject to license terms.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
--->
+
+   <!--
+      /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * *
+      Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. *
+      * Use is subject to license terms. * * Licensed under the Apache
+      License, Version 2.0 (the "License"); * you may not use this file
+      except in compliance with the License. * You may obtain a copy of
+      the License at * http://www.apache.org/licenses/LICENSE-2.0 *
+      Unless required by applicable law or agreed to in writing,
+      software * distributed under the License is distributed on an "AS
+      IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+      express or implied. * See the License for the specific language
+      governing permissions and * limitations under the License. */
+   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <parent>
       <artifactId>weld-core-parent</artifactId>
       <groupId>org.jboss.weld</groupId>
       <version>1.0.0-SNAPSHOT</version>
+      <relativePath>../parent/pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
 
    <groupId>org.jboss.weld</groupId>
    <artifactId>weld-osgi-bundle</artifactId>
    <name>Weld OSGi Bundle</name>
-   <description>Weld implementation packaged as an OSGi bundle</description>
+   <description>Weld runtime packaged as an OSGi bundle</description>
 
    <developers>
-        <developer>
-
-            <id>ss141213</id>
-            <name>Sanjeeb Sahoo</name>
-            <url>http://weblogs.dev.java.net/ss141213</url>
-            <organization>Sun Microsystems, Inc.</organization>
-            <roles>
-                <role>developer</role>
-
-            </roles>
-        </developer>
+      <developer>
+         <id>ss141213</id>
+         <name>Sanjeeb Sahoo</name>
+         <url>http://weblogs.dev.java.net/ss141213</url>
+         <organization>Sun Microsystems, Inc.</organization>
+         <roles>
+            <role>developer</role>
+         </roles>
+      </developer>
+      <developer>
+         <name>Roger Kitain</name>
+         <id>rogerk</id>
+         <organization>Sun Microsystems, Inc.</organization>
+      </developer>
    </developers>
 
    <properties>
-       <osgi.version>1.0</osgi.version>
+      <osgi.version>1.0</osgi.version>
    </properties>
    <build>
-       <plugins>
+      <plugins>
 
-           <plugin>
-               <groupId>org.apache.felix</groupId>
-               <artifactId>maven-bundle-plugin</artifactId>
-               <version>2.0.0</version>
-               <configuration>
-                    <instructions>
-                        <_include>-osgi.bundle</_include>
+         <plugin>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>maven-bundle-plugin</artifactId>
+            <configuration>
+               <instructions>
+                  <_include>-osgi.bundle</_include>
 
-                        <Embed-Dependency>*; scope=compile; inline=true</Embed-Dependency>
-                        <_exportcontents>javax.event; javax.context; javax.weld; javax.decorator; javax.inject; javax.enterprise.*; version=${osgi.version},
-                                         org.jboss.weld.context; org.jboss.weld.ejb; org.jboss.weld.bean; org.jboss.weld.bean.proxy; org.jboss.weld.*.api.*; org.jboss.weld.*.spi.*; org.jboss.weld.conversation; org.jboss.weld; org.jboss.weld.bootstrap; org.jboss.weld.introspector; org.jboss.weld.servlet; version=${osgi.version},
-                                         org.jboss.weld.el; version=${osgi.version},
-                                         org.jboss.weld.jsf; include:="WeldPhaseListener"; version=${osgi.version},
-                                         javassist.util.proxy;version="3.8.1.GA"
+                  <Embed-Dependency>*; scope=compile; inline=true</Embed-Dependency>
+                  <_exportcontents>javax.decorator;
+                     javax.enterprise.*; version=${osgi.version},
+                     org.jboss.weld.context; org.jboss.weld.ejb;
+                     org.jboss.weld.bean; org.jboss.weld.bean.proxy;
+                     org.jboss.weld.*.api.*; org.jboss.weld.*.spi.*;
+                     org.jboss.weld.conversation; org.jboss.weld;
+                     org.jboss.weld.bootstrap;
+                     org.jboss.weld.introspector;
+                     org.jboss.weld.servlet; version=${osgi.version},
+                     org.jboss.weld.el; version=${osgi.version},
+                     org.jboss.weld.jsf; include:="WeldPhaseListener";
+                     version=${osgi.version},
+                     javassist.util.proxy;version="3.8.1.GA"
                         </_exportcontents>
-                        <Import-Package>javax.annotation, javax.interceptor.*, *;resolution:=optional</Import-Package>
-                        <Private-Package>!javax.annotation.*, !javax.interceptor.*</Private-Package>
-                    </instructions>
-                    <!-- Maven uses the output directory (target/classes)
-                    rather than the final bundle, when compiling against
-                    projects in the same reactor (ie. the same build).
-                    Since this jar comprises of classes that come from
-                    some other jar and other modules may depend on this
-                    artifact, we need to unpack.
-                    -->
-                    <unpackBundle>true</unpackBundle>
-
-               </configuration>
-	       <executions>
-                   <execution>
-                       <id>osgi-bundle</id>
-                       <goals>
-                           <goal>bundle</goal>
-                       </goals>
-                       <phase>package</phase>
-
-                   </execution>
-               </executions>
-           </plugin>
-       </plugins>
+                  <Import-Package>javax.annotation, javax.interceptor,
+                     *;resolution:=optional</Import-Package>
+                  <Private-Package>!javax.annotation.*,
+                     !javax.interceptor.*</Private-Package>
+               </instructions>
+               <!--
+                  Maven uses the output directory (target/classes)
+                  rather than the final bundle, when compiling against
+                  projects in the same reactor (ie. the same build).
+                  Since this jar comprises of classes that come from
+                  some other jar and other modules may depend on this
+                  artifact, we need to unpack.
+               -->
+               <unpackBundle>true</unpackBundle>
+            </configuration>
+            <executions>
+               <execution>
+                  <id>osgi-bundle</id>
+                  <goals>
+                     <goal>bundle</goal>
+                  </goals>
+                  <phase>package</phase>
+               </execution>
+            </executions>
+         </plugin>
+      </plugins>
    </build>
    <dependencies>
-     <dependency>
-       <groupId>javax.enterprise</groupId>
-       <artifactId>cdi-api</artifactId>
-     </dependency>
+      
+      <dependency>
+         <groupId>javax.enterprise</groupId>
+         <artifactId>cdi-api</artifactId>
+      </dependency>
+      
+      <dependency>
+         <groupId>org.jboss.weld</groupId>
+         <artifactId>weld-api</artifactId>
+      </dependency>
+      
+      <dependency>
+         <groupId>org.jboss.weld</groupId>
+         <artifactId>weld-spi</artifactId>
+      </dependency>
+      
+      <dependency>
+         <groupId>org.jboss.weld</groupId>
+         <artifactId>weld-core</artifactId>
+      </dependency>
+      
+      <dependency>
+         <groupId>org.jboss.weld</groupId>
+         <artifactId>weld-logging</artifactId>
+      </dependency>
+      
+      <dependency>
+         <groupId>javassist</groupId>
+         <artifactId>javassist</artifactId>
+      </dependency>
+      
+      <dependency>
+         <groupId>com.google.collections</groupId>
+         <artifactId>google-collections</artifactId>
+      </dependency>
+      
+      <dependency>
+         <groupId>javax.inject</groupId>
+         <artifactId>javax.inject</artifactId>
+      </dependency>
 
-     <dependency>
-       <groupId>org.jboss.weld</groupId>
-       <artifactId>weld-api</artifactId>
-     </dependency>
-
-     <dependency>
-       <groupId>org.jboss.weld</groupId>
-       <artifactId>weld-core</artifactId>
-     </dependency>
-
-     <dependency>
-       <groupId>org.jboss.weld</groupId>
-       <artifactId>weld-spi</artifactId>
-     </dependency>
-
-     <dependency>
-       <groupId>javax.enterprise</groupId>
-       <artifactId>cdi-api</artifactId>
-     </dependency>
-
-     <dependency>
-       <groupId>org.jboss.weld</groupId>
-       <artifactId>weld-logging</artifactId>
-     </dependency>
-
-     <dependency>
-       <groupId>javassist</groupId>
-       <artifactId>javassist</artifactId>
-     </dependency>
-
-     <dependency>
-       <groupId>com.google.collections</groupId>
-       <artifactId>google-collections</artifactId>
-     </dependency>
-
-     <dependency>
-       <groupId>javax.inject</groupId>
-       <artifactId>inject-api</artifactId>
-       <version>1.0.0-PRD</version>
-     </dependency>
-
-     <dependency>
-       <groupId>org.jboss.interceptor</groupId>
-       <artifactId>jboss-interceptor</artifactId>
-       <version>1.0.0-CR1</version>
-     </dependency>
-
-     <dependency>
-       <groupId>commons-logging</groupId>
-       <artifactId>commons-logging</artifactId>
-       <version>1.1.1</version>
-     </dependency>
-
    </dependencies>
+   
 </project>
 



More information about the weld-commits mailing list