You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/10/23 10:27:26 UTC
svn commit: r587420 - in /maven/components/trunk: build.properties
maven-reporting-api/pom.xml pom.xml
Author: jvanzyl
Date: Tue Oct 23 01:27:25 2007
New Revision: 587420
URL: http://svn.apache.org/viewvc?rev=587420&view=rev
Log:
o dump doxia to release version
o put doxia into the depMan of the parent POM
Modified:
maven/components/trunk/build.properties
maven/components/trunk/maven-reporting-api/pom.xml
maven/components/trunk/pom.xml
Modified: maven/components/trunk/build.properties
URL: http://svn.apache.org/viewvc/maven/components/trunk/build.properties?rev=587420&r1=587419&r2=587420&view=diff
==============================================================================
--- maven/components/trunk/build.properties (original)
+++ maven/components/trunk/build.properties Tue Oct 23 01:27:25 2007
@@ -21,7 +21,7 @@
maven-artifact.version=3.0-SNAPSHOT
commons-cli.version=1.0
wagon.version=1.0-beta-2
-doxia.version=1.0-alpha-9-SNAPSHOT
+doxia.version=1.0-alpha-9
modello.version=1.0-alpha-17
junit.version=3.8.1
jdom.version=1.0
Modified: maven/components/trunk/maven-reporting-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-reporting-api/pom.xml?rev=587420&r1=587419&r2=587420&view=diff
==============================================================================
--- maven/components/trunk/maven-reporting-api/pom.xml (original)
+++ maven/components/trunk/maven-reporting-api/pom.xml Tue Oct 23 01:27:25 2007
@@ -44,7 +44,6 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sink-api</artifactId>
- <version>1.0-alpha-9</version>
</dependency>
</dependencies>
</project>
Modified: maven/components/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=587420&r1=587419&r2=587420&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Tue Oct 23 01:27:25 2007
@@ -16,7 +16,9 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---><project 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">
+-->
+<project 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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven</groupId>
@@ -28,14 +30,16 @@
<packaging>pom</packaging>
<name>Apache Maven</name>
<version>2.1-SNAPSHOT</version>
- <description>Maven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.</description>
+ <description>Maven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency
+ management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be
+ extended by plugins to utilise a number of other development tools for reporting or the build process.
+ </description>
<url>http://maven.apache.org/</url>
<inceptionYear>2001</inceptionYear>
<issueManagement>
<system>jira</system>
<url>http://jira.codehaus.org/browse/MNG</url>
</issueManagement>
-
<mailingLists>
<mailingList>
<name>Maven User List</name>
@@ -116,9 +120,9 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.3</version>
- <configuration>
+ <configuration>
<forkMode>never</forkMode>
- </configuration>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -191,7 +195,12 @@
<groupId>org.apache.maven.artifact</groupId>
<artifactId>maven-artifact</artifactId>
<version>3.0-SNAPSHOT</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-sink-api</artifactId>
+ <version>1.0-alpha-9</version>
+ </dependency>
<dependency>
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
@@ -206,48 +215,34 @@
<url>scp://people.apache.org/www/maven.apache.org/ref/${project.version}/</url>
</site>
</distributionManagement>
-
- <repositories>
- <repository>
- <id>org.codehaus</id>
- <name>Codehaus Snapshot Development Repository</name>
- <url>http://snapshots.repository.codehaus.org</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
-
- </repositories>
-
-
<profiles>
<profile>
<id>osgi</id>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- Needed for including the manifest, see MJAR-71 -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Needed for including the manifest, see MJAR-71 -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</profile>
<profile>
@@ -284,5 +279,4 @@
</modules>
</profile>
</profiles>
-
</project>