From: Eric C. <ecr...@us...> - 2006-08-04 22:42:12
|
User: ecrutchfield Date: 06/08/04 15:42:11 Modified: andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/common pom.xml.vsl andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/conf andromda.xml.vsl andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2 pom.xml.vsl Log: fix depdencies and update to use version 3.2 Revision Changes Path 1.2 +1 -19 plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/common/pom.xml.vsl Index: pom.xml.vsl =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/common/pom.xml.vsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- pom.xml.vsl 5 Mar 2006 06:16:52 -0000 1.1 +++ pom.xml.vsl 4 Aug 2006 22:42:11 -0000 1.2 @@ -10,22 +10,4 @@ <artifactId>${applicationId}-common</artifactId> <packaging>pom</packaging> <name>${applicationName} Common</name> - <dependencies> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>${applicationId}-mda</artifactId> - <version>${pom.version}</version> - <type>pom</type> - <scope>runtime</scope> - <optional>true</optional> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.andromda.maven.plugins</groupId> - <artifactId>andromda-multi-source-plugin</artifactId> - </plugin> - </plugins> - </build> </project> \ No newline at end of file 1.8 +2 -4 plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/conf/andromda.xml.vsl Index: andromda.xml.vsl =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/conf/andromda.xml.vsl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -w -r1.7 -r1.8 --- andromda.xml.vsl 9 Apr 2006 18:02:12 -0000 1.7 +++ andromda.xml.vsl 4 Aug 2006 22:42:11 -0000 1.8 @@ -127,7 +127,6 @@ <property name="web_generated">${web.generated.dir}</property> <property name="web_manual">${web.manual.dir}</property> <property name="webAssemblyName">${applicationPackage}.web</property> - #if (${dotNetVersion}=="1.1") <property name="AssemblyTitle">${applicationName}</property> <property name="AssemblyDescription"></property> <property name="AssemblyConfiguration"></property> @@ -140,7 +139,6 @@ <property name="AssemblyDelaySign">true</property> <property name="AssemblyKeyFile"></property> <property name="AssemblyKeyName"></property> - #end </properties> </namespace> #end 1.3 +14 -14 plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/pom.xml.vsl Index: pom.xml.vsl =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/pom.xml.vsl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- pom.xml.vsl 6 Mar 2006 20:24:48 -0000 1.2 +++ pom.xml.vsl 4 Aug 2006 22:42:11 -0000 1.3 @@ -50,14 +50,14 @@ </dependency> <!-- Specify and configure our cartridges --> <dependency> - <groupId>andromda</groupId> + <groupId>org.andromda.cartridges</groupId> <artifactId>andromda-cs-cartridge</artifactId> <version>$andromdapluginsVersion</version> <type>jar</type> </dependency> #if ($web) <dependency> - <groupId>andromda</groupId> + <groupId>org.andromda.cartridges</groupId> <artifactId>andromda-aspdotnet-cartridge</artifactId> <version>$andromdapluginsVersion</version> <type>jar</type> @@ -65,7 +65,7 @@ #end #if ($nspring) <dependency> - <groupId>andromda</groupId> + <groupId>org.andromda.cartridges</groupId> <artifactId>andromda-nspring-cartridge</artifactId> <version>$andromdapluginsVersion</version> <type>jar</type> @@ -81,7 +81,7 @@ <version>$andromdaVersion</version> </dependency> <dependency> - <groupId>andromda</groupId> + <groupId>org.andromda.translationlibraries</groupId> <artifactId>andromda-ocl-query-library</artifactId> <version>$andromdaVersion</version> <type>jar</type> @@ -89,7 +89,7 @@ #end #if ($nhibernate) <dependency> - <groupId>andromda</groupId> + <groupId>org.andromda.cartridges</groupId> <artifactId>andromda-nhibernate-cartridge</artifactId> <version>$andromdapluginsVersion</version> <type>jar</type> @@ -137,14 +137,13 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>andromdapp-maven-plugin</artifactId> - <version>$andromdaVersion</version> + <artifactId>maven-clean-plugin</artifactId> + <version>2.1</version> </plugin> </plugins> </pluginManagement> </build> <modules> - <module>mda</module> <module>common</module> #if (${transactionPersistenceType} != "none") <module>core</module> @@ -155,6 +154,7 @@ #if ($webservice) <module>webservice</module> #end + <module>mda</module> </modules> <properties> <!-- @@ -203,7 +203,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>andromdapp-maven-plugin</artifactId> - <version>3.2-RC1-SNAPSHOT</version> + <version>3.2-SNAPSHOT</version> <!-- provides the injection of the script wrapper support into the class files (this should only be done when developing locally), uncomment this executions element to enable <executions> |
From: Eric C. <ecr...@us...> - 2006-09-17 17:43:47
|
User: ecrutchfield Date: 06/09/17 10:43:45 Modified: andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2 pom.xml.vsl Log: remove unnecessary dependencies... they're covered in mda/pom.xml Revision Changes Path 1.4 +0 -54 plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/pom.xml.vsl Index: pom.xml.vsl =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/pom.xml.vsl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -w -r1.3 -r1.4 --- pom.xml.vsl 4 Aug 2006 22:42:11 -0000 1.3 +++ pom.xml.vsl 17 Sep 2006 17:43:45 -0000 1.4 @@ -42,60 +42,6 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.andromda.profiles.uml14</groupId> - <artifactId>andromda-profile</artifactId> - <version>$andromdaVersion</version> - <type>xml.zip</type> - <scope>runtime</scope> - </dependency> - <!-- Specify and configure our cartridges --> - <dependency> - <groupId>org.andromda.cartridges</groupId> - <artifactId>andromda-cs-cartridge</artifactId> - <version>$andromdapluginsVersion</version> - <type>jar</type> - </dependency> -#if ($web) - <dependency> - <groupId>org.andromda.cartridges</groupId> - <artifactId>andromda-aspdotnet-cartridge</artifactId> - <version>$andromdapluginsVersion</version> - <type>jar</type> - </dependency> -#end -#if ($nspring) - <dependency> - <groupId>org.andromda.cartridges</groupId> - <artifactId>andromda-nspring-cartridge</artifactId> - <version>$andromdapluginsVersion</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>org.andromda.translationlibraries</groupId> - <artifactId>andromda-ocl-translation-core</artifactId> - <version>$andromdaVersion</version> - </dependency> - <dependency> - <groupId>org.andromda.translationlibraries</groupId> - <artifactId>andromda-ocl-validation-library</artifactId> - <version>$andromdaVersion</version> - </dependency> - <dependency> - <groupId>org.andromda.translationlibraries</groupId> - <artifactId>andromda-ocl-query-library</artifactId> - <version>$andromdaVersion</version> - <type>jar</type> - </dependency> -#end -#if ($nhibernate) - <dependency> - <groupId>org.andromda.cartridges</groupId> - <artifactId>andromda-nhibernate-cartridge</artifactId> - <version>$andromdapluginsVersion</version> - <type>jar</type> - </dependency> -#end - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>3.8.1</version> |