You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by sg...@apache.org on 2009/03/23 15:52:27 UTC

svn commit: r757405 - in /commons/proper/compress/trunk: pom.xml src/assembly/ src/assembly/bin.xml src/assembly/src.xml src/changes/ src/changes/changes.xml src/site/site.xml

Author: sgoeschl
Date: Mon Mar 23 14:52:23 2009
New Revision: 757405

URL: http://svn.apache.org/viewvc?rev=757405&view=rev
Log:
+) Cleaned up the site generation
+) enabled Cobetura again
+) add PMD reports
+) add assembly descriptors 
+) fixd a few minor issues for moving it to commons-proper

Added:
    commons/proper/compress/trunk/src/assembly/
    commons/proper/compress/trunk/src/assembly/bin.xml
    commons/proper/compress/trunk/src/assembly/src.xml
    commons/proper/compress/trunk/src/changes/
    commons/proper/compress/trunk/src/changes/changes.xml
Modified:
    commons/proper/compress/trunk/pom.xml
    commons/proper/compress/trunk/src/site/site.xml

Modified: commons/proper/compress/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/pom.xml?rev=757405&r1=757404&r2=757405&view=diff
==============================================================================
--- commons/proper/compress/trunk/pom.xml (original)
+++ commons/proper/compress/trunk/pom.xml Mon Mar 23 14:52:23 2009
@@ -17,9 +17,8 @@
    limitations under the License.
 
 -->
-<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">
-  <modelVersion>4.0.0</modelVersion>
+<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">
+  <modelVersion>4.0.0</modelVersion>  
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-parent</artifactId>
@@ -32,6 +31,11 @@
   <url>http://commons.apache.org/sandbox/compress/</url>
   <description>Commons Compress is a component that contains Tar, Zip and BZip2 packages</description>
   
+  <issueManagement>
+    <system>jira</system>
+    <url>http://issues.apache.org/jira/browse/SANDBOX</url>
+  </issueManagement>
+  
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -91,36 +95,69 @@
     <maven.compile.target>1.4</maven.compile.target>
     <commons.componentid>compress</commons.componentid>
     <commons.jira.componentid>12311183</commons.jira.componentid>
+    <!-- configuration bits for cutting a release candidate -->
+    <commons.release.version>1.0</commons.release.version>
+    <commons.rc.version>RC1</commons.rc.version>    
   </properties> 
 
   <build>
     <plugins>
-      <!-- turn off cobertura until we figure out why it's hanging -->
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
+        <!-- create the source and binary assemblies -->
+        <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
-          <instrumentation>
-            <excludes>
-            <exclude>org/apache/commons/compress/bzip2/**/*.class</exclude>
-            <exclude>org/apache/commons/compress/compressors/bzip2/**/*.class</exclude>
-            </excludes>
-          </instrumentation>
+          <descriptors>
+            <descriptor>src/assembly/bin.xml</descriptor>
+            <descriptor>src/assembly/src.xml</descriptor>
+          </descriptors>
+          <tarLongFileMode>gnu</tarLongFileMode>
         </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-      
+      </plugin>    
+    </plugins>      
   </build>
 
   <reporting>
-    <!--plugins>
+    <plugins>     
+      <plugin>
+        <!-- generate the changes report from changes.xml and link to JIRA -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-changes-plugin</artifactId>
+        <version>2.0</version>
+        <configuration>
+          <issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
+        </configuration>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>changes-report</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin> 
+      <plugin>
+        <!-- generate a code coverage report -->
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>cobertura-maven-plugin</artifactId>
+        <version>2.2</version>
+      </plugin>
+      <plugin>
+        <!-- generate the PMD reports -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <version>2.4</version>
+        <configuration>
+          <minimumTokens>200</minimumTokens>
+          <targetJdk>${maven.compile.source}</targetJdk>
+          <rulesets>
+            <ruleset>/rulesets/basic.xml</ruleset>
+            <ruleset>/rulesets/finalizers.xml</ruleset>            
+            <ruleset>/rulesets/imports.xml</ruleset>
+            <ruleset>/rulesets/unusedcode.xml</ruleset>
+          </rulesets>
+        </configuration>
+      </plugin>                 
+      <!-- 2009-03-23 sgoeschl fix this is currently broken since there is no checkstyle.xml -->
+      <!--
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
@@ -128,7 +165,22 @@
           <configLocation>checkstyle.xml</configLocation>
         </configuration>
       </plugin>
