You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2009/01/09 21:43:17 UTC

svn commit: r733147 - in /incubator/openwebbeans/trunk: distribution/pom.xml distribution/src/assembly/dist.xml pom.xml webbeans-impl/pom.xml

Author: gerdogdu
Date: Fri Jan  9 12:43:16 2009
New Revision: 733147

URL: http://svn.apache.org/viewvc?rev=733147&view=rev
Log:
OWB-37 distribution package management

Modified:
    incubator/openwebbeans/trunk/distribution/pom.xml
    incubator/openwebbeans/trunk/distribution/src/assembly/dist.xml
    incubator/openwebbeans/trunk/pom.xml
    incubator/openwebbeans/trunk/webbeans-impl/pom.xml

Modified: incubator/openwebbeans/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/distribution/pom.xml?rev=733147&r1=733146&r2=733147&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/distribution/pom.xml (original)
+++ incubator/openwebbeans/trunk/distribution/pom.xml Fri Jan  9 12:43:16 2009
@@ -32,20 +32,26 @@
     <description>Builds the complete OpenWebBeans  distribution bundles</description>
 
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.2-beta-2</version>
-                    <configuration>
-                        <descriptors>
-                            <descriptor>src/assembly/dist.xml</descriptor>
-                        </descriptors>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.2-beta-2</version>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/assembly/dist.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 
     <!--
@@ -58,7 +64,13 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>guess</artifactId>
             <version>${project.version}</version>
-	    <type>war</type>
+    	    <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>guess</artifactId>
+            <version>${project.version}</version>
+            <classifier>sources</classifier>
         </dependency>
 
         <dependency>
@@ -68,90 +80,23 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
+            <artifactId>webbeans-api</artifactId>
+            <version>${project.version}</version>
+            <classifier>sources</classifier>
+        </dependency>
+        
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>webbeans-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
             <artifactId>webbeans-impl</artifactId>
             <version>${project.version}</version>
+            <classifier>sources</classifier>
         </dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-servlet_2.5_spec</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>dom4j</groupId>
-			<artifactId>dom4j</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs </groupId>
-			<artifactId>geronimo-ejb_3.0_spec</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-el_1.0_spec</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.myfaces.core</groupId>
-			<artifactId>myfaces-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javassist</groupId>
-			<artifactId>javassist</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.scannotation</groupId>
-			<artifactId>scannotation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>jsr250-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jpa_3.0_spec</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-interceptor_3.0_spec</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jta_1.1_spec</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jsp_2.1_spec</artifactId>
-		</dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>release-profile</id>
-            <activation>
-                <property>
-                    <name>distribute</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <version>2.2-beta-2</version>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 </project>

Modified: incubator/openwebbeans/trunk/distribution/src/assembly/dist.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/distribution/src/assembly/dist.xml?rev=733147&r1=733146&r2=733147&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/distribution/src/assembly/dist.xml (original)
+++ incubator/openwebbeans/trunk/distribution/src/assembly/dist.xml Fri Jan  9 12:43:16 2009
@@ -19,51 +19,56 @@
         </file>
 
         <file>
-	    <source>../README.txt</source>
+            <source>../README.txt</source>
         </file>
 
         <file>
-	    <source>../KEYS</source>
+            <source>../KEYS</source>
+        </file>
+
+        <file>
+            <outputDirectory>config</outputDirectory>
+            <source>../samples/guess/src/main/webapp/WEB-INF/web.xml</source>
+        </file>
+
+        <file>
+            <outputDirectory>config</outputDirectory>
+            <source>../samples/guess/src/main/webapp/WEB-INF/web-beans.xml</source>
         </file>
-	
-	<file>
-		<outputDirectory>config</outputDirectory>
-		<source>../samples/guess/src/main/webapp/WEB-INF/web.xml</source>
-	</file>        
-
-	<file>
-		<outputDirectory>config</outputDirectory>
-		<source>../samples/guess/src/main/webapp/WEB-INF/web-beans.xml</source>
-	</file>        
 
     </files>
+
     <dependencySets>
 
         <dependencySet>
             <outputDirectory></outputDirectory>
             <includes>
-                <include>org.apache.openwebbeans:webbeans-api</include>           
+                <include>org.apache.openwebbeans:webbeans-api</include>
                 <include>org.apache.openwebbeans:webbeans-impl</include>
             </includes>
