geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r767184 - in /geronimo/sandbox/blueprint: blueprint-api/pom.xml blueprint-bundle/pom.xml blueprint-core/pom.xml blueprint-itests/pom.xml blueprint-sample/pom.xml pom.xml
Date Tue, 21 Apr 2009 15:19:21 GMT
Author: gnodet
Date: Tue Apr 21 15:19:20 2009
New Revision: 767184

URL: http://svn.apache.org/viewvc?rev=767184&view=rev
Log:
Use dependency management, create source jars and javadocs under the 'deploy' profile

Modified:
    geronimo/sandbox/blueprint/blueprint-api/pom.xml
    geronimo/sandbox/blueprint/blueprint-bundle/pom.xml
    geronimo/sandbox/blueprint/blueprint-core/pom.xml
    geronimo/sandbox/blueprint/blueprint-itests/pom.xml
    geronimo/sandbox/blueprint/blueprint-sample/pom.xml
    geronimo/sandbox/blueprint/pom.xml

Modified: geronimo/sandbox/blueprint/blueprint-api/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/pom.xml?rev=767184&r1=767183&r2=767184&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/pom.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-api/pom.xml Tue Apr 21 15:19:20 2009
@@ -25,6 +25,15 @@
     <artifactId>blueprint-api</artifactId>
     <packaging>jar</packaging>
     <name>Apache Geronimo Blueprint API</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    
     <build>
         <plugins>
             <plugin>
@@ -57,11 +66,4 @@
             </plugin>
         </plugins>
     </build>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
 </project>

Modified: geronimo/sandbox/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-bundle/pom.xml?rev=767184&r1=767183&r2=767184&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-bundle/pom.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-bundle/pom.xml Tue Apr 21 15:19:20 2009
@@ -25,6 +25,18 @@
     <artifactId>blueprint-bundle</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Blueprint Bundle</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo</groupId>
+            <artifactId>blueprint-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-reflect</artifactId>
+        </dependency>
+    </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -54,17 +66,156 @@
                             net.sf.cglib.proxy,
                             net.sf.cglib.reflect,
                         </Private-Package>
-                    </instructions>
+                     </instructions>
+                    <unpackBundle>true</unpackBundle>
                 </configuration>
             </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>org.apache.xbean:xbean-reflect</include>
+                                    <include>asm:asm-all</include>
+                                    <include>cglib:cglib</include>
+                                    <include>org.apache.geronimo:blueprint-core</include>
+                                    <include>org.apache.geronimo:blueprint-api</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>org.apache.xbean:xbean-reflect</artifact>
+                                    <excludes>
+                                        <exclude>org/**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>asm:asm-all</artifact>
+                                    <excludes>
+                                        <exclude>org/**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>cglib:cglib</artifact>
+                                    <excludes>
+                                        <exclude>net/**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>org.apache.geronimo:blueprint-core</artifact>
+                                    <excludes>
+                                        <exclude>org/**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>org.apache.geronimo:blueprint-api</artifact>
+                                    <excludes>
+                                        <exclude>org/**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <createSourcesJar>${createSourcesJar}</createSourcesJar>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo</groupId>
-            <artifactId>blueprint-core</artifactId>
-            <version>${version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>deploy</id>
+            <properties>
+                <createSourcesJar>true</createSourcesJar>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>unpack-sources</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>org.apache.xbean</groupId>
+                                            <artifactId>xbean-reflect</artifactId>
+                                            <classifier>sources</classifier>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>asm</groupId>
+                                            <artifactId>asm-all</artifactId>
+                                            <classifier>sources</classifier>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>cglib</groupId>
+                                            <artifactId>cglib</artifactId>
+                                            <classifier>sources</classifier>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>org.apache.geronimo</groupId>
+                                            <artifactId>blueprint-api</artifactId>
+                                            <classifier>sources</classifier>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>org.apache.geronimo</groupId>
+                                            <artifactId>blueprint-core</artifactId>
+                                            <classifier>sources</classifier>
+                                        </artifactItem>
+                                    </artifactItems>
+                                    <outputDirectory>${project.build.directory}/sources</outputDirectory>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <phase>process-classes</phase>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>package</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <minmemory>128m</minmemory>
+                            <maxmemory>512m</maxmemory>
+                            <sourcepath>${project.build.directory}/sources</sourcepath>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>

Modified: geronimo/sandbox/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/pom.xml?rev=767184&r1=767183&r2=767184&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/pom.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-core/pom.xml Tue Apr 21 15:19:20 2009
@@ -32,12 +32,10 @@
       <dependency>
           <groupId>org.apache.geronimo</groupId>
           <artifactId>blueprint-api</artifactId>
-          <version>${version}</version>
       </dependency>
       <dependency>
           <groupId>org.apache.xbean</groupId>
           <artifactId>xbean-reflect</artifactId>
-          <version>3.6-SNAPSHOT</version>
       </dependency>
       <dependency>
           <groupId>org.apache.felix</groupId>
@@ -50,17 +48,14 @@
       <dependency>
           <groupId>cglib</groupId>
           <artifactId>cglib</artifactId>
-          <version>2.2</version>
       </dependency>
       <dependency>
           <groupId>asm</groupId>
           <artifactId>asm-all</artifactId>
-          <version>3.1</version>
       </dependency>
       <dependency>
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-api</artifactId>
-          <version>1.5.6</version>
       </dependency>
   </dependencies>
 

Modified: geronimo/sandbox/blueprint/blueprint-itests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-itests/pom.xml?rev=767184&r1=767183&r2=767184&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-itests/pom.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-itests/pom.xml Tue Apr 21 15:19:20 2009
@@ -31,19 +31,16 @@
         <dependency>
             <groupId>org.apache.servicemix.kernel.testing</groupId>
             <artifactId>org.apache.servicemix.kernel.testing.support</artifactId>
-            <version>1.1.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo</groupId>
             <artifactId>blueprint-bundle</artifactId>
-            <version>${pom.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo</groupId>
             <artifactId>blueprint-sample</artifactId>
-            <version>${pom.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: geronimo/sandbox/blueprint/blueprint-sample/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-sample/pom.xml?rev=767184&r1=767183&r2=767184&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-sample/pom.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-sample/pom.xml Tue Apr 21 15:19:20 2009
@@ -54,9 +54,8 @@
             <scope>provided</scope>
         </dependency>
        <dependency>
-           <groupId>org.apache.felix</groupId>
+           <groupId>org.apache.geronimo</groupId>
            <artifactId>blueprint-api</artifactId>
-           <version>${version}</version>
        </dependency>
     </dependencies>
 </project>

Modified: geronimo/sandbox/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/pom.xml?rev=767184&r1=767183&r2=767184&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/pom.xml (original)
+++ geronimo/sandbox/blueprint/pom.xml Tue Apr 21 15:19:20 2009
@@ -34,6 +34,31 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
+                <groupId>org.apache.geronimo</groupId>
+                <artifactId>blueprint-api</artifactId>
+                <version>${version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo</groupId>
+                <artifactId>blueprint-core</artifactId>
+                <version>${version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo</groupId>
+                <artifactId>blueprint-bundle</artifactId>
+                <version>${version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo</groupId>
+                <artifactId>blueprint-sample</artifactId>
+                <version>${version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo</groupId>
+                <artifactId>blueprint-itests</artifactId>
+                <version>${version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.osgi.core</artifactId>
                 <version>1.2.0</version>
@@ -48,6 +73,31 @@
                 <artifactId>junit</artifactId>
                 <version>3.8.2</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.xbean</groupId>
+                <artifactId>xbean-reflect</artifactId>
+                <version>3.6-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>cglib</groupId>
+                <artifactId>cglib</artifactId>
+                <version>2.2</version>
+            </dependency>
+            <dependency>
+                <groupId>asm</groupId>
+                <artifactId>asm-all</artifactId>
+                <version>3.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.5.6</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.servicemix.kernel.testing</groupId>
+                <artifactId>org.apache.servicemix.kernel.testing.support</artifactId>
+                <version>1.1.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -63,6 +113,48 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>deploy</id>
+            <build>
+                <defaultGoal>deploy</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <phase>process-classes</phase>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>package</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <minmemory>128m</minmemory>
+                            <maxmemory>512m</maxmemory>
+                            <sourcepath>${project.build.directory}/sources</sourcepath>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
     <modules>
         <module>blueprint-api</module>
         <module>blueprint-core</module>



Mime
View raw message