You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/04/29 19:09:59 UTC

svn commit: r939381 - in /geronimo/bundles/trunk: aspectjrt/ aspectjweaver/ axis/ backport-util-concurrent/ castor/ commons-digester/ commons-discovery/ derby-all/ dwr/ httpcore/ jaxb-impl/ jstl/ scannotation/ sxc-jaxb/ sxc-runtime/ wadi-aop/ wadi-core...

Author: gawor
Date: Thu Apr 29 17:09:58 2010
New Revision: 939381

URL: http://svn.apache.org/viewvc?rev=939381&view=rev
Log:
1) remove bundleVersion property since it's unused and confusing. 2) add svn props to some files

Modified:
    geronimo/bundles/trunk/aspectjrt/pom.xml
    geronimo/bundles/trunk/aspectjweaver/pom.xml
    geronimo/bundles/trunk/axis/pom.xml
    geronimo/bundles/trunk/backport-util-concurrent/pom.xml
    geronimo/bundles/trunk/castor/pom.xml
    geronimo/bundles/trunk/commons-digester/pom.xml
    geronimo/bundles/trunk/commons-discovery/pom.xml
    geronimo/bundles/trunk/derby-all/pom.xml
    geronimo/bundles/trunk/dwr/pom.xml
    geronimo/bundles/trunk/httpcore/pom.xml
    geronimo/bundles/trunk/jaxb-impl/pom.xml
    geronimo/bundles/trunk/jstl/pom.xml
    geronimo/bundles/trunk/scannotation/pom.xml   (contents, props changed)
    geronimo/bundles/trunk/sxc-jaxb/pom.xml   (contents, props changed)
    geronimo/bundles/trunk/sxc-runtime/pom.xml   (contents, props changed)
    geronimo/bundles/trunk/wadi-aop/pom.xml
    geronimo/bundles/trunk/wadi-core/pom.xml
    geronimo/bundles/trunk/wadi-group/pom.xml
    geronimo/bundles/trunk/wadi-tribes/pom.xml
    geronimo/bundles/trunk/woden-impl-dom/pom.xml
    geronimo/bundles/trunk/woodstox/pom.xml

Modified: geronimo/bundles/trunk/aspectjrt/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/aspectjrt/pom.xml?rev=939381&r1=939380&r2=939381&view=diff
==============================================================================
--- geronimo/bundles/trunk/aspectjrt/pom.xml (original)
+++ geronimo/bundles/trunk/aspectjrt/pom.xml Thu Apr 29 17:09:58 2010
@@ -39,7 +39,6 @@
         <pkgGroupId>org.aspectj</pkgGroupId>
         <pkgArtifactId>aspectjrt</pkgArtifactId>
         <pkgVersion>1.6.2</pkgVersion>
-        <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
 
     <scm>

Modified: geronimo/bundles/trunk/aspectjweaver/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/aspectjweaver/pom.xml?rev=939381&r1=939380&r2=939381&view=diff
==============================================================================
--- geronimo/bundles/trunk/aspectjweaver/pom.xml (original)
+++ geronimo/bundles/trunk/aspectjweaver/pom.xml Thu Apr 29 17:09:58 2010
@@ -39,7 +39,6 @@
         <pkgGroupId>org.aspectj</pkgGroupId>
         <pkgArtifactId>aspectjweaver</pkgArtifactId>
         <pkgVersion>1.6.2</pkgVersion>
-        <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
 
     <scm>

Modified: geronimo/bundles/trunk/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/axis/pom.xml?rev=939381&r1=939380&r2=939381&view=diff
==============================================================================
--- geronimo/bundles/trunk/axis/pom.xml (original)
+++ geronimo/bundles/trunk/axis/pom.xml Thu Apr 29 17:09:58 2010
@@ -45,8 +45,8 @@
         <pkgGroupId>org.apache.axis</pkgGroupId>
         <pkgArtifactId>axis</pkgArtifactId>
         <pkgVersion>1.4</pkgVersion>
-        <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>

