commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nia...@apache.org
Subject svn commit: r595574 - in /commons/proper/el/trunk: pom.xml src/assembly/ src/assembly/bin.xml src/assembly/src.xml src/site/resources/ src/site/resources/images/ src/site/site.xml
Date Fri, 16 Nov 2007 06:43:05 GMT
Author: niallp
Date: Thu Nov 15 22:43:04 2007
New Revision: 595574

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

Added:
    commons/proper/el/trunk/src/assembly/
    commons/proper/el/trunk/src/assembly/bin.xml   (with props)
    commons/proper/el/trunk/src/assembly/src.xml   (with props)
    commons/proper/el/trunk/src/site/resources/
    commons/proper/el/trunk/src/site/resources/images/
      - copied from r595528, commons/proper/el/trunk/xdocs/images/
Modified:
    commons/proper/el/trunk/pom.xml
    commons/proper/el/trunk/src/site/site.xml

Modified: commons/proper/el/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/el/trunk/pom.xml?rev=595574&r1=595573&r2=595574&view=diff
==============================================================================
--- commons/proper/el/trunk/pom.xml (original)
+++ commons/proper/el/trunk/pom.xml Thu Nov 15 22:43:04 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>
@@ -95,10 +95,22 @@
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
+  <properties>
+    <maven.compile.source>1.4</maven.compile.source>
+    <maven.compile.target>1.4</maven.compile.target>
+  </properties> 
+
   <build>
     <sourceDirectory>src/java</sourceDirectory>
+    <testSourceDirectory>src/test</testSourceDirectory>
     <resources>
       <resource>
         <directory>.</directory>
@@ -111,11 +123,13 @@
     </resources>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
+        <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
+          <descriptors>
+            <descriptor>src/assembly/bin.xml</descriptor>
+            <descriptor>src/assembly/src.xml</descriptor>
+          </descriptors>
+          <tarLongFileMode>gnu</tarLongFileMode>
         </configuration>
       </plugin>
     </plugins>

Added: commons/proper/el/trunk/src/assembly/bin.xml
URL: http://svn.apache.org/viewvc/commons/proper/el/trunk/src/assembly/bin.xml?rev=595574&view=auto
==============================================================================
--- commons/proper/el/trunk/src/assembly/bin.xml (added)
+++ commons/proper/el/trunk/src/assembly/bin.xml Thu Nov 15 22:43:04 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/el/trunk/src/assembly/bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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

Added: commons/proper/el/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/el/trunk/src/assembly/src.xml?rev=595574&view=auto
==============================================================================
--- commons/proper/el/trunk/src/assembly/src.xml (added)
+++ commons/proper/el/trunk/src/assembly/src.xml Thu Nov 15 22:43:04 2007
@@ -0,0 +1,46 @@
+<!--
+ 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>LICENSE.txt</include>
+                <include>maven.xml</include>
+                <include>NOTICE.txt</include>
+                <include>pom.xml</include>
+                <include>project.properties</include>
+                <include>project.xml</include>
+                <include>PROPOSAL.html</include>
+                <include>RELEASE-NOTES.txt</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>src</directory>
+        </fileSet>
+        <fileSet>
+            <directory>xdocs</directory>
+        </fileSet>
+    </fileSets>
+</assembly>

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

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

Modified: commons/proper/el/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/commons/proper/el/trunk/src/site/site.xml?rev=595574&r1=595573&r2=595574&view=diff
==============================================================================
--- commons/proper/el/trunk/src/site/site.xml (original)
+++ commons/proper/el/trunk/src/site/site.xml Thu Nov 15 22:43:04 2007
@@ -21,7 +21,7 @@
   <bannerRight>
     <name>Commons EL</name>
     <src>images/el-logo-white.png</src>
-    <href>http://commons.apache.org/el/</href>
+    <href>/index.html</href>
   </bannerRight>
   <body>
     <menu name="Commons EL">
@@ -31,7 +31,7 @@
       <item name="Mailing lists"     href="/mail-lists.html"/>
       <item name="Issue Tracking"    href="/issue-tracking.html"/>
       <item name="Proposal"          href="/proposal.html"/>
-      <item name="Source Repository" href="/cvs-usage.html"/>
+      <item name="Source Repository" href="/source-repository.html"/>
       <item name="Javadoc (latest)"  href="/apidocs/index.html"/>
     </menu>
   </body>



Mime
View raw message