db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r910623 - in /db/torque/torque4/trunk: maven-torque-generator-plugin/pom.xml torque-generator/pom.xml torque-maven-parent/pom.xml torque-runtime/pom.xml torque-templates/pom.xml
Date Tue, 16 Feb 2010 17:56:17 GMT
Author: tfischer
Date: Tue Feb 16 17:56:16 2010
New Revision: 910623

URL: http://svn.apache.org/viewvc?rev=910623&view=rev
Log:
- added maven parent to new poms
- update artifactIds in newly imported modules to reflect new folder name
- remove groupId, url and version from module poms as they are inherited from parent pom
- remove commented out version from pom
- move property project.build.sourceEncoding to parent pom and remove in module poms
- remove old maven-torque-plugin from modules as it does not build with the new generator
and add new module maven-torque-generator-plugin

Modified:
    db/torque/torque4/trunk/maven-torque-generator-plugin/pom.xml
    db/torque/torque4/trunk/torque-generator/pom.xml
    db/torque/torque4/trunk/torque-maven-parent/pom.xml
    db/torque/torque4/trunk/torque-runtime/pom.xml
    db/torque/torque4/trunk/torque-templates/pom.xml

Modified: db/torque/torque4/trunk/maven-torque-generator-plugin/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/maven-torque-generator-plugin/pom.xml?rev=910623&r1=910622&r2=910623&view=diff
==============================================================================
--- db/torque/torque4/trunk/maven-torque-generator-plugin/pom.xml (original)
+++ db/torque/torque4/trunk/maven-torque-generator-plugin/pom.xml Tue Feb 16 17:56:16 2010
@@ -21,14 +21,19 @@
     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">
+  <parent>
+    <groupId>org.apache.torque</groupId>
+    <artifactId>torque-maven-parent</artifactId>
+    <version>4.0-alpha1-SNAPSHOT</version>
+    <relativePath>../torque-maven-parent</relativePath>
+  </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.torque</groupId>
-  <artifactId>maven-torque-gf-plugin</artifactId>
+
+  <artifactId>maven-torque-generator-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.2-SNAPSHOT</version>
-  <name>Torque Generation Framework Maven 2 Plugin</name>
-  <url>http://db.apache.org/torque</url>
+  <name>Torque Generator Maven 2 Plugin</name>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -37,7 +42,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.torque</groupId>
-      <artifactId>torque-gf</artifactId>
+      <artifactId>torque-generator</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

Modified: db/torque/torque4/trunk/torque-generator/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/pom.xml?rev=910623&r1=910622&r2=910623&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/pom.xml (original)
+++ db/torque/torque4/trunk/torque-generator/pom.xml Tue Feb 16 17:56:16 2010
@@ -21,14 +21,19 @@
     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">
+  <parent>
+    <groupId>org.apache.torque</groupId>
+    <artifactId>torque-maven-parent</artifactId>
+    <version>4.0-alpha1-SNAPSHOT</version>
+    <relativePath>../torque-maven-parent</relativePath>
+  </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.torque</groupId>
-  <artifactId>torque-gf</artifactId>
+
+  <artifactId>torque-generator</artifactId>
   <packaging>jar</packaging>
-  <version>0.2-SNAPSHOT</version>
-  <name>Torque Generation Framework</name>
-  <url>http://db.apache.org/torque</url>
+  <name>Torque Generator</name>
+
   <dependencies>
     <dependency>
       <groupId>velocity</groupId>
@@ -66,17 +71,6 @@
       <version>1.3.1</version>
     </dependency>
 
-    <!--dependency>
-      <groupId>org.netbeans.mdr</groupId>
-      <artifactId>jmiutils</artifactId>
-      <version>200507110943</version>
-    </dependency>
-    <dependency>
-      <groupId>jmi</groupId>
-      <artifactId>jmiuml</artifactId>
-      <version>1.4di</version>
-    </dependency-->
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -153,24 +147,6 @@
           </execution>
         </executions>
       </plugin>
-      <!--plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptorRefs>
-            <descriptorRef>src</descriptorRef>
-          </descriptorRefs>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>assembly</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin-->
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
@@ -227,9 +203,4 @@
       </plugin>
     </plugins>
   </reporting>
-  
-  <properties>
-    <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
-  </properties>
-  
 </project>
\ No newline at end of file

Modified: db/torque/torque4/trunk/torque-maven-parent/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-maven-parent/pom.xml?rev=910623&r1=910622&r2=910623&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-maven-parent/pom.xml (original)
+++ db/torque/torque4/trunk/torque-maven-parent/pom.xml Tue Feb 16 17:56:16 2010
@@ -34,9 +34,9 @@
 
   <modules>
     <module>../torque-runtime</module>
-    <module>../maven-torque-plugin</module>
-    <module>../torque-templates</module>
     <module>../torque-generator</module>
+    <module>../torque-templates</module>
+    <module>../maven-torque-generator-plugin</module>
     <module>../torque-site</module>
   </modules>
 
@@ -465,6 +465,10 @@
     </snapshotRepository>
   </distributionManagement>
 
+  <properties>
+    <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
+  </properties>
+  
   <profiles>
     <profile>
       <id>release</id>

Modified: db/torque/torque4/trunk/torque-runtime/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/pom.xml?rev=910623&r1=910622&r2=910623&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/pom.xml (original)
+++ db/torque/torque4/trunk/torque-runtime/pom.xml Tue Feb 16 17:56:16 2010
@@ -33,7 +33,6 @@
   <artifactId>torque-runtime</artifactId>
   <packaging>jar</packaging>
   <name>Torque Runtime</name>
-  <url>http://db.apache.org/torque</url>
 
   <dependencies>
     <dependency>

Modified: db/torque/torque4/trunk/torque-templates/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/pom.xml?rev=910623&r1=910622&r2=910623&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/pom.xml (original)
+++ db/torque/torque4/trunk/torque-templates/pom.xml Tue Feb 16 17:56:16 2010
@@ -21,18 +21,23 @@
     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">
+  <parent>
+    <groupId>org.apache.torque</groupId>
+    <artifactId>torque-maven-parent</artifactId>
+    <version>4.0-alpha1-SNAPSHOT</version>
+    <relativePath>../torque-maven-parent</relativePath>
+  </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.torque</groupId>
-  <artifactId>templates-4-0</artifactId>
+
+  <artifactId>torque-templates</artifactId>
   <packaging>jar</packaging>
-  <version>0.2-SNAPSHOT</version>
   <name>Torque Templates</name>
-  <url>http://db.apache.org/torque</url>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.torque</groupId>
-      <artifactId>torque-gf</artifactId>
+      <artifactId>torque-generator</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>



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


Mime
View raw message