geronimo-xbean-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r514627 - in /geronimo/xbean/trunk: ./ maven-xbean-plugin/ xbean-classloader/ xbean-classpath/ xbean-finder/ xbean-kernel/ xbean-naming/ xbean-osgi/ xbean-reflect/ xbean-server/ xbean-spring-common/ xbean-spring-itests/ xbean-spring-v1/ xbe...
Date Mon, 05 Mar 2007 09:47:24 GMT
Author: gnodet
Date: Mon Mar  5 01:47:21 2007
New Revision: 514627

URL: http://svn.apache.org/viewvc?view=rev&rev=514627
Log:
XBEAN-78: Drop spring 1.x support and upgrade version to 3.0

Added:
    geronimo/xbean/trunk/xbean-spring/src/main/
      - copied from r512868, geronimo/xbean/trunk/xbean-spring-common/src/main/
    geronimo/xbean/trunk/xbean-spring/src/main/java/
      - copied from r514626, geronimo/xbean/trunk/xbean-spring-common/src/main/java/
    geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/context/v2/
      - copied from r512868, geronimo/xbean/trunk/xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/
    geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/context/v2/XBeanBeanDefinitionDocumentReader.java
      - copied unchanged from r514626, geronimo/xbean/trunk/xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/XBeanBeanDefinitionDocumentReader.java
    geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/context/v2/XBeanNamespaceHandler.java
      - copied unchanged from r514626, geronimo/xbean/trunk/xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/XBeanNamespaceHandler.java
    geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/context/v2/XBeanNamespaceHandlerResolver.java
      - copied unchanged from r514626, geronimo/xbean/trunk/xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/XBeanNamespaceHandlerResolver.java
    geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/context/v2/XBeanV2Helper.java
      - copied unchanged from r514626, geronimo/xbean/trunk/xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/XBeanV2Helper.java
    geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/context/v2/XBeanXmlBeanDefinitionReader.java
      - copied unchanged from r514626, geronimo/xbean/trunk/xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/XBeanXmlBeanDefinitionReader.java
    geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/context/v2/XBeanXmlBeanFactory.java
      - copied unchanged from r514626, geronimo/xbean/trunk/xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/XBeanXmlBeanFactory.java
    geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/context/v2c/
      - copied from r512868, geronimo/xbean/trunk/xbean-spring-v2c/src/main/java/org/apache/xbean/spring/context/v2c/
    geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/context/v2c/XBeanBeanDefinitionParserDelegate.java
      - copied unchanged from r514626, geronimo/xbean/trunk/xbean-spring-v2c/src/main/java/org/apache/xbean/spring/context/v2c/XBeanBeanDefinitionParserDelegate.java
    geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/context/v2c/XBeanNamespaceHandler.java
      - copied unchanged from r514626, geronimo/xbean/trunk/xbean-spring-v2c/src/main/java/org/apache/xbean/spring/context/v2c/XBeanNamespaceHandler.java
    geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/context/v2c/XBeanQNameHelper.java
      - copied unchanged from r514626, geronimo/xbean/trunk/xbean-spring-v2c/src/main/java/org/apache/xbean/spring/context/v2c/XBeanQNameHelper.java
    geronimo/xbean/trunk/xbean-spring/src/main/resources/
      - copied from r514626, geronimo/xbean/trunk/xbean-spring-common/src/main/resources/
    geronimo/xbean/trunk/xbean-spring/src/test/
      - copied from r512868, geronimo/xbean/trunk/xbean-spring-v2c/src/test/
    geronimo/xbean/trunk/xbean-spring/src/test/java/
      - copied from r514626, geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/
    geronimo/xbean/trunk/xbean-spring/src/test/resources/
      - copied from r514626, geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/
Removed:
    geronimo/xbean/trunk/xbean-spring-common/
    geronimo/xbean/trunk/xbean-spring-itests/
    geronimo/xbean/trunk/xbean-spring-v1/
    geronimo/xbean/trunk/xbean-spring-v2/
    geronimo/xbean/trunk/xbean-spring-v2a/
    geronimo/xbean/trunk/xbean-spring-v2b/
Modified:
    geronimo/xbean/trunk/maven-xbean-plugin/pom.xml
    geronimo/xbean/trunk/pom.xml
    geronimo/xbean/trunk/xbean-classloader/pom.xml
    geronimo/xbean/trunk/xbean-classpath/pom.xml
    geronimo/xbean/trunk/xbean-finder/pom.xml
    geronimo/xbean/trunk/xbean-kernel/pom.xml
    geronimo/xbean/trunk/xbean-naming/pom.xml
    geronimo/xbean/trunk/xbean-osgi/pom.xml
    geronimo/xbean/trunk/xbean-reflect/pom.xml
    geronimo/xbean/trunk/xbean-server/pom.xml
    geronimo/xbean/trunk/xbean-spring/pom.xml
    geronimo/xbean/trunk/xbean-telnet/pom.xml
    geronimo/xbean/trunk/xbean-tiger/pom.xml

