From: <bob...@us...> - 2010-12-03 19:04:53
|
Revision: 14686 http://andromda.svn.sourceforge.net/andromda/?rev=14686&view=rev Author: bobfields Date: 2010-12-03 19:04:46 +0000 (Fri, 03 Dec 2010) Log Message: ----------- Lots of dependency version updates, i.e. jboss hibernate spring testng. Merge with latest andromdapp changes. Specify latest versions for all plugins. Fix build failure when creating site documentation (specify site plugin version). Modified Paths: -------------- trunk/andromda-documentation/samples/timetracker/app/pom.xml trunk/andromda-documentation/samples/timetracker/core/pom.xml trunk/andromda-documentation/samples/timetracker/mda/src/main/config/andromda.xml trunk/andromda-documentation/samples/timetracker/pom.xml trunk/andromda-documentation/samples/timetracker/web/pom.xml Modified: trunk/andromda-documentation/samples/timetracker/app/pom.xml =================================================================== --- trunk/andromda-documentation/samples/timetracker/app/pom.xml 2010-12-01 11:29:53 UTC (rev 14685) +++ trunk/andromda-documentation/samples/timetracker/app/pom.xml 2010-12-03 19:04:46 UTC (rev 14686) @@ -34,7 +34,7 @@ <dependency> <groupId>commons-digester</groupId> <artifactId>commons-digester</artifactId> - <version>1.7</version> + <version>2.1</version> <exclusions> <exclusion> <groupId>xml-apis</groupId> @@ -84,7 +84,7 @@ <plugins> <plugin> <artifactId>maven-ear-plugin</artifactId> - <version>2.3</version> + <version>2.4.2</version> <configuration> <includes>**/*.xml</includes> <excludes>**/jboss-app.xml</excludes> Modified: trunk/andromda-documentation/samples/timetracker/core/pom.xml =================================================================== --- trunk/andromda-documentation/samples/timetracker/core/pom.xml 2010-12-01 11:29:53 UTC (rev 14685) +++ trunk/andromda-documentation/samples/timetracker/core/pom.xml 2010-12-03 19:04:46 UTC (rev 14686) @@ -19,26 +19,42 @@ <dependency> <groupId>org.andromda</groupId> <artifactId>andromda-core</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.andromda.translationlibraries</groupId> <artifactId>andromda-ocl-translation-core</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.andromda.translationlibraries</groupId> <artifactId>andromda-ocl-validation-library</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> + <artifactId>spring-orm</artifactId> </dependency> + <!-- Uncomment below if using JDBC or Test features> <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jdbc</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + </dependency--> + <dependency> <groupId>aopalliance</groupId> <artifactId>aopalliance</artifactId> </dependency> <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> + <artifactId>hibernate-annotations</artifactId> </dependency> <dependency> <groupId>commons-collections</groupId> @@ -65,6 +81,7 @@ <dependency> <groupId>org.andromda</groupId> <artifactId>andromda-script-wrappers</artifactId> + <scope>provided</scope> </dependency> --> </dependencies> @@ -90,6 +107,9 @@ <jdbcConnectionUrl>${jdbc.url}</jdbcConnectionUrl> <jdbcUsername>${jdbc.username}</jdbcUsername> <jdbcPassword>${jdbc.password}</jdbcPassword> + <!-- set this to false if you don't want to execute + the generated SQL scripts (creates and saves DDL under app/target/schema*.sql --> + <executeScripts>true</executeScripts> <properties> <property> <name>mappingsLocation</name> Modified: trunk/andromda-documentation/samples/timetracker/mda/src/main/config/andromda.xml =================================================================== --- trunk/andromda-documentation/samples/timetracker/mda/src/main/config/andromda.xml 2010-12-01 11:29:53 UTC (rev 14685) +++ trunk/andromda-documentation/samples/timetracker/mda/src/main/config/andromda.xml 2010-12-03 19:04:46 UTC (rev 14686) @@ -9,13 +9,21 @@ <port>4447</port> </server> <repositories> + <!--repository name="emf-uml22"> + <models> + <model type="emf-uml22"> + <uri>file:${project.basedir}/src/main/uml2/timetracker.uml</uri> + <moduleSearchLocations> + <location patterns="andromda*.uml,UML_*.uml">${project.basedir}/src/main/uml2</location--> <repository name="netBeansMDR"> <models> <model> <uri>${model.uri}</uri> <moduleSearchLocations> + <location patterns="**/src/main/uml/*.xml.zip">${project.basedir}/../../../../profiles/uml-1.4</location> <location patterns="**/${andromda.version}/*.xml.zip">${settings.localRepository}/org/andromda/profiles/uml14</location> <location patterns="**/*.xml">jar:file:${settings.localRepository}/org/omg/profiles/uml14/UML_Standard_Profile/1.0/UML_Standard_Profile-1.0.jar!/</location> + <location patterns="**/*.xml.zip">${settings.localRepository}/org/andromda/profiles/uml14</location> </moduleSearchLocations> </model> </models> Modified: trunk/andromda-documentation/samples/timetracker/pom.xml =================================================================== --- trunk/andromda-documentation/samples/timetracker/pom.xml 2010-12-01 11:29:53 UTC (rev 14685) +++ trunk/andromda-documentation/samples/timetracker/pom.xml 2010-12-03 19:04:46 UTC (rev 14686) @@ -9,27 +9,43 @@ <version>3.4-SNAPSHOT</version> <name>TimeTracker</name> <description>The TimeTracker Project.</description> + <inceptionYear>2003</inceptionYear> + <url>http://www.andromda.org</url> + <issueManagement> + <system>jira</system> + <url>http://jira.andromda.org/</url> + </issueManagement> <scm> - <connection></connection> - <url></url> + <connection>scm:svn:http://andromda.svn.sourceforge.net/svnroot/andromda/trunk</connection> + <developerConnection>scm:svn:https://andromda.svn.sourceforge.net/svnroot/andromda/trunk</developerConnection> + <url>http://andromda.svn.sourceforge.net/viewvc/andromda/trunk/</url> </scm> <organization> - <name></name> - <url></url> + <name>AndroMDA.org</name> + <url>http://www.andromda.org/</url> </organization> + <licenses> + <license> + <name>The AndroMDA Project</name> + <url>LICENSE.txt</url> + <distribution>repo</distribution> + <comments>AndroMDA runs under a BSD license</comments> + </license> + </licenses> <ciManagement> - <system></system> + <system>cruisecontrol</system> + <url>http://www.andromda.org/cruisecontrol</url> </ciManagement> <developers> <developer> - <id></id> + <id>nbhatia</id> <name>Naresh Bhatia</name> - <email></email> - <organization></organization> + <email>na...@an...</email> + <organization>AndroMDA</organization> <roles> <role>Developer</role> </roles> - <timezone></timezone> + <timezone>-5</timezone> </developer> </developers> <dependencyManagement> @@ -37,14 +53,14 @@ <dependency> <groupId>org.andromda.profiles.uml14</groupId> <artifactId>andromda-profile</artifactId> - <version>${project.version}</version> + <version>${andromda.version}</version> <type>xml.zip</type> <scope>runtime</scope> </dependency> <dependency> <groupId>org.andromda</groupId> <artifactId>andromda-core</artifactId> - <version>${project.version}</version> + <version>${andromda.version}</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -68,19 +84,19 @@ <dependency> <groupId>org.andromda.translationlibraries</groupId> <artifactId>andromda-ocl-translation-core</artifactId> - <version>${project.version}</version> + <version>${andromda.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.andromda.translationlibraries</groupId> <artifactId>andromda-ocl-validation-library</artifactId> - <version>${project.version}</version> + <version>${andromda.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.andromda.translationlibraries</groupId> <artifactId>andromda-ocl-query-library</artifactId> - <version>${project.version}</version> + <version>${andromda.version}</version> <scope>runtime</scope> </dependency> <!-- This dependency provides the ability to implement your @@ -89,7 +105,7 @@ <dependency> <groupId>org.andromda</groupId> <artifactId>andromda-script-wrappers</artifactId> - <version>${project.version}</version> + <version>${andromda.version}</version> <scope>runtime</scope> </dependency> <dependency> @@ -98,6 +114,11 @@ <version>1.8.3</version> </dependency> <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.4</version> + </dependency> + <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> <version>3.2.1</version> @@ -105,10 +126,15 @@ <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> - <version>1.2.1</version> + <version>1.2.2</version> <scope>runtime</scope> </dependency> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.0</version> + </dependency> + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> <version>2.5</version> @@ -127,7 +153,7 @@ <dependency> <groupId>commons-digester</groupId> <artifactId>commons-digester</artifactId> - <version>2.0</version> + <version>2.1</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -139,13 +165,14 @@ <dependency> <groupId>jboss</groupId> <artifactId>jboss-j2ee</artifactId> - <version>3.2.3</version> + <version>4.2.3.GA</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>3.2.6.ga</version> + <artifactId>hibernate-annotations</artifactId> + <version>3.5.6-Final</version> + <scope>provided</scope> </dependency> <dependency> <groupId>dom4j</groupId> @@ -155,8 +182,8 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> - <version>2.5.6</version> + <artifactId>spring-orm</artifactId> + <version>${spring.version}</version> <exclusions> <exclusion> <artifactId>servlet-api</artifactId> @@ -196,6 +223,22 @@ </exclusion> </exclusions> </dependency> + <!-- Uncomment out below if using JDBC or aop or spring test> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jdbc</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <version>${spring.version}</version> + </dependency --> <dependency> <groupId>aopalliance</groupId> <artifactId>aopalliance</artifactId> @@ -204,7 +247,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.4</version> + <version>2.5</version> <scope>provided</scope> </dependency> <dependency> @@ -216,13 +259,13 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> - <version>1.1.2</version> + <version>1.2</version> <scope>runtime</scope> </dependency> <dependency> <groupId>taglibs</groupId> <artifactId>standard</artifactId> - <version>1.1.1</version> + <version>1.1.2</version> <scope>runtime</scope> </dependency> <dependency> @@ -264,7 +307,7 @@ <dependency> <groupId>displaytag</groupId> <artifactId>displaytag</artifactId> - <version>1.0</version> + <version>1.2</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -306,9 +349,8 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>4.7</version> + <version>5.14.2</version> <scope>test</scope> - <classifier>jdk15</classifier> </dependency> <dependency> <groupId>log4j</groupId> @@ -319,7 +361,7 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.9</version> + <version>5.1.13</version> <scope>test</scope> </dependency> </dependencies> @@ -346,14 +388,35 @@ </executions> </plugin> <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>2.4.1</version> + <configuration> + <filesets> + <fileset> + <directory>${basedir}</directory> + <includes> + <include>*.exc</include> + <include>*.log</include> + </includes> + <excludes> + <!-- Allow mvn clean install > install.log --> + <exclude>build.log</exclude> + <exclude>install.log</exclude> + </excludes> + <followSymlinks>false</followSymlinks> + </fileset> + </filesets> + </configuration> + </plugin> + <plugin> <groupId>org.andromda.maven.plugins</groupId> <artifactId>andromda-maven-plugin</artifactId> - <version>${project.version}</version> + <version>${andromda.version}</version> </plugin> <plugin> <groupId>org.andromda.maven.plugins</groupId> <artifactId>andromdapp-maven-plugin</artifactId> - <version>${project.version}</version> + <version>${andromda.version}</version> </plugin> <plugin> <artifactId>maven-resources-plugin</artifactId> @@ -361,7 +424,7 @@ </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.1</version> + <version>2.3.2</version> <configuration> <source>1.5</source> <target>1.5</target> @@ -377,21 +440,39 @@ </configuration> </plugin> <plugin> - <artifactId>maven-clean-plugin</artifactId> - <version>2.4.1</version> - <configuration> - <filesets> - <fileset> - <directory>${basedir}</directory> - <includes> - <include>*.exc</include> - <include>*.log</include> - </includes> - <followSymlinks>false</followSymlinks> - </fileset> - </filesets> - </configuration> + <artifactId>maven-install-plugin</artifactId> + <version>2.3.1</version> </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>2.3.1</version> + </plugin> + <plugin> + <!-- Automatically attach sources to build artifact as artifact-version-sources.jar and deploy to local repository --> + <artifactId>maven-source-plugin</artifactId> + <version>2.1.2</version> + <executions> + <execution> + <id>attach-sources</id> + <phase>verify</phase> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.5</version> + </plugin> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <version>2.2</version> + <configuration> + <generateSitemap>true</generateSitemap> + <!--validate>true</validate--> + </configuration> + </plugin> </plugins> </pluginManagement> </build> @@ -446,6 +527,7 @@ <application.version>${project.version}</application.version> <dataSource.name>jdbc/${application.id}</dataSource.name> <dataSource>java:/${dataSource.name}</dataSource> + <spring.version>3.0.5.RELEASE</spring.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <profiles> @@ -522,7 +604,7 @@ <plugin> <groupId>org.andromda.maven.plugins</groupId> <artifactId>andromdapp-maven-plugin</artifactId> - <version>${project.version}</version> + <version>${andromda.version}</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> @@ -552,6 +634,31 @@ </locations> </configuration> </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3.2</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.6</version> + <configuration> + </configuration> + </plugin> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <version>2.2</version> + <!--dependencies> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-twiki</artifactId> + <version>1.1.3</version> + </dependency> + </dependencies--> + </plugin> </plugins> </pluginManagement> </build> @@ -570,7 +677,7 @@ <layout>default</layout> </repository> <repository> - <id>jboss</id> + <id>jboss-public</id> <name>JBoss Repository</name> <url>https://repository.jboss.org/nexus/content/repositories/public/</url> </repository> @@ -586,7 +693,7 @@ </repository> <repository> <id>Apache Snapshots</id> - <url>http://people.apache.org/repo/m2-snapshot-repository/</url> + <url>http://repository.apache.org/snapshots/</url> <snapshots> <enabled>true</enabled> </snapshots> @@ -596,6 +703,11 @@ </repository> </repositories> <pluginRepositories> + <pluginRepository> + <id>sonatype</id> + <name>Sonatype AndroMDA Repository</name> + <url>http://oss.sonatype.org/content/groups/public</url> + </pluginRepository> <pluginRepository> <id>andromda</id> <name>AndroMDA Repository</name> @@ -611,6 +723,13 @@ <enabled>false</enabled> </releases> </pluginRepository> + <pluginRepository> + <id>Apache Snapshots</id> + <url>http://repository.apache.org/snapshots/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> </pluginRepositories> <prerequisites> <maven>2.0.10</maven> @@ -640,18 +759,21 @@ <reportSets> <reportSet> <reports> + <report>cim</report> <report>dependencies</report> <report>dependency-convergence</report> <report>dependency-management</report> - <report>index </report> + <report>help</report> + <report>index</report> + <report>issue-tracking</report> + <report>license</report> + <report>mailing-list</report> + <report>modules</report> <report>plugin-management</report> - <report>summary</report> + <report>plugins</report> <report>project-team</report> - <report>mailing-list</report> - <report>cim</report> - <report>issue-tracking</report> - <report>license</report> <report>scm</report> + <report>summary</report> </reports> </reportSet> </reportSets> @@ -671,7 +793,7 @@ </plugin> <plugin> <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.5</version> + <version>2.6</version> </plugin> <plugin> <artifactId>maven-pmd-plugin</artifactId> @@ -704,7 +826,7 @@ </plugin> <plugin> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.5</version> + <version>2.6</version> <configuration> <configLocation>config/maven_checks.xml</configLocation> </configuration> @@ -721,8 +843,7 @@ <reportSet> <reports> <report>changes-report</report> - <!-- Uncomment if using JIRA --> - <!--report>jira-report</report--> + <report>jira-report</report> </reports> </reportSet> </reportSets> @@ -804,20 +925,21 @@ </formats> </configuration> </plugin> - <!-- Compare APIs to a previous version, uncomment when a release version exists --> - <!--plugin> + <!-- Compare APIs to a previous version> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>clirr-maven-plugin</artifactId> - <version>2.2.2</version> + <version>2.2.3</version> <inherited>true</inherited> <configuration> <minSeverity>info</minSeverity> + <comparisonVersion>3.3</comparisonVersion> </configuration> - </plugin--> + </plugin --> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>javancss-maven-plugin</artifactId> - <version>2.0-beta-2</version> + <version>2.0</version> <inherited>true</inherited> </plugin> <plugin> @@ -843,6 +965,20 @@ <findbugsXmlOutputDirectory>location of legacy xml format report</findbugsXmlOutputDirectory--> </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>versions-maven-plugin</artifactId> + <version>1.2</version> + <reportSets> + <reportSet> + <reports> + <report>dependency-updates-report</report> + <report>plugin-updates-report</report> + <report>property-updates-report</report> + </reports> + </reportSet> + </reportSets> + </plugin> <!--plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>dashboard-maven-plugin</artifactId> Modified: trunk/andromda-documentation/samples/timetracker/web/pom.xml =================================================================== --- trunk/andromda-documentation/samples/timetracker/web/pom.xml 2010-12-01 11:29:53 UTC (rev 14685) +++ trunk/andromda-documentation/samples/timetracker/web/pom.xml 2010-12-03 19:04:46 UTC (rev 14686) @@ -104,7 +104,7 @@ <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> + <version>1.6</version> <executions> <execution> <phase>process-resources</phase> @@ -133,7 +133,7 @@ </plugin> <plugin> <artifactId>maven-war-plugin</artifactId> - <version>2.1-beta-1</version> + <version>2.1.1</version> <configuration> <warSourceDirectory>target/src</warSourceDirectory> <excludes>**/*.java</excludes> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |