You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ni...@apache.org on 2007/11/16 06:09:25 UTC

svn commit: r595554 - in /commons/proper/dbcp/trunk: pom.xml src/assembly/ src/assembly/bin.xml src/assembly/src.xml src/site/site.xml

Author: niallp
Date: Thu Nov 15 21:09:24 2007
New Revision: 595554

URL: http://svn.apache.org/viewvc?rev=595554&view=rev
Log:
Update m2 build

Added:
    commons/proper/dbcp/trunk/src/assembly/
    commons/proper/dbcp/trunk/src/assembly/bin.xml   (with props)
    commons/proper/dbcp/trunk/src/assembly/src.xml   (with props)
Modified:
    commons/proper/dbcp/trunk/pom.xml
    commons/proper/dbcp/trunk/src/site/site.xml

Modified: commons/proper/dbcp/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom.xml?rev=595554&r1=595553&r2=595554&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/pom.xml (original)
+++ commons/proper/dbcp/trunk/pom.xml Thu Nov 15 21:09:24 2007
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-parent</artifactId>
-    <version>4</version>
+    <version>5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>commons-dbcp</groupId>
@@ -256,6 +256,16 @@
               </includes>
           </configuration>
         </plugin>
+        <plugin>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <configuration>
+            <descriptors>
+              <descriptor>src/assembly/bin.xml</descriptor>
+              <descriptor>src/assembly/src.xml</descriptor>
+            </descriptors>
+            <tarLongFileMode>gnu</tarLongFileMode>
+          </configuration>
+        </plugin>
       </plugins>
     </build>
     <reporting>
@@ -310,16 +320,6 @@
             <configLocation>checkstyle.xml</configLocation>
             <enableRulesSummary>false</enableRulesSummary>
           </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-report-plugin</artifactId>
-          <version>2.3</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jxr-plugin</artifactId>
-          <version>2.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

Added: commons/proper/dbcp/trunk/src/assembly/bin.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/assembly/bin.xml?rev=595554&view=auto
==============================================================================
--- commons/proper/dbcp/trunk/src/assembly/bin.xml (added)
+++ commons/proper/dbcp/trunk/src/assembly/bin.xml Thu Nov 15 21:09:24 2007
@@ -0,0 +1,44 @@
+<!--
+ 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>
+                <include>RELEASE-NOTES.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>

Propchange: commons/proper/dbcp/trunk/src/assembly/bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/dbcp/trunk/src/assembly/bin.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: commons/proper/dbcp/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/assembly/src.xml?rev=595554&view=auto
==============================================================================
--- commons/proper/dbcp/trunk/src/assembly/src.xml (added)
+++ commons/proper/dbcp/trunk/src/assembly/src.xml Thu Nov 15 21:09:24 2007
@@ -0,0 +1,51 @@
+<!--
+ 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}-${version}-src</baseDirectory>
+    <fileSets>
+        <fileSet>
+            <includes>
+                <include>build.properties.sample</include>
+                <include>build.xml</include>
+                <include>checkstyle.xml</include>
+                <include>LICENSE.txt</include>
+                <include>LICENSE-header.txt</include>
+                <include>maven.xml</include>
+                <include>NOTICE.txt</include>
+                <include>pom.xml</include>
+                <include>project.properties</include>
+                <include>project.xml</include>
+                <include>README.txt</include>
+                <include>release-notes.jsl</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>doc</directory>
+        </fileSet>
+        <fileSet>
+            <directory>src</directory>
+        </fileSet>
+        <fileSet>
+            <directory>xdocs</directory>
+        </fileSet>
+    </fileSets>
+</assembly>

Propchange: commons/proper/dbcp/trunk/src/assembly/src.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/dbcp/trunk/src/assembly/src.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: commons/proper/dbcp/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/site/site.xml?rev=595554&r1=595553&r2=595554&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/site/site.xml (original)
+++ commons/proper/dbcp/trunk/src/site/site.xml Thu Nov 15 21:09:24 2007
@@ -18,7 +18,7 @@
 <!DOCTYPE org.apache.commons.menus SYSTEM 'http://commons.apache.org/build/maven-build.dtd'>
 <project name="DBCP">
   <bannerRight>
-    <name>Commons Math</name>
+    <name>Commons DBCP</name>
     <src>/images/dbcp-logo-white.png</src>
     <href>/index.html</href>
   </bannerRight>
@@ -44,7 +44,7 @@
         <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="cvs-usage.html"/>
+        <item name="Source Repository" href="/source-repository.html"/>
       </menu>
 
     </body>