Author: linus Date: 2011-09-04 01:55:44-0700 New Revision: 19718 Modified: trunk/src/argouml-app/pom.xml trunk/src/argouml-core-diagrams-activity2/pom.xml trunk/src/argouml-core-diagrams-class2/pom.xml trunk/src/argouml-core-diagrams-deployment2/pom.xml trunk/src/argouml-core-diagrams-sequence2/pom.xml trunk/src/argouml-core-diagrams-state2/pom.xml trunk/src/argouml-core-diagrams-structure2/pom.xml trunk/src/argouml-core-model-euml/pom.xml trunk/src/argouml-core-model-mdr/pom.xml trunk/src/argouml-core-model/pom.xml trunk/src/argouml-core-notation/pom.xml trunk/src/argouml-core-transformer/pom.xml trunk/src/argouml-core-umlpropertypanels/pom.xml
Log: Corrected the jar file names to the existing names instead of the project names. Modified: trunk/src/argouml-app/pom.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/pom.xml?view=diff&pathrev=19718&r1=19717&r2=19718 ============================================================================== --- trunk/src/argouml-app/pom.xml (original) +++ trunk/src/argouml-app/pom.xml 2011-09-04 01:55:44-0700 @@ -15,7 +15,7 @@ <relativePath>../..</relativePath> </parent> - <artifactId>argouml-app</artifactId> + <artifactId>argouml</artifactId> <properties> <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding> @@ -24,7 +24,7 @@ <dependencies> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-core-model</artifactId> + <artifactId>argouml-model</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> @@ -103,7 +103,7 @@ <!-- MDR things --> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-core-model-mdr</artifactId> + <artifactId>argouml-mdr</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> Modified: trunk/src/argouml-core-diagrams-activity2/pom.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/pom.xml?view=diff&pathrev=19718&r1=19717&r2=19718 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/pom.xml (original) +++ trunk/src/argouml-core-diagrams-activity2/pom.xml 2011-09-04 01:55:44-0700 @@ -15,7 +15,7 @@ <relativePath>../..</relativePath> </parent> - <artifactId>argouml-core-diagrams-activity2</artifactId> + <artifactId>argouml-diagrams-activity</artifactId> <properties> <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding> @@ -24,21 +24,21 @@ <dependencies> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-app</artifactId> + <artifactId>argouml</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-core-notation</artifactId> + <artifactId>argouml-notation</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-core-model</artifactId> + <artifactId>argouml-model</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> Modified: trunk/src/argouml-core-diagrams-class2/pom.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/pom.xml?view=diff&pathrev=19718&r1=19717&r2=19718 ============================================================================== --- trunk/src/argouml-core-diagrams-class2/pom.xml (original) +++ trunk/src/argouml-core-diagrams-class2/pom.xml 2011-09-04 01:55:44-0700 @@ -15,7 +15,7 @@ <relativePath>../..</relativePath> </parent> - <artifactId>argouml-core-diagrams-class2</artifactId> + <artifactId>argouml-diagrams-class</artifactId> <properties> <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding> @@ -24,7 +24,7 @@ <dependencies> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-core-model</artifactId> + <artifactId>argouml-model</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> Modified: trunk/src/argouml-core-diagrams-deployment2/pom.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-deployment2/pom.xml?view=diff&pathrev=19718&r1=19717&r2=19718 ============================================================================== --- trunk/src/argouml-core-diagrams-deployment2/pom.xml (original) +++ trunk/src/argouml-core-diagrams-deployment2/pom.xml 2011-09-04 01:55:44-0700 @@ -15,7 +15,7 @@ <relativePath>../..</relativePath> </parent> - <artifactId>argouml-core-diagrams-deployment2</artifactId> + <artifactId>argouml-diagrams-deployment</artifactId> <properties> <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding> @@ -24,21 +24,21 @@ <dependencies> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-app</artifactId> + <artifactId>argouml</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-core-notation</artifactId> + <artifactId>argouml-notation</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-core-model</artifactId> + <artifactId>argouml-model</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> Modified: trunk/src/argouml-core-diagrams-sequence2/pom.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/pom.xml?view=diff&pathrev=19718&r1=19717&r2=19718 ============================================================================== --- trunk/src/argouml-core-diagrams-sequence2/pom.xml (original) +++ trunk/src/argouml-core-diagrams-sequence2/pom.xml 2011-09-04 01:55:44-0700 @@ -15,7 +15,7 @@ <relativePath>../..</relativePath> </parent> - <artifactId>argouml-core-diagrams-sequence2</artifactId> + <artifactId>argouml-diagrams-sequence</artifactId> <properties> <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding> @@ -24,14 +24,14 @@ <dependencies> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-app</artifactId> + <artifactId>argouml</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-core-model</artifactId> + <artifactId>argouml-model</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> @@ -61,7 +61,7 @@ <!-- MDR things --> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-core-model-mdr</artifactId> + <artifactId>argouml-mdr</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> Modified: trunk/src/argouml-core-diagrams-state2/pom.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/pom.xml?view=diff&pathrev=19718&r1=19717&r2=19718 ============================================================================== --- trunk/src/argouml-core-diagrams-state2/pom.xml (original) +++ trunk/src/argouml-core-diagrams-state2/pom.xml 2011-09-04 01:55:44-0700 @@ -15,7 +15,7 @@ <relativePath>../..</relativePath> </parent> - <artifactId>argouml-core-diagrams-state2</artifactId> + <artifactId>argouml-diagrams-state</artifactId> <properties> <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding> @@ -24,21 +24,21 @@ <dependencies> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-app</artifactId> + <artifactId>argouml</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-core-notation</artifactId> + <artifactId>argouml-notation</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-core-model</artifactId> + <artifactId>argouml-model</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> Modified: trunk/src/argouml-core-diagrams-structure2/pom.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-structure2/pom.xml?view=diff&pathrev=19718&r1=19717&r2=19718 ============================================================================== --- trunk/src/argouml-core-diagrams-structure2/pom.xml (original) +++ trunk/src/argouml-core-diagrams-structure2/pom.xml 2011-09-04 01:55:44-0700 @@ -15,7 +15,7 @@ <relativePath>../..</relativePath> </parent> - <artifactId>argouml-core-diagrams-structure2</artifactId> + <artifactId>argouml-diagrams-structure</artifactId> <properties> <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding> @@ -24,21 +24,21 @@ <dependencies> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-app</artifactId> + <artifactId>argouml</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-core-notation</artifactId> + <artifactId>argouml-notation</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-core-model</artifactId> + <artifactId>argouml-model</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> Modified: trunk/src/argouml-core-model-euml/pom.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/pom.xml?view=diff&pathrev=19718&r1=19717&r2=19718 ============================================================================== --- trunk/src/argouml-core-model-euml/pom.xml (original) +++ trunk/src/argouml-core-model-euml/pom.xml 2011-09-04 01:55:44-0700 @@ -15,7 +15,7 @@ <relativePath>../..</relativePath> </parent> - <artifactId>argouml-core-model-euml</artifactId> + <artifactId>argouml-euml</artifactId> <properties> <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding> Modified: trunk/src/argouml-core-model-mdr/pom.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/pom.xml?view=diff&pathrev=19718&r1=19717&r2=19718 ============================================================================== --- trunk/src/argouml-core-model-mdr/pom.xml (original) +++ trunk/src/argouml-core-model-mdr/pom.xml 2011-09-04 01:55:44-0700 @@ -15,7 +15,7 @@ <relativePath>../..</relativePath> </parent> - <artifactId>argouml-core-model-mdr</artifactId> + <artifactId>argouml-mdr</artifactId> <properties> <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding> @@ -24,7 +24,7 @@ <dependencies> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-core-model</artifactId> + <artifactId>argouml-model</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> Modified: trunk/src/argouml-core-model/pom.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/pom.xml?view=diff&pathrev=19718&r1=19717&r2=19718 ============================================================================== --- trunk/src/argouml-core-model/pom.xml (original) +++ trunk/src/argouml-core-model/pom.xml 2011-09-04 01:55:44-0700 @@ -15,13 +15,26 @@ <relativePath>../..</relativePath> </parent> - <artifactId>argouml-core-model</artifactId> + <artifactId>argouml-model</artifactId> <properties> <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding> </properties> + <build> + <!-- This disables the tests that currently require + something that will cause a circular reference. + --> + <testSourceDirectory>${project.basedir}/dont-run-the-tests</testSourceDirectory> + <testResources> + <testResource> + <directory>${project.basedir}/dont-run-the-tests</directory> + </testResource> + </testResources> + </build> + <dependencies> + <!-- This is the circular reference for the tests. <dependency> <groupId>org.argouml</groupId> <artifactId>argouml-mdr</artifactId> @@ -30,6 +43,7 @@ <scope>test</scope> <optional>true</optional> </dependency> + --> <dependency> <groupId>org.argouml</groupId> Modified: trunk/src/argouml-core-notation/pom.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-notation/pom.xml?view=diff&pathrev=19718&r1=19717&r2=19718 ============================================================================== --- trunk/src/argouml-core-notation/pom.xml (original) +++ trunk/src/argouml-core-notation/pom.xml 2011-09-04 01:55:44-0700 @@ -15,7 +15,7 @@ <relativePath>../..</relativePath> </parent> - <artifactId>argouml-core-notation</artifactId> + <artifactId>argouml-notation</artifactId> <properties> <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding> @@ -24,14 +24,14 @@ <dependencies> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-app</artifactId> + <artifactId>argouml</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-core-model</artifactId> + <artifactId>argouml-model</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> Modified: trunk/src/argouml-core-transformer/pom.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-transformer/pom.xml?view=diff&pathrev=19718&r1=19717&r2=19718 ============================================================================== --- trunk/src/argouml-core-transformer/pom.xml (original) +++ trunk/src/argouml-core-transformer/pom.xml 2011-09-04 01:55:44-0700 @@ -15,7 +15,7 @@ <relativePath>../..</relativePath> </parent> - <artifactId>argouml-core-transformer</artifactId> + <artifactId>argouml-transformer</artifactId> <properties> <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding> @@ -24,14 +24,14 @@ <dependencies> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-app</artifactId> + <artifactId>argouml</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-core-model</artifactId> + <artifactId>argouml-model</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> Modified: trunk/src/argouml-core-umlpropertypanels/pom.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/pom.xml?view=diff&pathrev=19718&r1=19717&r2=19718 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/pom.xml (original) +++ trunk/src/argouml-core-umlpropertypanels/pom.xml 2011-09-04 01:55:44-0700 @@ -15,7 +15,7 @@ <relativePath>../..</relativePath> </parent> - <artifactId>argouml-core-umlpropertypanels</artifactId> + <artifactId>argouml-umlpropertypanels</artifactId> <properties> <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding> @@ -24,14 +24,14 @@ <dependencies> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-app</artifactId> + <artifactId>argouml</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.argouml</groupId> - <artifactId>argouml-core-model</artifactId> + <artifactId>argouml-model</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2835329 To unsubscribe from this discussion, e-mail: [[email protected]].
