Author: hboutemy
Date: Sat Sep 3 15:30:12 2011
New Revision: 1164873
URL: http://svn.apache.org/viewvc?rev=1164873&view=rev
Log:
pom cleanup
Modified:
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/pom.xml
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/pom.xml
maven/sandbox/trunk/doxia/doxia-ide/eclipse/eclipse-plugins/features/pom.xml
maven/sandbox/trunk/doxia/doxia-ide/eclipse/eclipse-plugins/plugins/pom.xml
maven/sandbox/trunk/doxia/doxia-ide/eclipse/eclipse-plugins/pom.xml
maven/sandbox/trunk/doxia/doxia-ide/eclipse/pom.xml
Modified:
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml?rev=1164873&r1=1164872&r2=1164873&view=diff
==============================================================================
---
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml
(original)
+++
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml
Sat Sep 3 15:30:12 2011
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,6 +18,7 @@ KIND, either express or implied. See th
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/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
@@ -26,7 +28,6 @@ under the License.
<version>1.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.maven.doxia.ide</groupId>
<artifactId>dependencies</artifactId>
<packaging>bundle</packaging>
Modified:
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/pom.xml?rev=1164873&r1=1164872&r2=1164873&view=diff
==============================================================================
---
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/pom.xml
(original)
+++
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/pom.xml
Sat Sep 3 15:30:12 2011
@@ -26,7 +26,6 @@ under the License.
<version>1.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.maven.doxia.ide</groupId>
<artifactId>p2-repository</artifactId>
<packaging>pom</packaging>
Modified: maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/pom.xml?rev=1164873&r1=1164872&r2=1164873&view=diff
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/pom.xml (original)
+++ maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/pom.xml Sat Sep 3
15:30:12 2011
@@ -28,10 +28,10 @@ under the License.
<version>1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.maven.doxia.ide</groupId>
<artifactId>doxia-osgi</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
+
<description>Make an OSGi bundle consisting of Doxia, and put it in a P2
repo.</description>
<scm>
Modified:
maven/sandbox/trunk/doxia/doxia-ide/eclipse/eclipse-plugins/features/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-ide/eclipse/eclipse-plugins/features/pom.xml?rev=1164873&r1=1164872&r2=1164873&view=diff
==============================================================================
---
maven/sandbox/trunk/doxia/doxia-ide/eclipse/eclipse-plugins/features/pom.xml
(original)
+++
maven/sandbox/trunk/doxia/doxia-ide/eclipse/eclipse-plugins/features/pom.xml
Sat Sep 3 15:30:12 2011
@@ -19,7 +19,7 @@ specific language governing permissions
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/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -28,9 +28,9 @@ under the License.
<version>1.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.maven.doxia.ide</groupId>
<artifactId>features</artifactId>
<packaging>pom</packaging>
+
<name>Doxia Tools :: Eclipse IDE - Parent Features POM</name>
<description>Eclipse IDE - Parent Features POM</description>
@@ -47,35 +47,36 @@ under the License.
<modules>
<module>org.apache.maven.doxia.ide.eclipse.feature</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <deployableFeature>true</deployableFeature>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-plugin</artifactId>
- <version>${tycho-version}</version>
- <executions>
- <execution>
- <id>categorization</id>
- <phase>package</phase>
- <goals>
- <goal>category-p2-metadata</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <metadataRepositoryName>Doxia Editor
Plugins</metadataRepositoryName>
- <artifactRepositoryName>Doxia Editor
plugins</artifactRepositoryName>
- <compressRepository>false</compressRepository>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <deployableFeature>true</deployableFeature>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <executions>
+ <execution>
+ <id>categorization</id>
+ <phase>package</phase>
+ <goals>
+ <goal>category-p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <metadataRepositoryName>Doxia Editor Plugins</metadataRepositoryName>
+ <artifactRepositoryName>Doxia Editor plugins</artifactRepositoryName>
+ <compressRepository>false</compressRepository>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
maven/sandbox/trunk/doxia/doxia-ide/eclipse/eclipse-plugins/plugins/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-ide/eclipse/eclipse-plugins/plugins/pom.xml?rev=1164873&r1=1164872&r2=1164873&view=diff
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-ide/eclipse/eclipse-plugins/plugins/pom.xml
(original)
+++ maven/sandbox/trunk/doxia/doxia-ide/eclipse/eclipse-plugins/plugins/pom.xml
Sat Sep 3 15:30:12 2011
@@ -19,7 +19,7 @@ specific language governing permissions
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/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -28,9 +28,9 @@ under the License.
<version>1.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.maven.doxia.ide</groupId>
<artifactId>plugins</artifactId>
<packaging>pom</packaging>
+
<name>Doxia Tools :: Eclipse IDE - Parent Plugins POM</name>
<description>Eclipse IDE - Parent Plugins POM</description>
Modified: maven/sandbox/trunk/doxia/doxia-ide/eclipse/eclipse-plugins/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-ide/eclipse/eclipse-plugins/pom.xml?rev=1164873&r1=1164872&r2=1164873&view=diff
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-ide/eclipse/eclipse-plugins/pom.xml
(original)
+++ maven/sandbox/trunk/doxia/doxia-ide/eclipse/eclipse-plugins/pom.xml Sat Sep
3 15:30:12 2011
@@ -19,7 +19,7 @@ specific language governing permissions
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/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,10 +29,10 @@ under the License.
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.maven.doxia.ide</groupId>
<artifactId>eclipse-plugins</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
+
<description>The eclipse plugins, features, and update site are
here.</description>
<properties>
Modified: maven/sandbox/trunk/doxia/doxia-ide/eclipse/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-ide/eclipse/pom.xml?rev=1164873&r1=1164872&r2=1164873&view=diff
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-ide/eclipse/pom.xml (original)
+++ maven/sandbox/trunk/doxia/doxia-ide/eclipse/pom.xml Sat Sep 3 15:30:12 2011
@@ -132,16 +132,16 @@ under the License.
<build>
<pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.2.1</version>
- <configuration>
-
<tagBase>https://svn.apache.org/repos/asf/maven/sandbox/tags</tagBase>
-
<branchBase>https://svn.apache.org/repos/asf/maven/sandbox/branches</branchBase>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.2.1</version>
+ <configuration>
+
<tagBase>https://svn.apache.org/repos/asf/maven/sandbox/tags</tagBase>
+
<branchBase>https://svn.apache.org/repos/asf/maven/sandbox/branches</branchBase>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
