You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2011/09/07 09:38:43 UTC

svn commit: r1166028 - in /openejb/trunk/javaee-api: pom.xml src/main/assembly/javaee-api-libs.xml

Author: dblevins
Date: Wed Sep  7 07:38:43 2011
New Revision: 1166028

URL: http://svn.apache.org/viewvc?rev=1166028&view=rev
Log:
Ensure the source jars are downloaded
Ensure the README.txt does not show up in the jars (only in the zip)
Add geronimo-osgi-locator to the jars

Modified:
    openejb/trunk/javaee-api/pom.xml
    openejb/trunk/javaee-api/src/main/assembly/javaee-api-libs.xml

Modified: openejb/trunk/javaee-api/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/javaee-api/pom.xml?rev=1166028&r1=1166027&r2=1166028&view=diff
==============================================================================
--- openejb/trunk/javaee-api/pom.xml (original)
+++ openejb/trunk/javaee-api/pom.xml Wed Sep  7 07:38:43 2011
@@ -28,7 +28,7 @@
   <artifactId>javaee-api</artifactId>
   <packaging>jar</packaging>
   <name>OpenEJB :: JavaEE Full API (zip and jar files)</name>
-  <version>6.0-2-SNAPSHOT</version>
+  <version>6.0-1-SNAPSHOT</version>
 
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/openejb/trunk/javaee-api</connection>
@@ -116,6 +116,12 @@
                     <exclude>META-INF/*.txt</exclude>
                   </excludes>
                 </filter>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/README.txt</exclude>
+                  </excludes>
+                </filter>
               </filters>
             </configuration>
           </execution>
@@ -161,6 +167,12 @@
                     <exclude>META-INF/*.txt</exclude>
                   </excludes>
                 </filter>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/README.txt</exclude>
+                  </excludes>
+                </filter>
               </filters>
             </configuration>
           </execution>
@@ -170,30 +182,34 @@
   </build>
 
   <dependencies>
+
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-el_2.2_spec</artifactId>
-      <version>1.0.2</version>
+      <artifactId>geronimo-activation_1.1_spec</artifactId>
+      <version>1.1</version>
+      <classifier>sources</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jsp_2.2_spec</artifactId>
-      <version>1.0</version>
+      <artifactId>geronimo-activation_1.1_spec</artifactId>
+      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_3.0_spec</artifactId>
-      <version>1.0</version>
+      <artifactId>geronimo-annotation_1.1_spec</artifactId>
+      <version>1.0.1</version>
+      <classifier>sources</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-activation_1.1_spec</artifactId>
-      <version>1.1</version>
+      <artifactId>geronimo-annotation_1.1_spec</artifactId>
+      <version>1.0.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.1_spec</artifactId>
-      <version>1.0.1</version>
+      <artifactId>geronimo-atinject_1.0_spec</artifactId>
+      <version>1.0</version>
+      <classifier>sources</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -204,16 +220,51 @@
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-ccpp_1.0_spec</artifactId>
       <version>1.0-beta</version>
+      <classifier>sources</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-ccpp_1.0_spec</artifactId>
+      <version>1.0-beta</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-ejb_3.1_spec</artifactId>
       <version>1.0.2</version>
+      <classifier>sources</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-ejb_3.1_spec</artifactId>
+      <version>1.0.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-el_2.2_spec</artifactId>
+      <version>1.0.2</version>
+      <classifier>sources</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-el_2.2_spec</artifactId>
+      <version>1.0.2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-interceptor_1.1_spec</artifactId>
       <version>1.0</version>
+      <classifier>sources</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
+      <version>1.0</version>
+      <classifier>sources</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -222,8 +273,31 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+      <version>1.1</version>
+      <classifier>sources</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
       <version>1.0.1</version>
+      <classifier>sources</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jacc_1.4_spec</artifactId>
+      <version>1.0</version>
+      <classifier>sources</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -234,16 +308,29 @@
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jaspic_1.0_spec</artifactId>
       <version>1.1</version>
+      <classifier>sources</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+      <artifactId>geronimo-jaspic_1.0_spec</artifactId>
       <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jaxb_2.2_spec</artifactId>
       <version>1.0.1</version>
+      <classifier>sources</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jaxb_2.2_spec</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+      <version>2.1</version>
+      <classifier>sources</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -254,6 +341,29 @@
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
       <version>2.1</version>
+      <classifier>sources</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+      <version>2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
+      <version>1.0</version>
+      <classifier>sources</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jaxws_2.2_spec</artifactId>
+      <version>1.1</version>
+      <classifier>sources</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -264,11 +374,29 @@
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jcdi_1.0_spec</artifactId>
       <version>1.0</version>
+      <classifier>sources</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jms_1.1_spec</artifactId>
       <version>1.1.1</version>
+      <classifier>sources</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jms_1.1_spec</artifactId>
+      <version>1.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jpa_2.0_spec</artifactId>
+      <version>1.1</version>
+      <classifier>sources</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -277,8 +405,31 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jsp_2.2_spec</artifactId>
+      <version>1.0</version>
+      <classifier>sources</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jsp_2.2_spec</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jta_1.1_spec</artifactId>
       <version>1.1.1</version>
+      <classifier>sources</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jta_1.1_spec</artifactId>
+      <version>1.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-saaj_1.3_spec</artifactId>
+      <version>1.1</version>
+      <classifier>sources</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -287,6 +438,23 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_3.0_spec</artifactId>
+      <version>1.0</version>
+      <classifier>sources</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_3.0_spec</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-stax-api_1.2_spec</artifactId>
+      <version>1.1</version>
+      <classifier>sources</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-stax-api_1.2_spec</artifactId>
       <version>1.1</version>
     </dependency>
@@ -294,16 +462,35 @@
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-validation_1.0_spec</artifactId>
       <version>1.1</version>
+      <classifier>sources</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-validation_1.0_spec</artifactId>
+      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
       <version>1.1.3</version>
+      <classifier>sources</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
+      <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+      <version>1.1.3</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-osgi-locator</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-osgi-locator</artifactId>
       <version>1.0</version>
+      <classifier>sources</classifier>
     </dependency>
 
   </dependencies>

Modified: openejb/trunk/javaee-api/src/main/assembly/javaee-api-libs.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/javaee-api/src/main/assembly/javaee-api-libs.xml?rev=1166028&r1=1166027&r2=1166028&view=diff
==============================================================================
--- openejb/trunk/javaee-api/src/main/assembly/javaee-api-libs.xml (original)
+++ openejb/trunk/javaee-api/src/main/assembly/javaee-api-libs.xml Wed Sep  7 07:38:43 2011
@@ -32,6 +32,7 @@
       <includes>
         <include>README.txt</include>
         <include>LICENSE</include>
+        <include>NOTICE</include>
       </includes>
     </fileSet>
   </fileSets>
@@ -40,6 +41,8 @@
       <outputDirectory>/</outputDirectory>
       <excludes>
         <exclude>org.apache.openejb:javaee-api</exclude>
+        <exclude>org.apache.geronimo.specs:geronimo-osgi-locator</exclude>
+        <exclude>*:*:sources</exclude>
         <exclude>junit:junit</exclude>
       </excludes>
     </dependencySet>