velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r957225 - in /velocity/sandbox/maven-reorg/engine/trunk: ./ src/site/xdoc/ velocity-engine/ velocity-engine/src/ velocity-engine/src/main/ velocity-engine/src/main/java/ velocity-engine/src/main/resources/ velocity-engine/src/test/ velocity...
Date Wed, 23 Jun 2010 14:42:10 GMT
Author: apetrelli
Date: Wed Jun 23 14:42:09 2010
New Revision: 957225

URL: http://svn.apache.org/viewvc?rev=957225&view=rev
Log:
VELOCITYSB-4
Created parent pom project and first child.

Added:
    velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/
      - copied from r957220, velocity/sandbox/maven-reorg/engine/trunk/xdocs/
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/   (with props)
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml   (with props)
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/main/
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/main/java/
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/main/resources/
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/test/
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/test/java/
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/test/resources/
Removed:
    velocity/sandbox/maven-reorg/engine/trunk/xdocs/
Modified:
    velocity/sandbox/maven-reorg/engine/trunk/pom.xml

Modified: velocity/sandbox/maven-reorg/engine/trunk/pom.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/pom.xml?rev=957225&r1=957224&r2=957225&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/pom.xml (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/pom.xml Wed Jun 23 14:42:09 2010
@@ -16,7 +16,7 @@
  "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.    
+ under the License.
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -26,29 +26,23 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache</groupId>
-    <artifactId>apache</artifactId>
-    <version>4</version>
+  	<artifactId>velocity-master</artifactId>
+  	<groupId>org.apache.velocity</groupId>
+  	<version>1-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.velocity</groupId>
-  <artifactId>velocity</artifactId>
-  <version>2.0-dev</version>
+  <artifactId>velocity-engine-parent</artifactId>
+  <version>2.0.0-SNAPSHOT</version>
 
   <name>Apache Velocity</name>
   <url>http://velocity.apache.org/engine/devel/</url>
   <description>Apache Velocity is a general purpose template engine.</description>
   <inceptionYear>2000</inceptionYear>
-  <packaging>jar</packaging>
-  
-  <prerequisites>
-      <maven>2.0.9</maven>
-  </prerequisites>
+  <packaging>pom</packaging>
 
   <build>
     <defaultGoal>install</defaultGoal>
-    <sourceDirectory>src/java</sourceDirectory>
-    <testSourceDirectory>src/test</testSourceDirectory>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -56,7 +50,6 @@
         <configuration>
           <inputEncoding>UTF-8</inputEncoding>
           <outputEncoding>UTF-8</outputEncoding>
-          <xdocDirectory>${basedir}/xdocs/docs</xdocDirectory>
         </configuration>
       </plugin>
       <plugin>
@@ -68,14 +61,6 @@
         </configuration>
       </plugin>
     </plugins>
-    <resources>
-      <resource>
-        <directory>src/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
   </build>
 
   <distributionManagement>
@@ -83,72 +68,8 @@
       <id>velocity.apache.org</id>
       <url>scpexe://people.apache.org/www/velocity.apache.org/engine/devel/</url>
     </site>
-    <repository>
-      <id>apache.releases</id>
-      <name>Apache Release Distribution Repository</name>
-      <url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-    </repository>
-    <snapshotRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Development Snapshot Repository</name>
-      <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
-    </snapshotRepository>
   </distributionManagement>
 
-  <developers>
-    <developer>
-      <name>Will Glass-Husain</name>
-      <id>wglass</id>
-      <email>wglass@forio.com</email>
-      <organization>Forio Business Simulations</organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-
-   <developer>
-      <name>Geir Magnusson Jr.</name>
-      <id>geirm</id>
-      <email>geirm@optonline.net</email>
-      <organization>Independent (DVSL Maven)</organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-
-    <developer>
-      <name>Daniel Rall</name>
-      <id>dlr</id>
-      <email>dlr@finemaltcoding.com</email>
-      <organization>CollabNet, Inc.</organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-
-    <developer>
-      <name>Henning P. Schmiedehausen</name>
-      <id>henning</id>
-      <email>hps@intermeta.de</email>
-      <organization>INTERMETA - Gesellschaft für Mehrwertdienste mbH</organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-      <timezone>2</timezone>
-    </developer>
-
-    <developer>
-      <name>Nathan Bubna</name>
-      <id>nbubna</id>
-      <email>nathan@esha.com</email>
-      <organization>ESHA Research</organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-
-  </developers>
-
   <dependencies>
     <dependency>
       <groupId>commons-collections</groupId>
@@ -322,7 +243,7 @@
           <threshold>Low</threshold>
           <effort>Max</effort>
           <excludeFilterFile>build/findbugs-exclude.xml</excludeFilterFile>
-          <findbugsXmlOutputDirectory>xdocs</findbugsXmlOutputDirectory> 
+          <findbugsXmlOutputDirectory>xdocs</findbugsXmlOutputDirectory>
         </configuration>
       </plugin>
     </plugins>
@@ -343,4 +264,7 @@
     <system>JIRA</system>
     <url>${jira.browse.url}/VELOCITY</url>
   </issueManagement>
+  <modules>
+  	<module>velocity-engine</module>
+  </modules>
 </project>

Propchange: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jun 23 14:42:09 2010
@@ -0,0 +1,2 @@
+.*
+target

Added: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml?rev=957225&view=auto
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml (added)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml Wed Jun 23 14:42:09
2010
@@ -0,0 +1,12 @@
+<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>
+    <artifactId>velocity-engine-parent</artifactId>
+    <groupId>org.apache.velocity</groupId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apache.velocity</groupId>
+  <artifactId>velocity-engine</artifactId>
+  <version>2.0.0-SNAPSHOT</version>
+  <name>Apache Velocity - Engine</name>
+</project>
\ No newline at end of file

Propchange: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL



Mime
View raw message