You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pa...@apache.org on 2010/06/06 22:39:11 UTC

svn commit: r951954 - in /felix/trunk/gogo: command/pom.xml gogo-parent/ gogo-parent/pom.xml pom.xml runtime/pom.xml shell/pom.xml

Author: pauls
Date: Sun Jun  6 20:39:11 2010
New Revision: 951954

URL: http://svn.apache.org/viewvc?rev=951954&view=rev
Log:
Separate-out the parent pom so that we can release subprojects independently.

Added:
    felix/trunk/gogo/gogo-parent/
    felix/trunk/gogo/gogo-parent/pom.xml   (contents, props changed)
      - copied, changed from r951943, felix/trunk/gogo/pom.xml
Modified:
    felix/trunk/gogo/command/pom.xml
    felix/trunk/gogo/pom.xml
    felix/trunk/gogo/runtime/pom.xml
    felix/trunk/gogo/shell/pom.xml

Modified: felix/trunk/gogo/command/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/command/pom.xml?rev=951954&r1=951953&r2=951954&view=diff
==============================================================================
--- felix/trunk/gogo/command/pom.xml (original)
+++ felix/trunk/gogo/command/pom.xml Sun Jun  6 20:39:11 2010
@@ -23,6 +23,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>gogo-parent</artifactId>
     <version>0.5.0-SNAPSHOT</version>
+    <relativePath>../gogo-parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.apache.felix.gogo.command</artifactId>

Copied: felix/trunk/gogo/gogo-parent/pom.xml (from r951943, felix/trunk/gogo/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/gogo-parent/pom.xml?p2=felix/trunk/gogo/gogo-parent/pom.xml&p1=felix/trunk/gogo/pom.xml&r1=951943&r2=951954&rev=951954&view=diff
==============================================================================
--- felix/trunk/gogo/pom.xml (original)
+++ felix/trunk/gogo/gogo-parent/pom.xml Sun Jun  6 20:39:11 2010
@@ -31,12 +31,6 @@
     <artifactId>gogo-parent</artifactId>
     <version>0.5.0-SNAPSHOT</version>
 
-    <modules>
-        <module>runtime</module>
-        <module>shell</module>
-        <module>command</module>
-    </modules>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -78,65 +72,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <inherited>false</inherited>
-                        <configuration>
-                            <descriptorRefs>
-                                <descriptorRef>project</descriptorRef>
-                            </descriptorRefs>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>make-assembly</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <!-- we don't want to attach all the assemblies, such as bz2 -->
-                                    <attach>false</attach>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <!-- only attach the project and bin assemblies, in tar.gz and zip flavors -->
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <inherited>false</inherited>
-                        <executions>
-                            <execution>
-                                <id>attach-assemblies</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.artifactId}-${project.version}-project.tar.gz</file>
-                                            <classifier>project</classifier>
-                                            <type>tar.gz</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.artifactId}-${project.version}-project.zip</file>
-                                            <classifier>project</classifier>
-                                            <type>zip</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>

Propchange: felix/trunk/gogo/gogo-parent/pom.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: felix/trunk/gogo/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/pom.xml?rev=951954&r1=951953&r2=951954&view=diff
==============================================================================
--- felix/trunk/gogo/pom.xml (original)
+++ felix/trunk/gogo/pom.xml Sun Jun  6 20:39:11 2010
@@ -28,7 +28,7 @@
     <packaging>pom</packaging>
     <name>Apache Felix Gogo</name>
     <description>Apache Felix Gogo Subproject</description>
-    <artifactId>gogo-parent</artifactId>
+    <artifactId>gogo-reactor</artifactId>
     <version>0.5.0-SNAPSHOT</version>
 
     <modules>
@@ -37,106 +37,4 @@
         <module>command</module>
     </modules>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.5</version>
-                <scope>test</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <configuration>
-                        <autoVersionSubmodules>true</autoVersionSubmodules>
-                        <preparationGoals>clean verify install</preparationGoals>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <version>1.4.3</version>
-                    <extensions>true</extensions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <inherited>false</inherited>
-                        <configuration>
-                            <descriptorRefs>
-                                <descriptorRef>project</descriptorRef>
-                            </descriptorRefs>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>make-assembly</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <!-- we don't want to attach all the assemblies, such as bz2 -->
-                                    <attach>false</attach>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <!-- only attach the project and bin assemblies, in tar.gz and zip flavors -->
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <inherited>false</inherited>
-                        <executions>
-                            <execution>
-                                <id>attach-assemblies</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.artifactId}-${project.version}-project.tar.gz</file>
-                                            <classifier>project</classifier>
-                                            <type>tar.gz</type>
-                                        </artifact>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.artifactId}-${project.version}-project.zip</file>
-                                            <classifier>project</classifier>
-                                            <type>zip</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>

Modified: felix/trunk/gogo/runtime/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/pom.xml?rev=951954&r1=951953&r2=951954&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/pom.xml (original)
+++ felix/trunk/gogo/runtime/pom.xml Sun Jun  6 20:39:11 2010
@@ -21,6 +21,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>gogo-parent</artifactId>
         <version>0.5.0-SNAPSHOT</version>
+        <relativePath>../gogo-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>bundle</packaging>

Modified: felix/trunk/gogo/shell/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/shell/pom.xml?rev=951954&r1=951953&r2=951954&view=diff
==============================================================================
--- felix/trunk/gogo/shell/pom.xml (original)
+++ felix/trunk/gogo/shell/pom.xml Sun Jun  6 20:39:11 2010
@@ -21,6 +21,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>gogo-parent</artifactId>
         <version>0.5.0-SNAPSHOT</version>
+        <relativePath>../gogo-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>bundle</packaging>