Modified: geronimo/xbean/trunk/maven-xbean-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/maven-xbean-plugin/pom.xml?view=diff&rev=514627&r1=514626&r2=514627
==============================================================================
--- geronimo/xbean/trunk/maven-xbean-plugin/pom.xml (original)
+++ geronimo/xbean/trunk/maven-xbean-plugin/pom.xml Mon Mar  5 01:47:21 2007
@@ -26,11 +26,11 @@
     <parent>
         <artifactId>xbean</artifactId>
         <groupId>org.apache.xbean</groupId>
-        <version>2.9-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>maven-xbean-plugin</artifactId>
-    <name>Maven XBean Plugin</name>
+    <name>XBean :: Maven Plugin</name>
     <packaging>maven-plugin</packaging>
     
     <dependencies>
@@ -100,4 +100,4 @@
         </plugins>
     </reporting>
     
-</project>
\ No newline at end of file
+</project>

Modified: geronimo/xbean/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/pom.xml?view=diff&rev=514627&r1=514626&r2=514627
==============================================================================
--- geronimo/xbean/trunk/pom.xml (original)
+++ geronimo/xbean/trunk/pom.xml Mon Mar  5 01:47:21 2007
@@ -36,7 +36,7 @@
     <packaging>pom</packaging>
     <inceptionYear>2005</inceptionYear>
     
-    <version>2.9-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
     
     <description>
         XBean is a plugin based server architecture.
@@ -201,7 +201,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring</artifactId>
-                <version>1.2.4</version>
+                <version>2.0.1</version>
             </dependency>
             
             <dependency>
@@ -350,14 +350,7 @@
         <module>xbean-osgi</module>
         <module>xbean-reflect</module>
         <module>xbean-server</module>
-        <module>xbean-spring-common</module>
-        <module>xbean-spring-v1</module>
-        <module>xbean-spring-v2</module>
-        <module>xbean-spring-v2a</module>
-        <module>xbean-spring-v2b</module>
-        <module>xbean-spring-v2c</module>
         <module>xbean-spring</module>
-        <module>xbean-spring-itests</module>
         <module>xbean-telnet</module>
         <module>xbean-tiger</module>
         <module>maven-xbean-plugin</module>

Modified: geronimo/xbean/trunk/xbean-classloader/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-classloader/pom.xml?view=diff&rev=514627&r1=514626&r2=514627
==============================================================================
--- geronimo/xbean/trunk/xbean-classloader/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-classloader/pom.xml Mon Mar  5 01:47:21 2007
@@ -27,12 +27,12 @@
     <parent>
         <artifactId>xbean</artifactId>
         <groupId>org.apache.xbean</groupId>
-        <version>2.9-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>xbean-classloader</artifactId>
     <name>XBean :: Classloader</name>
-    <version>2.9-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
 
     <build>
         <plugins>

Modified: geronimo/xbean/trunk/xbean-classpath/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-classpath/pom.xml?view=diff&rev=514627&r1=514626&r2=514627
==============================================================================
--- geronimo/xbean/trunk/xbean-classpath/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-classpath/pom.xml Mon Mar  5 01:47:21 2007
@@ -26,7 +26,7 @@
     <parent>
         <artifactId>xbean</artifactId>
         <groupId>org.apache.xbean</groupId>
-        <version>2.9-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>xbean-classpath</artifactId>

Modified: geronimo/xbean/trunk/xbean-finder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/pom.xml?view=diff&rev=514627&r1=514626&r2=514627
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-finder/pom.xml Mon Mar  5 01:47:21 2007
@@ -26,7 +26,7 @@
     <parent>
         <artifactId>xbean</artifactId>
         <groupId>org.apache.xbean</groupId>
-        <version>2.9-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>xbean-finder</artifactId>

Modified: geronimo/xbean/trunk/xbean-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-kernel/pom.xml?view=diff&rev=514627&r1=514626&r2=514627
==============================================================================
--- geronimo/xbean/trunk/xbean-kernel/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-kernel/pom.xml Mon Mar  5 01:47:21 2007
@@ -26,7 +26,7 @@
     <parent>
         <artifactId>xbean</artifactId>
         <groupId>org.apache.xbean</groupId>
-        <version>2.9-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>xbean-kernel</artifactId>