-    </plugins-->
+      -->
+    </plugins>
   </reporting>
 
+  <profiles>
+    <profile>
+      <id>rc</id>
+      <distributionManagement>
+        <!-- Cannot define in parent ATM, see COMMONSSITE-26 -->
+        <site>
+          <id>apache.website</id>
+          <name>Apache Commons Release Candidate Staging Site</name>
+          <url>${commons.deployment.protocol}://people.apache.org/www/people.apache.org/builds/commons/${commons.componentid}/${commons.release.version}/${commons.rc.version}/site</url>
+        </site>
+      </distributionManagement>
+    </profile>
+  </profiles>
+  
 </project>

Added: commons/proper/compress/trunk/src/assembly/bin.xml
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/assembly/bin.xml?rev=757405&view=auto
==============================================================================
--- commons/proper/compress/trunk/src/assembly/bin.xml (added)
+++ commons/proper/compress/trunk/src/assembly/bin.xml Mon Mar 23 14:52:23 2009
@@ -0,0 +1,43 @@
+<!--
+ 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.
+-->
+<assembly>
+    <id>bin</id>
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+    <includeSiteDirectory>false</includeSiteDirectory>
+    <fileSets>
+        <fileSet>
+            <includes>
+                <include>LICENSE.txt</include>
+                <include>NOTICE.txt</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target/site/apidocs</directory>
+            <outputDirectory>apidocs</outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>

Added: commons/proper/compress/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/assembly/src.xml?rev=757405&view=auto
==============================================================================
--- commons/proper/compress/trunk/src/assembly/src.xml (added)
+++ commons/proper/compress/trunk/src/assembly/src.xml Mon Mar 23 14:52:23 2009
@@ -0,0 +1,39 @@
+<!--
+ 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.
+-->
+<assembly>
+    <id>src</id>
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+    <baseDirectory>${artifactId}-${commons.release.version}-src</baseDirectory>
+    <fileSets>
+        <fileSet>
+            <includes>
+                <include>build.xml</include>
+                <include>LICENSE.txt</include>
+                <include>NOTICE.txt</include>
+                <include>pom.xml</include>
+                <include>STATUS</include>
+                <include>findbugs-exclude-filter.xml</include>                
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>src</directory>
+        </fileSet>
+    </fileSets>
+</assembly>

Added: commons/proper/compress/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/changes/changes.xml?rev=757405&view=auto
==============================================================================
--- commons/proper/compress/trunk/src/changes/changes.xml (added)
+++ commons/proper/compress/trunk/src/changes/changes.xml Mon Mar 23 14:52:23 2009
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<document>
+  <properties>
+    <title>commons-compress</title>
+    <author>Stefan Bodewig</author>
+  </properties>
+  <body>
+    <release version="1.0-SNAPSHOT" date="as in SVN" description="First Public Release">
+      <action dev="sgoeschl" type="fix">
+        Updating the pom.xml for preparing a move to commons-proper
+      </action>
+    </release>
+  </body>
+</document>

Modified: commons/proper/compress/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/site/site.xml?rev=757405&r1=757404&r2=757405&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/site/site.xml (original)
+++ commons/proper/compress/trunk/src/site/site.xml Mon Mar 23 14:52:23 2009
@@ -26,20 +26,11 @@
   </bannerRight>
 
   <body>
-
     <menu name="Compress">
       <item name="Overview"    href="/index.html"/>
       <item name="Download"    href="/downloads.html"/>
       <item name="Wiki"        href="http://wiki.apache.org/commons/Compress"/>
     </menu>
-    
-    <menu name="Development">
-      <item name="Mailing Lists"           href="/mail-lists.html"/>
-      <item name="Issue Tracking"          href="/issue-tracking.html"/>
-      <item name="Team"                    href="/team-list.html"/>
-      <item name="Source Repository"       href="/source-repository.html"/>
-      <item name="Javadoc (latest)"        href="/apidocs/index.html"/>
-    </menu>
-
   </body>
+  
 </project>