Author: vsiveton
Date: Sat Sep 3 12:04:49 2011
New Revision: 1164849
URL: http://svn.apache.org/viewvc?rev=1164849&view=rev
Log:
o improved Maven build
o improved Eclipse layout
Modified:
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/.project
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/
(props changed)
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/
(props changed)
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/.project
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/feature/
(props changed)
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/feature/pom.xml
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/pom.xml
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/target-definition/
(props changed)
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/target-definition/pom.xml
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/pom.xml
Modified: maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/.project
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/.project?rev=1164849&r1=1164848&r2=1164849&view=diff
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/.project (original)
+++ maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/.project Sat Sep 3
12:04:49 2011
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>doxia-osgi</name>
+ <name>org.apache.maven.doxia.ide.eclipse.doxia-osgi</name>
<comment></comment>
<projects>
</projects>
Propchange:
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Sep 3 12:04:49 2011
@@ -0,0 +1 @@
+target
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=1164849&r1=1164848&r2=1164849&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 12:04:49 2011
@@ -18,215 +18,185 @@ 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/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.doxia.ide</groupId>
- <artifactId>doxia-osgi</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
<groupId>org.apache.maven.doxia.ide</groupId>
- <artifactId>dependencies</artifactId>
- <packaging>bundle</packaging>
- <name>Doxia Tools :: Eclipse IDE - Dependencies as Bundle</name>
- <description>Make an OSGi bundle of the required non-OSGi
components</description>
- <prerequisites>
- <maven>3.0.3</maven>
- </prerequisites>
- <properties>
- <doxiaVersion>1.2</doxiaVersion>
- <doxiaConverterVersion>1.2</doxiaConverterVersion>
- <maven-bundle-plugin-version>2.3.5</maven-bundle-plugin-version>
- <dollar>$</dollar>
- </properties>
- <dependencies>
- <!-- Doxia -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-converter</artifactId>
- <version>${doxiaConverterVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-core</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-sink-api</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-logging-api</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-apt</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-confluence</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-docbook-simple</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-fml</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-fo</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-itext</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-latex</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-rtf</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-twiki</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-xdoc</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-xhtml</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <dumpInstructions>target/dump.txt</dumpInstructions>
- <instructions>
- <stamp>$${tstamp}</stamp>
- <!-- hmm, has to be updated for releases -->
- <Bundle-Version>1.0.0.${stamp}</Bundle-Version>
- <!-- this should work better than the above, but does
not work
- at all
- <_snapshot>\${tstamp}</_snapshot>
- -->
- <!--
-
<Embed-Dependency>*;scope=compile|runtime;inline=true</Embed-Dependency>
- <Export-Package>
-
org.apache.maven.doxia.*;-split-package:=merge-first,org.codehaus.plexus.util,org.apache.commons.io,org.apache.commons.io.input,org.apache.commons.io.filefilter,org.apache.commons.io.output
- </Export-Package>
- -->
-
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
- <_exportcontents>
-
org.apache.maven.doxia.*,org.codehaus.plexus.util,org.apache.commons.io,org.apache.commons.io.input,org.apache.commons.io.filefilter,org.apache.commons.io.output
- </_exportcontents>
-
<Import-Package>!com.apple.mrj,!com.sun.*,!javax.*,!org.apache.commons.*,!org.apache.log,!org.apache.xmlbeans,!org.apache.tools.*,!org.apache.xml.*,!org.codehaus.*,!sun.*,*</Import-Package>
- <Embed-Transitive>true</Embed-Transitive>
- <_nouses>true</_nouses>
- <_nodefaultversion>true</_nodefaultversion>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.8</version>
- <configuration>
-
<projectNameTemplate>${project.groupId}-${project.artifactId}</projectNameTemplate>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>false</downloadJavadocs>
- <additionalBuildcommands>
-
<buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
-
<buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
-
<buildcommand>org.eclipse.pde.SchemaBuilder</buildcommand>
- </additionalBuildcommands>
- <additionalProjectnatures>
-
<projectnature>org.eclipse.pde.PluginNature</projectnature>
-
<projectnature>org.eclipse.jdt.core.javanature</projectnature>
- </additionalProjectnatures>
- <classpathContainers>
-
<classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
-
<classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
- </classpathContainers>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <lifecycleMappings>
- <lifecycleMapping>
- <packagingType>bundle</packagingType>
-
<lifecycleMappingId>org.sonatype.tycho.m2e.wrapperBundle</lifecycleMappingId>
- </lifecycleMapping>
- </lifecycleMappings>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.felix</groupId>
-
<artifactId>maven-bundle-plugin</artifactId>
-
<versionRange>${maven-bundle-plugin-version}</versionRange>
- <goals>
- <goal>bundle</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <configurator>
-
<id>org.sonatype.tycho.m2e.wrapperBundle</id>
- </configurator>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.felix</groupId>
-
<artifactId>maven-bundle-plugin</artifactId>
-
<versionRange>${maven-bundle-plugin-version}</versionRange>
- <goals>
- <goal>manifest</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore/>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- <plugin>
+ <artifactId>doxia-osgi</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.maven.doxia.ide</groupId>
+ <artifactId>dependencies</artifactId>
+ <packaging>bundle</packaging>
+
+ <name>Doxia Tools :: Eclipse IDE - Dependencies as Bundle</name>
+ <description>Make an OSGi bundle of the required non-OSGi
components</description>
+
+ <properties>
+ <doxiaVersion>1.1.2</doxiaVersion>
+ <doxiaConverterVersion>1.2</doxiaConverterVersion>
+ </properties>
+
+ <dependencies>
+ <!-- Doxia -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-converter</artifactId>
+ <version>${doxiaConverterVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-core</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-sink-api</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-logging-api</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-apt</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-confluence</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-docbook-simple</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-fml</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-fo</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-itext</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-latex</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-rtf</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-twiki</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-xdoc</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-xhtml</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+
<finalName>org.apache.maven.doxia.eclipse.dependencies_${project.version}</finalName>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <lifecycleMappings>
+ <lifecycleMapping>
+ <packagingType>bundle</packagingType>
+
<lifecycleMappingId>org.sonatype.tycho.m2e.wrapperBundle</lifecycleMappingId>
+ </lifecycleMapping>
+ </lifecycleMappings>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle-plugin-version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
<finalName>org.apache.maven.doxia.eclipse.dependencies_${project.version}</finalName>
- </build>
+ <versionRange>${maven-bundle-plugin-version}</versionRange>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <configurator>
+ <id>org.sonatype.tycho.m2e.wrapperBundle</id>
+ </configurator>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <versionRange>${maven-bundle-plugin-version}</versionRange>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <dumpInstructions>target/dump.txt</dumpInstructions>
+ <instructions>
+ <stamp>$${tstamp}</stamp>
+ <!-- hmm, has to be updated for releases -->
+ <Bundle-Version>1.0.0.${stamp}</Bundle-Version>
+ <!-- this should work better than the above, but does not work at
all
+ <_snapshot>\${tstamp}</_snapshot> -->
+ <!--
<Embed-Dependency>*;scope=compile|runtime;inline=true</Embed-Dependency>
+ <Export-Package>
org.apache.maven.doxia.*;-split-package:=merge-first,org.codehaus.plexus.util,org.apache.commons.io,org.apache.commons.io.input,org.apache.commons.io.filefilter,org.apache.commons.io.output
+ </Export-Package> -->
+ <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+ <_exportcontents>
+
org.apache.maven.doxia.*,org.codehaus.plexus.util,org.apache.commons.io,org.apache.commons.io.input,org.apache.commons.io.filefilter,org.apache.commons.io.output
+ </_exportcontents>
+
<Import-Package>!com.apple.mrj,!com.sun.*,!javax.*,!org.apache.commons.*,!org.apache.log,!org.apache.xmlbeans,!org.apache.tools.*,!org.apache.xml.*,!org.codehaus.*,!sun.*,*</Import-Package>
+ <Embed-Transitive>true</Embed-Transitive>
+ <_nouses>true</_nouses>
+ <_nodefaultversion>true</_nodefaultversion>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Propchange:
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Sep 3 12:04:49 2011
@@ -0,0 +1 @@
+target
Modified:
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/.project
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/.project?rev=1164849&r1=1164848&r2=1164849&view=diff
==============================================================================
---
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/.project
(original)
+++
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/.project
Sat Sep 3 12:04:49 2011
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>p2-repository</name>
+ <name>org.apache.maven.doxia.ide.eclipse.p2-repository</name>
<comment></comment>
<projects>
</projects>
Propchange:
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/feature/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Sep 3 12:04:49 2011
@@ -0,0 +1 @@
+target
Modified:
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/feature/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/feature/pom.xml?rev=1164849&r1=1164848&r2=1164849&view=diff
==============================================================================
---
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/feature/pom.xml
(original)
+++
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/feature/pom.xml
Sat Sep 3 12:04:49 2011
@@ -17,46 +17,51 @@ 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>
- <parent>
- <groupId>org.apache.maven.doxia.ide</groupId>
- <artifactId>p2-repository</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
-
<artifactId>org.apache.maven.doxia.ide.dependencies.temp.feature</artifactId>
- <packaging>eclipse-feature</packaging>
- <name>Doxia Tools :: Eclipse IDE - Feature containing dependency
bundle</name>
- <description>Put the bundle with the dependencies into
feature</description>
- <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 OSGi bundle for Eclipse
plugins</metadataRepositoryName>
- <artifactRepositoryName>Doxia OSGi bundle for Eclipse
plugins</artifactRepositoryName>
- <compressRepository>false</compressRepository>
- </configuration>
- </plugin>
- </plugins>
- </build>
+<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>
+ <groupId>org.apache.maven.doxia.ide</groupId>
+ <artifactId>p2-repository</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.maven.doxia.ide.dependencies.temp.feature</artifactId>
+ <packaging>eclipse-feature</packaging>
+
+ <name>Doxia Tools :: Eclipse IDE - Feature containing dependency
bundle</name>
+ <description>Put the bundle with the dependencies into feature</description>
+
+ <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 OSGi bundle for Eclipse
plugins</metadataRepositoryName>
+ <artifactRepositoryName>Doxia OSGi bundle for Eclipse
plugins</artifactRepositoryName>
+ <compressRepository>false</compressRepository>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
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=1164849&r1=1164848&r2=1164849&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 12:04:49 2011
@@ -18,60 +18,64 @@ 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/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.doxia.ide</groupId>
+ <artifactId>doxia-osgi</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.maven.doxia.ide</groupId>
+ <artifactId>p2-repository</artifactId>
+ <packaging>pom</packaging>
+
+ <name>Doxia Tools :: Eclipse IDE - P2 Feature and Repository containing
dependency bundle</name>
+ <description>Put the bundle with the dependencies into a feature and a P2
repository</description>
+
+ <properties>
+ <tycho-version>0.12.0</tycho-version>
+ </properties>
+
+ <dependencies>
+ <dependency>
<groupId>org.apache.maven.doxia.ide</groupId>
- <artifactId>doxia-osgi</artifactId>
+ <artifactId>dependencies</artifactId>
<version>1.0.0-SNAPSHOT</version>
- </parent>
- <groupId>org.apache.maven.doxia.ide</groupId>
- <artifactId>p2-repository</artifactId>
- <packaging>pom</packaging>
- <name>Doxia Tools :: Eclipse IDE - P2 Feature and Repository containing
dependency bundle</name>
- <description>Put the bundle with the dependencies into a feature and a P2
repository</description>
- <prerequisites>
- <maven>3.0.3</maven>
- </prerequisites>
- <properties>
- <tycho-version>0.12.0</tycho-version>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho-version}</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <resolver>p2</resolver>
- <pomDependencies>consider</pomDependencies>
- <target>
- <artifact>
- <groupId>${project.groupId}</groupId>
- <artifactId>target-definition</artifactId>
- <version>${project.version}</version>
- <classifier>helios</classifier>
- </artifact>
- </target>
- <ignoreTychoRepositories>true</ignoreTychoRepositories>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.doxia.ide</groupId>
- <artifactId>dependencies</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- <modules>
- <module>target-definition</module>
- <module>feature</module>
- </modules>
+ </dependency>
+ </dependencies>
+
+ <modules>
+ <module>feature</module>
+ <module>target-definition</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ <pomDependencies>consider</pomDependencies>
+ <target>
+ <artifact>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>target-definition</artifactId>
+ <version>${project.version}</version>
+ <classifier>helios</classifier>
+ </artifact>
+ </target>
+ <ignoreTychoRepositories>true</ignoreTychoRepositories>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Propchange:
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/target-definition/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Sep 3 12:04:49 2011
@@ -0,0 +1 @@
+target
Modified:
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/target-definition/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/target-definition/pom.xml?rev=1164849&r1=1164848&r2=1164849&view=diff
==============================================================================
---
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/target-definition/pom.xml
(original)
+++
maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi/p2-repository/target-definition/pom.xml
Sat Sep 3 12:04:49 2011
@@ -1,39 +1,60 @@
<?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
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+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/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>target-definition</artifactId>
- <packaging>pom</packaging>
- <name>Helios Target Definition</name>
- <parent>
- <groupId>org.apache.maven.doxia.ide</groupId>
- <artifactId>p2-repository</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>helios.target</file>
- <type>target</type>
- <classifier>helios</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.doxia.ide</groupId>
+ <artifactId>p2-repository</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>target-definition</artifactId>
+ <packaging>pom</packaging>
+ <name>Helios Target Definition</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>helios.target</file>
+ <type>target</type>
+ <classifier>helios</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
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=1164849&r1=1164848&r2=1164849&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
12:04:49 2011
@@ -1,25 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project>
- <modelVersion>4.0.0</modelVersion>
- <prerequisites>
- <maven>3.0.3</maven>
- </prerequisites>
- <parent>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-parent</artifactId>
- <version>21</version>
- <relativePath/>
- </parent>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+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/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <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>
-
<connection>scm:svn:https://svn.apache.org/repos/asf/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi</developerConnection>
-
<url>https://svn.apache.org/repos/asf/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi</url>
- </scm>
-<!-- DO NOT USE THIS POM. Tycho won't resolve through the reactor for the
bundle.
- Set up the invoker at some point -->
+ <artifactId>eclipse-parent</artifactId>
+ <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>
+
<connection>scm:svn:https://svn.apache.org/repos/asf/maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi</developerConnection>
+
<url>https://svn.apache.org/repos/asf/maven/sandbox/trunk/doxia/doxia-ide/eclipse/doxia-osgi</url>
+ </scm>
+<!--
+ DO NOT USE THIS POM.
+
+ Tycho won't resolve through the reactor for the bundle. Set up the invoker
at some point
+-->
+ <modules>
+<!-- <module>org.apache.maven.doxia.eclipse.dependencies</module> -->
+ <module>p2-repository</module>
+ </modules>
</project>
