You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2006/09/01 22:23:52 UTC

svn commit: r439459 - in /maven/shared/trunk/maven-user: maven-user-model/pom.xml maven-user-webapp/pom.xml pom.xml

Author: carlos
Date: Fri Sep  1 13:23:51 2006
New Revision: 439459

URL: http://svn.apache.org/viewvc?rev=439459&view=rev
Log:
Move more info to parent pom. Use previous jspc plugin, latest don't work.

Modified:
    maven/shared/trunk/maven-user/maven-user-model/pom.xml
    maven/shared/trunk/maven-user/maven-user-webapp/pom.xml
    maven/shared/trunk/maven-user/pom.xml

Modified: maven/shared/trunk/maven-user/maven-user-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-model/pom.xml?rev=439459&r1=439458&r2=439459&view=diff
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-model/pom.xml (original)
+++ maven/shared/trunk/maven-user/maven-user-model/pom.xml Fri Sep  1 13:23:51 2006
@@ -35,20 +35,11 @@
     <dependency>
       <groupId>jpox</groupId>
       <artifactId>jpox</artifactId>
-      <version>1.1.1</version>
-      <scope>compile</scope>
-      <exclusions>
-        <!-- targeting JDK 1.4 we don't need this -->
-        <exclusion>
-          <groupId>javax.sql</groupId>
-          <artifactId>jdbc-stdext</artifactId>
-        </exclusion>
-      </exclusions>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
-      <version>1.7.3.3</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: maven/shared/trunk/maven-user/maven-user-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-webapp/pom.xml?rev=439459&r1=439458&r2=439459&view=diff
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-webapp/pom.xml (original)
+++ maven/shared/trunk/maven-user/maven-user-webapp/pom.xml Fri Sep  1 13:23:51 2006
@@ -63,9 +63,14 @@
       <version>1.0.1</version>
     </dependency>
     <dependency>
+      <groupId>jpox</groupId>
+      <artifactId>jpox</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
-      <version>1.7.3.3</version>
+      <scope>runtime</scope>
     </dependency>
   </dependencies>
 

Modified: maven/shared/trunk/maven-user/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/pom.xml?rev=439459&r1=439458&r2=439459&view=diff
==============================================================================
--- maven/shared/trunk/maven-user/pom.xml (original)
+++ maven/shared/trunk/maven-user/pom.xml Fri Sep  1 13:23:51 2006
@@ -108,6 +108,18 @@
         <version>1.1-alpha-2</version>
         <scope>runtime</scope>
       </dependency>
+      <dependency>
+        <groupId>jpox</groupId>
+        <artifactId>jpox</artifactId>
+        <version>1.1.1</version>
+        <exclusions>
+          <!-- targeting JDK 1.4 we don't need this -->
+          <exclusion>
+            <groupId>javax.sql</groupId>
+            <artifactId>jdbc-stdext</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -168,6 +180,12 @@
             <outputWebXml>${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml</outputWebXml> 
             -->
           </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>jspc-maven-plugin</artifactId>
+          <!-- later versions cause problems -->
+          <version>1.4.4</version>
         </plugin>
       </plugins>
     </pluginManagement>