-	</dependencySet>
+	    <excludes>
+		<exclude>org.apache.openwebbeans:webbeans-api:jar:sources</exclude>
+		<exclude>org.apache.openwebbeans:webbeans-impl:jar:sources</exclude>
+	    </excludes>
+        </dependencySet>
 
 
         <dependencySet>
             <outputDirectory>samples</outputDirectory>
             <includes>
-                <include>org.apache.openwebbeans:guess:war</include>           
+                <include>org.apache.openwebbeans:guess:war</include>
             </includes>
         </dependencySet>
 
         <dependencySet>
             <outputDirectory>lib/thirdparty</outputDirectory>
             <includes>
-                <include>log4j:log4j</include>           
+                <include>log4j:log4j</include>
                 <include>dom4j:dom4j</include>
                 <include>javassist:javassist</include>
                 <include>net.sf.scannotation:scannotation</include>
             </includes>
-    </dependencySet>
+        </dependencySet>
 
         <dependencySet>
             <outputDirectory>lib/javaee</outputDirectory>
@@ -80,26 +85,15 @@
             </includes>
         </dependencySet>
 
-     </dependencySets>
-
-    <fileSets>
-        <!--
-            Build the 'project' directory which includes the project sources
-        -->
-        <fileSet>
-            <directory>..</directory>
-            <useDefaultExcludes>true</useDefaultExcludes>
+        <dependencySet>
             <outputDirectory>src</outputDirectory>
-            <excludes>
-                <exclude>**/target/**</exclude>
-		<exclude>KEYS</exclude>
-		<exclude>**/licences/**</exclude>
-		<exclude>LICENCE.txt</exclude>
-		<exclude>NOTICE.txt</exclude>
-		<exclude>README.txt</exclude>
-            </excludes>
-        </fileSet>
+            <includes>
+                <include>org.apache.openwebbeans:webbeans-api:jar:sources</include>
+                <include>org.apache.openwebbeans:webbeans-impl:jar:sources</include>
+                <include>org.apache.openwebbeans:guess:jar:sources</include>
+            </includes>
+        </dependencySet>
 
-    </fileSets>
+    </dependencySets>
 
 </assembly>

Modified: incubator/openwebbeans/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/pom.xml?rev=733147&r1=733146&r2=733147&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/pom.xml (original)
+++ incubator/openwebbeans/trunk/pom.xml Fri Jan  9 12:43:16 2009
@@ -40,12 +40,42 @@
 	    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/openwebbeans/trunk</connection>
 	    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/openwebbeans/trunk</developerConnection>
 	    <url>https://svn.apache.org/repos/asf/incubator/openwebbeans/trunk</url>
-       </scm>
+    </scm>
 
- 	<issueManagement>
+    <issueManagement>
           <system>jira</system>
           <url>http://issues.apache.org/jira/browse/OWB</url>
-        </issueManagement>
+    </issueManagement>
+
+    <mailingLists>
+       <mailingList>
+          <name>OpenWebBeans Developer List</name>
+          <subscribe>openwebbeans-dev-subscribe@incubator.apache.org</subscribe>
+          <unsubscribe>openwebbeans-dev-unsubscribe@incubator.apache.org</unsubscribe>
+          <post>openwebbeans-dev@incubator.apache.org</post>
+          <archive>http://mail-archives.apache.org/mod_mbox/incubator-openwebbeans-dev/</archive>
+       </mailingList>
+       <mailingList>
+          <name>OpenWebBeans User List</name>
+          <subscribe>openwebbeans-user-subscribe@incubator.apache.org</subscribe>
+          <unsubscribe>openwebbeans-user-unsubscribe@incubator.apache.org</unsubscribe>
+          <post>openwebbeans-user@incubator.apache.org</post>
+          <archive>http://mail-archives.apache.org/mod_mbox/incubator-openwebbeans-user/</archive>
+       </mailingList>
+       <mailingList>
+          <name>OpenWebBeans Commits List</name>
+          <subscribe>openwebbeans-commits-subscribe@incubator.apache.org</subscribe>
+          <unsubscribe>openwebbeans-commits-unsubscribe@incubator.apache.org</unsubscribe>
+          <post>openwebbeans-commits@incubator.apache.org</post>
+          <archive>http://mail-archives.apache.org/mod_mbox/incubator-openwebbeans-commits/</archive>
+       </mailingList>
+       <mailingList>
+          <name>OpenWebBeans Private List</name>
+          <subscribe>openwebbeans-private-subscribe@incubator.apache.org</subscribe>
+          <unsubscribe>openwebbeans-private-unsubscribe@incubator.apache.org</unsubscribe>
+          <post>openwebbeans-private@incubator.apache.org</post>
+       </mailingList>
+    </mailingLists>
 
 	<build>
 		<plugins>
@@ -63,13 +93,27 @@
 				<executions>
 				</executions>
 			</plugin>
+            <!-- force generating a *-sources.jar when building a jar, e.g. for a snapshot release -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                <execution>
+                    <goals>
+                        <goal>jar</goal>
+                    </goals>
+                    </execution>
+                </executions>
+            </plugin>  
 		</plugins>
 	</build>
+    
 	<modules>
 		<module>webbeans-api</module>
 		<module>webbeans-impl</module>
 		<module>samples</module>
 	</modules>
+    
 	<repositories>
 		<repository>
 			<id>java.net</id>

Modified: incubator/openwebbeans/trunk/webbeans-impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/pom.xml?rev=733147&r1=733146&r2=733147&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/pom.xml (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/pom.xml Fri Jan  9 12:43:16 2009
@@ -94,4 +94,141 @@
 			<artifactId>webbeans-api</artifactId>
 		</dependency>		
 	</dependencies>
-</project>
\ No newline at end of file
+
+  <reporting>
+    <plugins>
+      <!-- Apache plugins in alphabetical order -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.1</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>cim</report>
+              <report>index</report>
+              <report>issue-tracking</report>
+              <report>mailing-list</report>
+              <report>project-team</report>
+              <report>scm</report>
+              <report>summary</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <profiles>
+    <profile>
+      <id>reporting</id>
+      <activation>
+        <property>
+          <name>skipReports</name>
+          <value>!true</value>
+        </property>
+      </activation>
+      <reporting>
+        <plugins>
+          <!-- Apache plugins in alphabetical order -->
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <version>2.2</version>
+            <configuration>
+              <configLocation>config/maven_checks.xml</configLocation>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>2.4</version>
+            <configuration>
+              <quiet>true</quiet>
+              <links>
+                <link>http://java.sun.com/j2ee/1.4/docs/api</link>
+                <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+                <link>http://myfaces.apache.org/core12/myfaces-api/apidocs/</link>
+              </links>
+            </configuration>
+            <reportSets>
+              <reportSet>
+                <reports>
+                  <report>javadoc</report>
+                  <report>test-javadoc</report>
+                </reports>
+              </reportSet>
+            </reportSets>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jxr-plugin</artifactId>
+            <version>2.1</version>
+            <configuration>
+              <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
+              <outputEncoding>${project.build.sourceEncoding}</outputEncoding>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-pmd-plugin</artifactId>
+            <version>2.4</version>
+            <configuration>
+              <targetJdk>1.5</targetJdk>
+              <rulesets>
+                <ruleset>http://svn.codehaus.org/mojo/trunk/mojo/mojo-parent/src/main/config/pmd/mojo_rules.xml</ruleset>
+              </rulesets>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-project-info-reports-plugin</artifactId>
+            <version>2.1</version>
+            <reportSets>
+              <reportSet>
+                <reports>
+                  <report>cim</report>
+                  <report>dependencies</report>
+                  <report>dependency-convergence</report>
+                  <report>dependency-management</report>
+                  <report>index</report>
+                  <report>issue-tracking</report>
+                  <report>license</report>
+                  <report>mailing-list</report>
+                  <report>plugin-management</report>
+                  <report>project-team</report>
+                  <report>scm</report>
+                  <report>summary</report>
+                </reports>
+              </reportSet>
+            </reportSets>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-report-plugin</artifactId>
+            <version>2.4.3</version>
+            <reportSets>
+              <reportSet>
+                <reports>
+                  <report>report</report>
+                </reports>
+              </reportSet>
+            </reportSets>
+          </plugin>
+          <!-- Codehaus plugins in alphabetical order -->
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>cobertura-maven-plugin</artifactId>
+            <version>2.2</version>
+          </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>taglist-maven-plugin</artifactId>
+            <version>2.2</version>
+          </plugin>
+        </plugins>
+      </reporting>
+    </profile>
+  </profiles>
+
+</project>