Modified: geronimo/bundles/trunk/backport-util-concurrent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/backport-util-concurrent/pom.xml?rev=939381&r1=939380&r2=939381&view=diff
==============================================================================
--- geronimo/bundles/trunk/backport-util-concurrent/pom.xml (original)
+++ geronimo/bundles/trunk/backport-util-concurrent/pom.xml Thu Apr 29 17:09:58 2010
@@ -39,7 +39,6 @@
         <pkgGroupId>backport-util-concurrent</pkgGroupId>
         <pkgArtifactId>backport-util-concurrent</pkgArtifactId>
         <pkgVersion>2.2</pkgVersion>
-        <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
 
     <scm>

Modified: geronimo/bundles/trunk/castor/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/castor/pom.xml?rev=939381&r1=939380&r2=939381&view=diff
==============================================================================
--- geronimo/bundles/trunk/castor/pom.xml (original)
+++ geronimo/bundles/trunk/castor/pom.xml Thu Apr 29 17:09:58 2010
@@ -39,7 +39,6 @@
         <pkgGroupId>org.codehaus.castor</pkgGroupId>
         <pkgArtifactId>castor</pkgArtifactId>
         <pkgVersion>1.0.5</pkgVersion>
-        <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
 
     <scm>

Modified: geronimo/bundles/trunk/commons-digester/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/commons-digester/pom.xml?rev=939381&r1=939380&r2=939381&view=diff
==============================================================================
--- geronimo/bundles/trunk/commons-digester/pom.xml (original)
+++ geronimo/bundles/trunk/commons-digester/pom.xml Thu Apr 29 17:09:58 2010
@@ -45,8 +45,8 @@
         <pkgGroupId>commons-digester</pkgGroupId>
         <pkgArtifactId>commons-digester</pkgArtifactId>
         <pkgVersion>1.8</pkgVersion>
-        <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>

Modified: geronimo/bundles/trunk/commons-discovery/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/commons-discovery/pom.xml?rev=939381&r1=939380&r2=939381&view=diff
==============================================================================
--- geronimo/bundles/trunk/commons-discovery/pom.xml (original)
+++ geronimo/bundles/trunk/commons-discovery/pom.xml Thu Apr 29 17:09:58 2010
@@ -39,7 +39,6 @@
         <pkgGroupId>commons-discovery</pkgGroupId>
         <pkgArtifactId>commons-discovery</pkgArtifactId>
         <pkgVersion>0.4</pkgVersion>
-        <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
 
     <scm>

Modified: geronimo/bundles/trunk/derby-all/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/derby-all/pom.xml?rev=939381&r1=939380&r2=939381&view=diff
==============================================================================
--- geronimo/bundles/trunk/derby-all/pom.xml (original)
+++ geronimo/bundles/trunk/derby-all/pom.xml Thu Apr 29 17:09:58 2010
@@ -28,17 +28,16 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>derby-all</artifactId>
-    <version>10.5.3.0_2_1-SNAPSHOT</version>
+    <version>10.5.3.0_1_2-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>Apache Geronimo Bundles: Derby-${pkgVersion}${bundleVersion}</name>
+    <name>Apache Geronimo Bundles: Derby-${pkgVersion}</name>
     <description>
-        This bundle simply wraps Derby
+        This bundle simply wraps Derby-${pkgVersion}.jar.
     </description>
 
     <properties>
         <pkgGroupId>org.apache.derby</pkgGroupId>
         <pkgVersion>10.5.3.0_1</pkgVersion>
-        <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
 
     <scm>

Modified: geronimo/bundles/trunk/dwr/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/dwr/pom.xml?rev=939381&r1=939380&r2=939381&view=diff
==============================================================================
--- geronimo/bundles/trunk/dwr/pom.xml (original)
+++ geronimo/bundles/trunk/dwr/pom.xml Thu Apr 29 17:09:58 2010
@@ -45,8 +45,8 @@
         <pkgGroupId>org.directwebremoting</pkgGroupId>
         <pkgArtifactId>dwr</pkgArtifactId>
         <pkgVersion>3.0.M1</pkgVersion>
-        <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>

