From: <sha...@us...> - 2010-11-11 17:26:53
|
Revision: 2426 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2426&view=rev Author: shadowtm Date: 2010-11-11 17:26:47 +0000 (Thu, 11 Nov 2010) Log Message: ----------- Removed version numbers from child modules as they will inherit them from the parent - this was causing problems with the branch plugin and is the standard way to define our modules. Also moved the source pluging to the hudson_build profile so that way it will only be executed on the hudson server - this will save some time for developers when building the whole system. Removed Javadoc plugin as it was taking a lot of time and we aren't currently using that artifacts - we can add it back to the hudson_build profile in the future. When we release a version, the sources and javadoc plugins will run automatically so we need to make sure they don't run twice - that's why we only run them in the hudson_build profile. Modified Paths: -------------- trunk/autosparql/pom.xml trunk/components-core/pom.xml trunk/components-ext/pom.xml trunk/evalplugin/pom.xml trunk/interfaces/pom.xml trunk/pom.xml trunk/protege/pom.xml trunk/scripts/pom.xml trunk/sparql-query-generator/pom.xml Modified: trunk/autosparql/pom.xml =================================================================== --- trunk/autosparql/pom.xml 2010-11-10 22:27:24 UTC (rev 2425) +++ trunk/autosparql/pom.xml 2010-11-11 17:26:47 UTC (rev 2426) @@ -11,7 +11,6 @@ <artifactId>autosparql</artifactId> <packaging>war</packaging> <name>AutoSPARQL</name> - <version>1.0-SNAPSHOT</version> <dependencies> Modified: trunk/components-core/pom.xml =================================================================== --- trunk/components-core/pom.xml 2010-11-10 22:27:24 UTC (rev 2425) +++ trunk/components-core/pom.xml 2010-11-11 17:26:47 UTC (rev 2426) @@ -3,11 +3,10 @@ <groupId>org.dllearner</groupId> <artifactId>components-core</artifactId> - <version>1.0-SNAPSHOT</version> <packaging>jar</packaging> <name>DL Learner Core Components</name> - <url>http://maven.apache.org</url> + <url>http://aksw.org/Projects/DLLearner</url> <parent> <groupId>org.dllearner</groupId> Modified: trunk/components-ext/pom.xml =================================================================== --- trunk/components-ext/pom.xml 2010-11-10 22:27:24 UTC (rev 2425) +++ trunk/components-ext/pom.xml 2010-11-11 17:26:47 UTC (rev 2426) @@ -3,11 +3,11 @@ <groupId>org.dllearner</groupId> <artifactId>components-ext</artifactId> - <version>1.0-SNAPSHOT</version> <packaging>jar</packaging> <name>components-ext</name> - <url>http://maven.apache.org</url> + <url>http://aksw.org/Projects/DLLearner</url> + <parent> <groupId>org.dllearner</groupId> <artifactId>dllearner-parent</artifactId> Modified: trunk/evalplugin/pom.xml =================================================================== --- trunk/evalplugin/pom.xml 2010-11-10 22:27:24 UTC (rev 2425) +++ trunk/evalplugin/pom.xml 2010-11-11 17:26:47 UTC (rev 2426) @@ -3,11 +3,10 @@ <groupId>org.dllearner</groupId> <artifactId>evalplugin</artifactId> - <version>1.0-SNAPSHOT</version> <packaging>jar</packaging> <name>evalplugin</name> - <url>http://maven.apache.org</url> + <url>http://aksw.org/Projects/DLLearner</url> <parent> <groupId>org.dllearner</groupId> <artifactId>dllearner-parent</artifactId> Modified: trunk/interfaces/pom.xml =================================================================== --- trunk/interfaces/pom.xml 2010-11-10 22:27:24 UTC (rev 2425) +++ trunk/interfaces/pom.xml 2010-11-11 17:26:47 UTC (rev 2426) @@ -3,11 +3,9 @@ <groupId>org.dllearner</groupId> <artifactId>interfaces</artifactId> - <version>1.0-SNAPSHOT</version> <packaging>jar</packaging> - <name>Interfaces: GUI, CLI, Web Service </name> - <url>http://maven.apache.org</url> + <url>http://aksw.org/Projects/DLLearner</url> <parent> <groupId>org.dllearner</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-10 22:27:24 UTC (rev 2425) +++ trunk/pom.xml 2010-11-11 17:26:47 UTC (rev 2426) @@ -7,14 +7,11 @@ <version>1.0-SNAPSHOT</version> <packaging>pom</packaging> <name>DL Learner Parent Pom</name> - + <url>http://aksw.org/Projects/DLLearner</url> <properties> <!-- tell the compiler we can use 1.6 --> <compiler.version>1.6</compiler.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <dllearner.version>1.0-SNAPSHOT</dllearner.version> - <protege.version>1.0-SNAPSHOT</protege.version> - <evalplugin.version>1.0-SNAPSHOT</evalplugin.version> <!-- convenience to define GWT version in one place --> <gwt.version>2.1-SNAPSHOT</gwt.version> </properties> @@ -79,27 +76,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> + <version>2.1.2</version> </plugin> - <!--JAR the Java docs--> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> <version>2.1-SNAPSHOT</version> @@ -244,33 +223,33 @@ <dependency> <groupId>org.dllearner</groupId> <artifactId>components-core</artifactId> - <version>${dllearner.version}</version> + <version>${project.version}</version> </dependency> <!--This is the jar of the tests from components-core--> <dependency> <groupId>org.dllearner</groupId> <artifactId>components-core</artifactId> - <version>${dllearner.version}</version> + <version>${project.version}</version> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.dllearner</groupId> <artifactId>components-ext</artifactId> - <version>${dllearner.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.dllearner</groupId> <artifactId>interfaces</artifactId> - <version>${dllearner.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.dllearner</groupId> <artifactId>protege</artifactId> - <version>${protege.version}</version> + <version>${project.version}</version> </dependency> <dependency> @@ -403,4 +382,26 @@ </snapshotRepository> </distributionManagement> + + <profiles> + <profile> + <id>hudson_build</id> + <build> + <plugins> + <!--JAR the Sources--> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: trunk/protege/pom.xml =================================================================== --- trunk/protege/pom.xml 2010-11-10 22:27:24 UTC (rev 2425) +++ trunk/protege/pom.xml 2010-11-11 17:26:47 UTC (rev 2426) @@ -3,11 +3,10 @@ <groupId>org.dllearner</groupId> <artifactId>protege</artifactId> - <version>1.0-SNAPSHOT</version> <packaging>jar</packaging> <name>protege</name> - <url>http://maven.apache.org</url> + <url>http://aksw.org/Projects/DLLearner</url> <parent> <groupId>org.dllearner</groupId> Modified: trunk/scripts/pom.xml =================================================================== --- trunk/scripts/pom.xml 2010-11-10 22:27:24 UTC (rev 2425) +++ trunk/scripts/pom.xml 2010-11-11 17:26:47 UTC (rev 2426) @@ -3,11 +3,10 @@ <groupId>org.dllearner</groupId> <artifactId>scripts</artifactId> - <version>1.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Executable scripts </name> - <url>http://maven.apache.org</url> + <url>http://aksw.org/Projects/DLLearner</url> <parent> <groupId>org.dllearner</groupId> Modified: trunk/sparql-query-generator/pom.xml =================================================================== --- trunk/sparql-query-generator/pom.xml 2010-11-10 22:27:24 UTC (rev 2425) +++ trunk/sparql-query-generator/pom.xml 2010-11-11 17:26:47 UTC (rev 2426) @@ -8,9 +8,9 @@ <groupId>org.dllearner</groupId> <artifactId>sparql-query-generator</artifactId> - <version>1.0-SNAPSHOT</version> - - + <name>SPARQL Query Generator</name> + <url>http://aksw.org/Projects/DLLearner</url> + <build> <plugins> <!--Surefire - for JUnits--> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |