You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2006/05/04 21:26:16 UTC

svn commit: r399832 - in /tapestry/tapestry5/tapestry-core/trunk: .project pom.xml

Author: hlship
Date: Thu May  4 12:26:12 2006
New Revision: 399832

URL: http://svn.apache.org/viewcvs?rev=399832&view=rev
Log:
Use a -SNAPSHOT on the version number.
Identify a parent POM (the tapestry-project).

Modified:
    tapestry/tapestry5/tapestry-core/trunk/.project
    tapestry/tapestry5/tapestry-core/trunk/pom.xml

Modified: tapestry/tapestry5/tapestry-core/trunk/.project
URL: http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/.project?rev=399832&r1=399831&r2=399832&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/.project (original)
+++ tapestry/tapestry5/tapestry-core/trunk/.project Thu May  4 12:26:12 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>tapestry5</name>
+	<name>tapestry-core</name>
 	<comment></comment>
 	<projects>
 	</projects>

Modified: tapestry/tapestry5/tapestry-core/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/pom.xml?rev=399832&r1=399831&r2=399832&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/pom.xml (original)
+++ tapestry/tapestry5/tapestry-core/trunk/pom.xml Thu May  4 12:26:12 2006
@@ -5,12 +5,13 @@
     <groupId>org.apache.tapestry</groupId>
     <artifactId>tapestry-core</artifactId>
     <packaging>jar</packaging>
-    <version>5.0.0</version>
+    <version>5.0.0-SNAPSHOT</version>
     <!-- This should change to tapestry-project -->
     <parent>
-        <groupId>com.javaforge.tapestry</groupId>
-        <artifactId>common</artifactId>
-        <version>0.1.1</version>
+        <groupId>org.apache.tapestry</groupId>
+        <artifactId>tapestry-project</artifactId>
+        <version>5.0.0-SNAPSHOT</version>
+        <relativePath>../tapestry-project/pom.xml</relativePath>
     </parent>
     <name>Tapestry Core Library</name>
     <inceptionYear>2006</inceptionYear>
@@ -18,47 +19,38 @@
         <dependency>
             <groupId>javassist</groupId>
             <artifactId>javassist</artifactId>
-            <version>3.1</version>
+            <!-- Override parent pom -->
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>hivemind</groupId>
-            <artifactId>hivemind</artifactId>
-            <version>1.1.1</version>
-            <scope>compile</scope>
+            <artifactId>hivemind</artifactId>
         </dependency>
         <dependency>
             <groupId>hivemind</groupId>
             <artifactId>hivemind-lib</artifactId>
-            <version>1.1.1</version>
-            <scope>compile</scope>
         </dependency>
         <!-- Really, a transitive dependency of hivemind. -->
         <dependency>
             <groupId>oro</groupId>
             <artifactId>oro</artifactId>
-            <version>2.0.8</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.0.4</version>
-            <scope>compile</scope>
-        </dependency>
-        <!-- The following two dependencies are "compile" and not "test" 
-             because MockManager is in src/main/java -->
-        <!-- May need to change this to "provided" to keep it from showing up in WARs for
-             Tapestry apps. -->
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        <!-- Override parent pom: needed at compile time. -->
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
-            <version>2.0</version>
             <scope>compile</scope>
         </dependency>
+        <!-- Override parent pom: needed at compile time. -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
+            <!-- Looks like if you override scope, you have to provide version (and classifier) as well.
+            Or perhaps this has something to do with classifier. -->
             <version>4.7</version>
             <classifier>jdk15</classifier>
             <scope>compile</scope>
@@ -66,19 +58,18 @@
         <dependency>
             <groupId>aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
-            <version>1.5.0</version>
         </dependency>
     </dependencies>
-    <build>        
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin> 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>



---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org