Modified: geronimo/xbean/trunk/xbean-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-naming/pom.xml?view=diff&rev=514627&r1=514626&r2=514627
==============================================================================
--- geronimo/xbean/trunk/xbean-naming/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-naming/pom.xml Mon Mar  5 01:47:21 2007
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>xbean</artifactId>
     <groupId>org.apache.xbean</groupId>
-    <version>2.9-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xbean-naming</artifactId>

Modified: geronimo/xbean/trunk/xbean-osgi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-osgi/pom.xml?view=diff&rev=514627&r1=514626&r2=514627
==============================================================================
--- geronimo/xbean/trunk/xbean-osgi/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-osgi/pom.xml Mon Mar  5 01:47:21 2007
@@ -27,7 +27,7 @@
     <parent>
         <artifactId>xbean</artifactId>
         <groupId>org.apache.xbean</groupId>
-        <version>2.9-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>xbean-osgi</artifactId>

Modified: geronimo/xbean/trunk/xbean-reflect/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-reflect/pom.xml?view=diff&rev=514627&r1=514626&r2=514627
==============================================================================
--- geronimo/xbean/trunk/xbean-reflect/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-reflect/pom.xml Mon Mar  5 01:47:21 2007
@@ -26,7 +26,7 @@
     <parent>
         <artifactId>xbean</artifactId>
         <groupId>org.apache.xbean</groupId>
-        <version>2.9-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>xbean-reflect</artifactId>

Modified: geronimo/xbean/trunk/xbean-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-server/pom.xml?view=diff&rev=514627&r1=514626&r2=514627
==============================================================================
--- geronimo/xbean/trunk/xbean-server/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-server/pom.xml Mon Mar  5 01:47:21 2007
@@ -27,7 +27,7 @@
     <parent>
         <artifactId>xbean</artifactId>
         <groupId>org.apache.xbean</groupId>
-        <version>2.9-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>xbean-server</artifactId>
@@ -79,6 +79,14 @@
                 <configuration>
                     <source>1.4</source>
                     <target>1.4</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                  <excludes>
+                    <exclude>**/DeployerTest.java</exclude>
+                  </excludes>
                 </configuration>
             </plugin>
             <plugin>

Modified: geronimo/xbean/trunk/xbean-spring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring/pom.xml?view=diff&rev=514627&r1=514626&r2=514627
==============================================================================
--- geronimo/xbean/trunk/xbean-spring/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-spring/pom.xml Mon Mar  5 01:47:21 2007
@@ -26,7 +26,7 @@
     <parent>
         <artifactId>xbean</artifactId>
         <groupId>org.apache.xbean</groupId>
-        <version>2.9-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>xbean-spring</artifactId>
@@ -35,226 +35,81 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-spring-common</artifactId>
-            <version>${pom.version}</version>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-spring-v1</artifactId>
-            <version>${pom.version}</version>
-            <optional>true</optional>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-spring-v2</artifactId>
-            <version>${pom.version}</version>
-            <optional>true</optional>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-spring-v2a</artifactId>
-            <version>${pom.version}</version>
+            <groupId>qdox</groupId>
+            <artifactId>qdox</artifactId>
             <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-spring-v2b</artifactId>
-            <version>${pom.version}</version>
+            <groupId>ant</groupId>
+            <artifactId>ant</artifactId>
             <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-spring-v2c</artifactId>
-            <version>${pom.version}</version>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring</artifactId>
-        </dependency>
-
     </dependencies>
     
     <build>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+            </testResource>