Modified: geronimo/bundles/trunk/httpcore/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/httpcore/pom.xml?rev=939381&r1=939380&r2=939381&view=diff
==============================================================================
--- geronimo/bundles/trunk/httpcore/pom.xml (original)
+++ geronimo/bundles/trunk/httpcore/pom.xml Thu Apr 29 17:09:58 2010
@@ -45,7 +45,6 @@
         <pkgGroupId>org.apache.httpcomponents</pkgGroupId>
         <pkgArtifactId>httpcore</pkgArtifactId>
         <pkgVersion>4.0.1</pkgVersion>
-        <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
 
     <dependencies>

Modified: geronimo/bundles/trunk/jaxb-impl/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/jaxb-impl/pom.xml?rev=939381&r1=939380&r2=939381&view=diff
==============================================================================
--- geronimo/bundles/trunk/jaxb-impl/pom.xml (original)
+++ geronimo/bundles/trunk/jaxb-impl/pom.xml Thu Apr 29 17:09:58 2010
@@ -45,7 +45,6 @@
         <pkgGroupId>com.sun.xml.bind</pkgGroupId>
         <pkgArtifactId>jaxb-impl</pkgArtifactId>
         <pkgVersion>2.2</pkgVersion>
-        <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
 
     <dependencies>

Modified: geronimo/bundles/trunk/jstl/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/jstl/pom.xml?rev=939381&r1=939380&r2=939381&view=diff
==============================================================================
--- geronimo/bundles/trunk/jstl/pom.xml (original)
+++ geronimo/bundles/trunk/jstl/pom.xml Thu Apr 29 17:09:58 2010
@@ -45,8 +45,8 @@
         <pkgGroupId>javax.servlet</pkgGroupId>
         <pkgArtifactId>jstl</pkgArtifactId>
         <pkgVersion>1.2</pkgVersion>
-        <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>

Modified: geronimo/bundles/trunk/scannotation/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/scannotation/pom.xml?rev=939381&r1=939380&r2=939381&view=diff
==============================================================================
--- geronimo/bundles/trunk/scannotation/pom.xml (original)
+++ geronimo/bundles/trunk/scannotation/pom.xml Thu Apr 29 17:09:58 2010
@@ -45,7 +45,6 @@
         <pkgGroupId>net.sf.scannotation</pkgGroupId>
         <pkgArtifactId>scannotation</pkgArtifactId>
         <pkgVersion>1.0.2</pkgVersion>
-        <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
 
 

