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

svn commit: r835839 - in /commons/proper/jexl/trunk: pom.xml src/main/assembly/src.xml xdocs/download_jexl.xml

Author: henrib
Date: Fri Nov 13 13:09:24 2009
New Revision: 835839

URL: http://svn.apache.org/viewvc?rev=835839&view=rev
Log:
Readying 2.0RC1 - step B.6

Modified:
    commons/proper/jexl/trunk/pom.xml
    commons/proper/jexl/trunk/src/main/assembly/src.xml
    commons/proper/jexl/trunk/xdocs/download_jexl.xml

Modified: commons/proper/jexl/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/pom.xml?rev=835839&r1=835838&r2=835839&view=diff
==============================================================================
--- commons/proper/jexl/trunk/pom.xml (original)
+++ commons/proper/jexl/trunk/pom.xml Fri Nov 13 13:09:24 2009
@@ -25,9 +25,9 @@
         <version>12</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>commons-jexl</groupId>
+    <groupId>org.apache.commons</groupId>
     <artifactId>commons-jexl</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.0</version>
     <name>Commons JEXL</name>
     <inceptionYear>2003</inceptionYear>
     <description>Jexl is an implementation of the JSTL Expression Language with extensions.</description>
@@ -39,22 +39,22 @@
     </issueManagement>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/jexl/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/jexl/trunk</developerConnection>
-        <url>http://svn.apache.org/viewvc/commons/proper/jexl/trunk</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/jexl/tags/JEXL_2_0_RC1</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/jexl/tags/JEXL_2_0_RC1</developerConnection>
+        <url>http://svn.apache.org/viewvc/commons/proper/jexl/tags/JEXL_2_0_RC1</url>
     </scm>
 
     <developers>
         <developer>
             <name>dIon Gillard</name>
             <id>dion</id>
-            <email>dion@apache.org</email>
+            <email>dion AT apache DOT org</email>
             <organization>Apache Software Foundation</organization>
         </developer>
         <developer>
             <name>Geir Magnusson Jr.</name>
             <id>geirm</id>
-            <email>geirm@apache.org</email>
+            <email>geirm AT apache DOT org</email>
             <organization>independent</organization>
         </developer>
         <developer>
@@ -114,16 +114,18 @@
         <maven.compile.target>1.5</maven.compile.target>
         <commons.componentid>jexl</commons.componentid>
         <commons.release.version>2.0</commons.release.version>
+        <!-- The RC version used in the staging repository URL. -->
+        <commons.rc.version>RC1</commons.rc.version>
         <commons.binary.suffix></commons.binary.suffix>
         <commons.jira.id>JEXL</commons.jira.id>
         <commons.jira.pid>12310479</commons.jira.pid>
-    <!-- Temp fix until parent POM is updated -->
+        <!-- Temp fix until parent POM is updated -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
 
     <build>
-    <!-- temporarily override the parent POM (v 11) until that is updated -->
+        <!-- temporarily override the parent POM (v 11) until that is updated -->
         <resources>
             <resource>
                 <directory>${basedir}</directory>
@@ -133,7 +135,7 @@
                     <include>LICENSE.txt</include>
                 </includes>
             </resource>
-      <!-- This is the default, but is currently missing from the parent POM (v11) -->
+            <!-- This is the default, but is currently missing from the parent POM (v11) -->
             <resource>
                 <directory>src/main/resources</directory>
             </resource>
@@ -228,7 +230,7 @@
                 <version>2.1</version>
                 <configuration>
                     <xmlOutput>true</xmlOutput>
-            <!-- Optional derectory to put findbugs xdoc xml report -->
+                    <!-- Optional directory to put findbugs xdoc xml report -->
                     <xmlOutputDirectory>target/site</xmlOutputDirectory>
                 </configuration>
             </plugin>
@@ -255,4 +257,27 @@
         </plugins>
     </reporting>
 
+
+    <distributionManagement>
+        <site>
+            <id>website</id>
+            <name>Apache Website</name>
+            <url>${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/jexl/</url>
+        </site>
+    </distributionManagement>
+
+    <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>
\ No newline at end of file

Modified: commons/proper/jexl/trunk/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/assembly/src.xml?rev=835839&r1=835838&r2=835839&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/assembly/src.xml (original)
+++ commons/proper/jexl/trunk/src/main/assembly/src.xml Fri Nov 13 13:09:24 2009
@@ -20,7 +20,7 @@
         <format>tar.gz</format>
         <format>zip</format>
     </formats>
-    <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+    <baseDirectory>${artifactId}-${commons.release.version}-src</baseDirectory>
     <fileSets>
         <fileSet>
             <includes>

Modified: commons/proper/jexl/trunk/xdocs/download_jexl.xml
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/xdocs/download_jexl.xml?rev=835839&r1=835838&r2=835839&view=diff
==============================================================================
--- commons/proper/jexl/trunk/xdocs/download_jexl.xml (original)
+++ commons/proper/jexl/trunk/xdocs/download_jexl.xml Fri Nov 13 13:09:24 2009
@@ -102,17 +102,17 @@
         <ul class="downloads">
           <li class="group"><div class="links"><span class="label">Binary</span></div>
             <ul>
-              <li class="download"><a href="[preferred]/commons/jexl/binaries/commons-jexl-1.1.tar.gz">1.1.tar.gz</a>
+              <li class="download"><a href="[preferred]/commons/jexl/binaries/commons-jexl-2.0.tar.gz">2.0.tar.gz</a>
                 <ul class="attributes">
-                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/jexl/binaries/commons-jexl-1.1.tar.gz.md5">md5</a>]</span>
-                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/jexl/binaries/commons-jexl-1.1.tar.gz.asc">pgp</a>]</span>
+                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/jexl/binaries/commons-jexl-2.0.tar.gz.md5">md5</a>]</span>
+                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/jexl/binaries/commons-jexl-2.0.tar.gz.asc">pgp</a>]</span>
                   </li>
                 </ul>
               </li>
-              <li class="download"><a href="[preferred]/commons/jexl/binaries/commons-jexl-1.1.zip">1.1.zip</a>
+              <li class="download"><a href="[preferred]/commons/jexl/binaries/commons-jexl-2.0.zip">2.0.zip</a>
                 <ul class="attributes">
-                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/jexl/binaries/commons-jexl-1.1.zip.md5">md5</a>]</span>
-                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/jexl/binaries/commons-jexl-1.1.zip.asc">pgp</a>]</span>
+                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/jexl/binaries/commons-jexl-2.0.zip.md5">md5</a>]</span>
+                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/jexl/binaries/commons-jexl-2.0.zip.asc">pgp</a>]</span>
                   </li>
                 </ul>
               </li>
@@ -120,17 +120,17 @@
           </li>
           <li class="group"><div class="links"><span class="label">Source</span></div>
             <ul>
-              <li class="download"><a href="[preferred]/commons/jexl/source/commons-jexl-1.1-src.tar.gz">1.1.tar.gz</a>
+              <li class="download"><a href="[preferred]/commons/jexl/source/commons-jexl-2.0-src.tar.gz">2.0.tar.gz</a>
                 <ul class="attributes">
-                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/jexl/source/commons-jexl-1.1-src.tar.gz.md5">md5</a>]</span>
-                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/jexl/source/commons-jexl-1.1-src.tar.gz.asc">pgp</a>]</span>
+                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/jexl/source/commons-jexl-2.0-src.tar.gz.md5">md5</a>]</span>
+                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/jexl/source/commons-jexl-2.0-src.tar.gz.asc">pgp</a>]</span>
                   </li>
                 </ul>
               </li>
-              <li class="download"><a href="[preferred]/commons/jexl/source/commons-jexl-1.1-src.zip">1.1.zip</a>
+              <li class="download"><a href="[preferred]/commons/jexl/source/commons-jexl-2.0-src.zip">2.0.zip</a>
                 <ul class="attributes">
-                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/jexl/source/commons-jexl-1.1-src.zip.md5">md5</a>]</span>
-                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/jexl/source/commons-jexl-1.1-src.zip.asc">pgp</a>]</span>
+                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/jexl/source/commons-jexl-2.0-src.zip.md5">md5</a>]</span>
+                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/jexl/source/commons-jexl-2.0-src.zip.asc">pgp</a>]</span>
                   </li>
                 </ul>
               </li>