+            <testResource>
+                <directory>target/test-generated</directory>
+            </testResource>
+        </testResources>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>dependency-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>copy-components</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>target/classes</outputDirectory>
-                            <unpackMarkersDirectory>target/classes-marker</unpackMarkersDirectory>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.xbean</groupId>
-                                    <artifactId>xbean-spring-common</artifactId>
-                                    <version>${pom.version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.xbean</groupId>
-                                    <artifactId>xbean-spring-v1</artifactId>
-                                    <version>${pom.version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.xbean</groupId>
-                                    <artifactId>xbean-spring-v2</artifactId>
-                                    <version>${pom.version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.xbean</groupId>
-                                    <artifactId>xbean-spring-v2a</artifactId>
-                                    <version>${pom.version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.xbean</groupId>
-                                    <artifactId>xbean-spring-v2b</artifactId>
-                                    <version>${pom.version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.xbean</groupId>
-                                    <artifactId>xbean-spring-v2c</artifactId>
-                                    <version>${pom.version}</version>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>get-sources</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>target/sources</outputDirectory>
-                            <unpackMarkersDirectory>target/sources-marker</unpackMarkersDirectory>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.xbean</groupId>
-                                    <artifactId>xbean-spring-common</artifactId>
-                                    <version>${pom.version}</version>
-                                    <classifier>sources</classifier>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.xbean</groupId>
-                                    <artifactId>xbean-spring-v1</artifactId>
-                                    <version>${pom.version}</version>
-                                    <classifier>sources</classifier>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.xbean</groupId>
-                                    <artifactId>xbean-spring-v2</artifactId>
-                                    <version>${pom.version}</version>
-                                    <classifier>sources</classifier>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.xbean</groupId>
-                                    <artifactId>xbean-spring-v2a</artifactId>
-                                    <version>${pom.version}</version>
-                                    <classifier>sources</classifier>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.xbean</groupId>
-                                    <artifactId>xbean-spring-v2b</artifactId>
-                                    <version>${pom.version}</version>
-                                    <classifier>sources</classifier>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.xbean</groupId>
-                                    <artifactId>xbean-spring-v2c</artifactId>
-                                    <version>${pom.version}</version>
-                                    <classifier>sources</classifier>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/BeerUsingXBeanNSTest.java</exclude>
+                    </excludes>
+                </configuration>
             </plugin>
-            
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
                 <executions>
-                    <!--
-                    HACK: Need to copy classes for clover, since it deployes a -clover artifact
-                          and uses that for a dependency when other modules run (lame).
-                    -->
                     <execution>
-                        <id>copy-classes-for-clover</id>
                         <phase>process-classes</phase>
                         <goals>
                             <goal>run</goal>
                         </goals>
                         <configuration>
                             <tasks>
-                                <mkdir dir="${pom.basedir}/target/clover/classes" />
-                                <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${pom.basedir}/target/classes">
-                                        <include name="**" />
-                                    </fileset>
+                                <taskdef classname="org.apache.xbean.spring.generator.MappingGeneratorTask"
name="mapping">
+                                    <classpath>
+                                        <pathelement path="${basedir}/target/classes"
/>
+                                        <pathelement path="${basedir}/target/test-classes"
/>
+                                        <path refid="maven.runtime.classpath" />
+                                    </classpath>
+                                </taskdef>
+                                <mapping namespace="http://xbean.apache.org/schemas/pizza"
srcdir="src/test/java" destFile="target/restaurant.xsd" metaInfDir="${basedir}/target/test-generated/"
/>
+                                <copy todir="${basedir}/target/test-classes">
+                                    <fileset dir="${basedir}/target/test-generated" />
                                 </copy>
                             </tasks>
                         </configuration>
                     </execution>
-
-                    <execution>
-                        <id>generate-source-jar</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <jar destfile="${pom.basedir}/target/${pom.artifactId}-${pom.version}-sources.jar"
basedir="${pom.basedir}/target/sources" />
-                            </tasks>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
-            
-            <plugin>
-              <groupId>org.codehaus.mojo</groupId>
-              <artifactId>build-helper-maven-plugin</artifactId>
-              <executions>
-                <execution>
-                  <id>attach-artifacts</id>
-                  <phase>package</phase>
-                  <goals>
-                    <goal>attach-artifact</goal>
-                  </goals>
-                  <configuration>
-                    <artifacts>
-                      <artifact>
-                        <file>${pom.basedir}/target/${pom.artifactId}-${pom.version}-sources.jar</file>
-                        <type>jar</type>
-                        <classifier>sources</classifier>
-                      </artifact>
-                    </artifacts>
-                  </configuration>
-                </execution>
-              </executions>
-            </plugin>
         </plugins>
     </build>
-
-</project>
\ No newline at end of file
+    
+</project>

Modified: geronimo/xbean/trunk/xbean-telnet/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-telnet/pom.xml?view=diff&rev=514627&r1=514626&r2=514627
==============================================================================
--- geronimo/xbean/trunk/xbean-telnet/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-telnet/pom.xml Mon Mar  5 01:47:21 2007
@@ -26,7 +26,7 @@
     <parent>
         <artifactId>xbean</artifactId>
         <groupId>org.apache.xbean</groupId>
-        <version>2.9-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>xbean-telnet</artifactId>

Modified: geronimo/xbean/trunk/xbean-tiger/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-tiger/pom.xml?view=diff&rev=514627&r1=514626&r2=514627
==============================================================================
--- geronimo/xbean/trunk/xbean-tiger/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-tiger/pom.xml Mon Mar  5 01:47:21 2007
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>xbean</artifactId>
         <groupId>org.apache.xbean</groupId>
-        <version>2.9-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>xbean-tiger</artifactId>



Mime
View raw message