Propchange: geronimo/bundles/trunk/scannotation/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/bundles/trunk/scannotation/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/bundles/trunk/sxc-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/sxc-jaxb/pom.xml?rev=939381&r1=939380&r2=939381&view=diff
==============================================================================
--- geronimo/bundles/trunk/sxc-jaxb/pom.xml (original)
+++ geronimo/bundles/trunk/sxc-jaxb/pom.xml Thu Apr 29 17:09:58 2010
@@ -1,103 +1,102 @@
-<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">
-
-    <!--
-
-        Licensed to the Apache Software Foundation (ASF) under one or more
-        contributor license agreements.  See the NOTICE file distributed with
-        this work for additional information regarding copyright ownership.
-        The ASF licenses this file to You 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.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>bundles-parent</artifactId>
-        <version>1.0</version>
-    </parent>
-
-    <groupId>org.apache.geronimo.bundles</groupId>
-    <artifactId>sxc-jaxb</artifactId>
-    <version>0.7.2_2-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-    <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
-    <description>
-        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
-    </description>
-
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/sxc-jaxb</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/sxc-jaxb</developerConnection>
-        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/sxc-jaxb</url>
-    </scm>
-
-    <properties>
-        <pkgGroupId>com.envoisolutions.sxc</pkgGroupId>
-        <pkgArtifactId>sxc-jaxb</pkgArtifactId>
-        <pkgVersion>0.7.2</pkgVersion>
-        <bundleVersion>_1-SNAPSHOT</bundleVersion>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>${pkgArtifactId}</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
-            <version>1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
-            <version>1.0</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.2_spec</artifactId>
-            <version>1.0</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <optional>true</optional>
-            <version>2.2_2-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Export-Package>com.envoisolutions.sxc*;version="0.7.2"</Export-Package>
-                        <Import-Package>
-                            com.envoisolutions.sxc.builder*;resolution:=optional,
-                            com.envoisolutions.sxc.compiler*;resolution:=optional,
-                            com.sun.codemodel*;resolution:=optional,
-                            sun.misc*;resolution:=optional,
-                            *
-                        </Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<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">
+
+    <!--
+
+        Licensed to the Apache Software Foundation (ASF) under one or more
+        contributor license agreements.  See the NOTICE file distributed with
+        this work for additional information regarding copyright ownership.
+        The ASF licenses this file to You 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.
+    -->
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>bundles-parent</artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.bundles</groupId>
+    <artifactId>sxc-jaxb</artifactId>
+    <version>0.7.2_2-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+    <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <description>
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+    </description>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/sxc-jaxb</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/sxc-jaxb</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/sxc-jaxb</url>
+    </scm>
+
+    <properties>
+        <pkgGroupId>com.envoisolutions.sxc</pkgGroupId>
+        <pkgArtifactId>sxc-jaxb</pkgArtifactId>
+        <pkgVersion>0.7.2</pkgVersion>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.1_spec</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
+            <version>1.0</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.2_spec</artifactId>
+            <version>1.0</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <optional>true</optional>
+            <version>2.2_2-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>com.envoisolutions.sxc*;version="0.7.2"</Export-Package>
+                        <Import-Package>
+                            com.envoisolutions.sxc.builder*;resolution:=optional,
+                            com.envoisolutions.sxc.compiler*;resolution:=optional,
+                            com.sun.codemodel*;resolution:=optional,
+                            sun.misc*;resolution:=optional,
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/bundles/trunk/sxc-jaxb/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/bundles/trunk/sxc-jaxb/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/bundles/trunk/sxc-jaxb/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/bundles/trunk/sxc-runtime/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/sxc-runtime/pom.xml?rev=939381&r1=939380&r2=939381&view=diff
==============================================================================
--- geronimo/bundles/trunk/sxc-runtime/pom.xml (original)
+++ geronimo/bundles/trunk/sxc-runtime/pom.xml Thu Apr 29 17:09:58 2010
@@ -1,116 +1,116 @@
-<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">
-
-    <!--
-
-        Licensed to the Apache Software Foundation (ASF) under one or more
-        contributor license agreements.  See the NOTICE file distributed with
-        this work for additional information regarding copyright ownership.
-        The ASF licenses this file to You 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.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>bundles-parent</artifactId>
-        <version>1.0</version>
-    </parent>
-
-    <groupId>org.apache.geronimo.bundles</groupId>
-    <artifactId>sxc-runtime</artifactId>
-    <version>0.7.2_2-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-    <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
-    <description>
-        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
-    </description>
-
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/sxc-runtime</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/sxc-runtime</developerConnection>
-        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/sxc-runtime</url>
-    </scm>
-
-    <properties>
-        <pkgGroupId>com.envoisolutions.sxc</pkgGroupId>
-        <pkgArtifactId>sxc-runtime</pkgArtifactId>
-        <pkgVersion>0.7.2</pkgVersion>
-        <bundleVersion>_1-SNAPSHOT</bundleVersion>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>${pkgArtifactId}</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <!--<plugin>-->
-            <!--<groupId>org.apache.maven.plugins</groupId>-->
-            <!--<artifactId>maven-dependency-plugin</artifactId>-->
-            <!--<executions>-->
-            <!--<execution>-->
-            <!--<id>unpack-dependencies</id>-->
-            <!--<phase>package</phase>-->
-            <!--<goals>-->
-            <!--<goal>unpack-dependencies</goal>-->
-            <!--</goals>-->
-            <!--<configuration>-->
-            <!--<includes>**/*</includes>-->
-            <!--<excludes>**/*.properties</excludes>-->
-            <!--<outputDirectory>${project.build.directory}/classes</outputDirectory>-->
-            <!--<overWriteReleases>false</overWriteReleases>-->
-            <!--<overWriteSnapshots>true</overWriteSnapshots>-->
-            <!--</configuration>-->
-            <!--</execution>-->
-            <!--</executions>-->
-            <!--</plugin>-->
-            <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-shade-plugin</artifactId>-->
-                <!--<executions>-->
-                    <!--<execution>-->
-                        <!--<phase>package</phase>-->
-                        <!--<goals>-->
-                            <!--<goal>shade</goal>-->
-                        <!--</goals>-->
-                        <!--<configuration>-->
-                            <!--<artifactSet>-->
-                                <!--<includes>-->
-                                    <!--<include>${pkgGroupId}:${pkgArtifactId}</include>-->
-                                    <!--<include>${pkgGroupId}:slf4j-log4j12</include>-->
-                                <!--</includes>-->
-                            <!--</artifactSet>-->
-                            <!--<promoteTransitiveDependencies>true</promoteTransitiveDependencies>-->
-                            <!--<createDependencyReducedPom>true</createDependencyReducedPom>-->
-                        <!--</configuration>-->
-                    <!--</execution>-->
-                <!--</executions>-->
-            <!--</plugin>-->
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <!--<version>2.0.1-SNAPSHOT</version>-->
-                <configuration>
-                    <instructions>
-                        <Export-Package>com.envoisolutions.sxc.util*;version="0.7.2"</Export-Package>
-                        <!--<Import-Package>com.sun.jdmk.comm;resolution:=optional,javax.jms;resolution:=optional,javax.mail.*;resolution:=optional,org.slf4j.helpers;resolution:=optional,*</Import-Package>-->
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<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">
+
+    <!--
+
+        Licensed to the Apache Software Foundation (ASF) under one or more
+        contributor license agreements.  See the NOTICE file distributed with
+        this work for additional information regarding copyright ownership.
+        The ASF licenses this file to You 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.
+    -->
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>bundles-parent</artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.bundles</groupId>
+    <artifactId>sxc-runtime</artifactId>
+    <version>0.7.2_2-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+    <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <description>
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+    </description>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/sxc-runtime</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/sxc-runtime</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/sxc-runtime</url>
+    </scm>
+
+    <properties>
+        <pkgGroupId>com.envoisolutions.sxc</pkgGroupId>
+        <pkgArtifactId>sxc-runtime</pkgArtifactId>
+        <pkgVersion>0.7.2</pkgVersion>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!--<plugin>-->
+            <!--<groupId>org.apache.maven.plugins</groupId>-->
+            <!--<artifactId>maven-dependency-plugin</artifactId>-->
+            <!--<executions>-->
+            <!--<execution>-->
+            <!--<id>unpack-dependencies</id>-->
+            <!--<phase>package</phase>-->
+            <!--<goals>-->
+            <!--<goal>unpack-dependencies</goal>-->
+            <!--</goals>-->
+            <!--<configuration>-->
+            <!--<includes>**/*</includes>-->
+            <!--<excludes>**/*.properties</excludes>-->
+            <!--<outputDirectory>${project.build.directory}/classes</outputDirectory>-->
+            <!--<overWriteReleases>false</overWriteReleases>-->
+            <!--<overWriteSnapshots>true</overWriteSnapshots>-->
+            <!--</configuration>-->
+            <!--</execution>-->
+            <!--</executions>-->
+            <!--</plugin>-->
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-shade-plugin</artifactId>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<phase>package</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>shade</goal>-->
+                        <!--</goals>-->
+                        <!--<configuration>-->
+                            <!--<artifactSet>-->
+                                <!--<includes>-->
+                                    <!--<include>${pkgGroupId}:${pkgArtifactId}</include>-->
+                                    <!--<include>${pkgGroupId}:slf4j-log4j12</include>-->
+                                <!--</includes>-->
+                            <!--</artifactSet>-->
+                            <!--<promoteTransitiveDependencies>true</promoteTransitiveDependencies>-->
+                            <!--<createDependencyReducedPom>true</createDependencyReducedPom>-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <!--<version>2.0.1-SNAPSHOT</version>-->
+                <configuration>
+                    <instructions>
+                        <Export-Package>com.envoisolutions.sxc.util*;version="0.7.2"</Export-Package>
+                        <!--<Import-Package>com.sun.jdmk.comm;resolution:=optional,javax.jms;resolution:=optional,javax.mail.*;resolution:=optional,org.slf4j.helpers;resolution:=optional,*</Import-Package>-->
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/bundles/trunk/sxc-runtime/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/bundles/trunk/sxc-runtime/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/bundles/trunk/sxc-runtime/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/bundles/trunk/wadi-aop/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/wadi-aop/pom.xml?rev=939381&r1=939380&r2=939381&view=diff
==============================================================================
--- geronimo/bundles/trunk/wadi-aop/pom.xml (original)
+++ geronimo/bundles/trunk/wadi-aop/pom.xml Thu Apr 29 17:09:58 2010
@@ -45,8 +45,8 @@
         <pkgGroupId>org.codehaus.wadi</pkgGroupId>
         <pkgArtifactId>wadi-aop</pkgArtifactId>
         <pkgVersion>2.1.2</pkgVersion>
-        <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.codehaus.wadi</groupId>

Modified: geronimo/bundles/trunk/wadi-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/wadi-core/pom.xml?rev=939381&r1=939380&r2=939381&view=diff
==============================================================================
--- geronimo/bundles/trunk/wadi-core/pom.xml (original)
+++ geronimo/bundles/trunk/wadi-core/pom.xml Thu Apr 29 17:09:58 2010
@@ -45,8 +45,8 @@
         <pkgGroupId>org.codehaus.wadi</pkgGroupId>
         <pkgArtifactId>wadi-core</pkgArtifactId>
         <pkgVersion>2.1.2</pkgVersion>
-        <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.codehaus.wadi</groupId>

Modified: geronimo/bundles/trunk/wadi-group/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/wadi-group/pom.xml?rev=939381&r1=939380&r2=939381&view=diff
==============================================================================
--- geronimo/bundles/trunk/wadi-group/pom.xml (original)
+++ geronimo/bundles/trunk/wadi-group/pom.xml Thu Apr 29 17:09:58 2010
@@ -45,8 +45,8 @@
         <pkgGroupId>org.codehaus.wadi</pkgGroupId>
         <pkgArtifactId>wadi-group</pkgArtifactId>
         <pkgVersion>2.1.2</pkgVersion>
-        <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.codehaus.wadi</groupId>

Modified: geronimo/bundles/trunk/wadi-tribes/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/wadi-tribes/pom.xml?rev=939381&r1=939380&r2=939381&view=diff
==============================================================================
--- geronimo/bundles/trunk/wadi-tribes/pom.xml (original)
+++ geronimo/bundles/trunk/wadi-tribes/pom.xml Thu Apr 29 17:09:58 2010
@@ -45,8 +45,8 @@
         <pkgGroupId>org.codehaus.wadi</pkgGroupId>
         <pkgArtifactId>wadi-tribes</pkgArtifactId>
         <pkgVersion>2.1.2</pkgVersion>
-        <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.codehaus.wadi</groupId>

Modified: geronimo/bundles/trunk/woden-impl-dom/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/woden-impl-dom/pom.xml?rev=939381&r1=939380&r2=939381&view=diff
==============================================================================
--- geronimo/bundles/trunk/woden-impl-dom/pom.xml (original)
+++ geronimo/bundles/trunk/woden-impl-dom/pom.xml Thu Apr 29 17:09:58 2010
@@ -45,7 +45,6 @@
         <pkgGroupId>org.apache.woden</pkgGroupId>
         <pkgArtifactId>woden-impl-dom</pkgArtifactId>
         <pkgVersion>1.0M8</pkgVersion>
-        <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
 
     <dependencies>

Modified: geronimo/bundles/trunk/woodstox/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/woodstox/pom.xml?rev=939381&r1=939380&r2=939381&view=diff
==============================================================================
--- geronimo/bundles/trunk/woodstox/pom.xml (original)
+++ geronimo/bundles/trunk/woodstox/pom.xml Thu Apr 29 17:09:58 2010
@@ -45,7 +45,6 @@
         <pkgGroupId>org.codehaus.woodstox</pkgGroupId>
         <pkgArtifactId>woodstox</pkgArtifactId>
         <pkgVersion>3.2.9</pkgVersion>
-        <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
 
     <dependencies>