Author: cziegeler
Date: Tue Aug 24 06:50:45 2010
New Revision: 988404
URL: http://svn.apache.org/viewvc?rev=988404&view=rev
Log:
Some pom formatting, set export version and make dependencies provided
Modified:
sling/trunk/installer/jcr/jcrinstall/pom.xml
sling/trunk/installer/osgi/installer/pom.xml
sling/trunk/installer/osgi/it/pom.xml
Modified: sling/trunk/installer/jcr/jcrinstall/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/jcr/jcrinstall/pom.xml?rev=988404&r1=988403&r2=988404&view=diff
==============================================================================
--- sling/trunk/installer/jcr/jcrinstall/pom.xml (original)
+++ sling/trunk/installer/jcr/jcrinstall/pom.xml Tue Aug 24 06:50:45 2010
@@ -19,117 +19,124 @@
-->
<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.sling</groupId>
- <artifactId>sling</artifactId>
- <version>9</version>
- <relativePath>../../../../parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>org.apache.sling.jcr.jcrinstall</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <packaging>bundle</packaging>
-
- <name>Apache Sling JCR Installer</name>
- <description>
- Installs OSGi bundles and configurations
- found in the JCR repository.
- </description>
-
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/jcr/jcrinstall</connection>
- <developerConnection>
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/jcr/jcrinstall</developerConnection>
-
<url>http://svn.apache.org/viewvc/sling/trunk/installer/jcr/jcrinstall/</url>
- </scm>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <!-- As we're using JCR 2.0 for testing we explicitly have to
- import version 1.0 here -->
- <Import-Package>
- javax.jcr.*;version=1.0,*
- </Import-Package>
-
<Private-Package>org.apache.sling.jcr.jcrinstall.impl.*</Private-Package>
-
<Sling-Nodetypes>SLING-INF/nodetypes/osgiconfig.cnd</Sling-Nodetypes>
-
<Sling-Namespaces>sling=http://sling.apache.org/jcr/sling/1.0</Sling-Namespaces>
-
<Embed-Dependency>*;artifactId=org.apache.sling.commons.osgi</Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.jcr.api</artifactId>
- <version>2.0.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.osgi</artifactId>
- <version>2.0.6</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.11</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>0.9.20</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.testing</artifactId>
- <version>2.0.5-SNAPSHOT</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>9</version>
+ <relativePath>../../../../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.apache.sling.jcr.jcrinstall</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <name>Apache Sling JCR Installer</name>
+ <description>
+ Installs OSGi bundles and configurations
+ found in the JCR repository.
+ </description>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/jcr/jcrinstall</connection>
+ <developerConnection>
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/jcr/jcrinstall</developerConnection>
+
<url>http://svn.apache.org/viewvc/sling/trunk/installer/jcr/jcrinstall/</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <!-- As we're using JCR 2.0 for testing we explicitly
have to
+ import version 1.0 here -->
+ <Import-Package>
+ javax.jcr.*;version=1.0,*
+ </Import-Package>
+
<Private-Package>org.apache.sling.jcr.jcrinstall.impl.*</Private-Package>
+
<Sling-Nodetypes>SLING-INF/nodetypes/osgiconfig.cnd</Sling-Nodetypes>
+
<Sling-Namespaces>sling=http://sling.apache.org/jcr/sling/1.0</Sling-Namespaces>
+
<Embed-Dependency>*;artifactId=org.apache.sling.commons.osgi</Embed-Dependency>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.settings</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.osgi.installer</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.jcr.api</artifactId>
+ <version>2.0.6</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.osgi</artifactId>
+ <version>2.0.6</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.settings</artifactId>
- <version>0.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.osgi.installer</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.11</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Test -->
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>0.9.20</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.testing</artifactId>
+ <version>2.0.5-SNAPSHOT</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
</project>
Modified: sling/trunk/installer/osgi/installer/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/osgi/installer/pom.xml?rev=988404&r1=988403&r2=988404&view=diff
==============================================================================
--- sling/trunk/installer/osgi/installer/pom.xml (original)
+++ sling/trunk/installer/osgi/installer/pom.xml Tue Aug 24 06:50:45 2010
@@ -19,29 +19,29 @@
-->
<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.sling</groupId>
- <artifactId>sling</artifactId>
- <version>9</version>
- <relativePath>../../../parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>org.apache.sling.osgi.installer</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <packaging>bundle</packaging>
-
- <name>Apache Sling OSGi Installer</name>
- <description>
- Provides services to install OSGi bundles and configurations
- by supplying input streams and dictionaries.
- </description>
-
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/osgi/installer</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/osgi/installer</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/installer/osgi/installer</url>
- </scm>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>9</version>
+ <relativePath>../../../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.apache.sling.osgi.installer</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <name>Apache Sling OSGi Installer</name>
+ <description>
+ Provides services to install OSGi bundles and configurations
+ by supplying input streams and dictionaries.
+ </description>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/osgi/installer</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/osgi/installer</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/installer/osgi/installer</url>
+ </scm>
<build>
<plugins>
@@ -55,7 +55,7 @@
org.apache.sling.osgi.installer.impl.Activator
</Bundle-Activator>
<Export-Package>
-
org.apache.sling.osgi.installer
+
org.apache.sling.osgi.installer;version=3.0.0
</Export-Package>
<Private-Package>org.apache.sling.osgi.installer.impl.*</Private-Package>
<Embed-Dependency>
@@ -107,7 +107,7 @@
</plugin>
</plugins>
</build>
-
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
Modified: sling/trunk/installer/osgi/it/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/osgi/it/pom.xml?rev=988404&r1=988403&r2=988404&view=diff
==============================================================================
--- sling/trunk/installer/osgi/it/pom.xml (original)
+++ sling/trunk/installer/osgi/it/pom.xml Tue Aug 24 06:50:45 2010
@@ -32,25 +32,25 @@
<name>Apache Sling OSGi Installer Integration Tests</name>
<description>Integration tests of the Sling OSGi installer
bundle</description>
-
- <properties>
- <pax.exam.log.level>INFO</pax.exam.log.level>
- <!-- This can be set to activate remote debugging of the Pax Exam tests -->
- <pax.exam.debug.port></pax.exam.debug.port>
-
- <!-- BundleInstallStressTest parameters -->
-
<BundleInstallStressTest.default.bundles.folder>${project.build.directory}/bundle-install-stress-test-bundles</BundleInstallStressTest.default.bundles.folder>
-
<osgi.installer.BundleInstallStressTest.bundles.folder>${BundleInstallStressTest.default.bundles.folder}</osgi.installer.BundleInstallStressTest.bundles.folder>
-
<osgi.installer.BundleInstallStressTest.cycle.count>10</osgi.installer.BundleInstallStressTest.cycle.count>
-
<osgi.installer.BundleInstallStressTest.expect.timeout.seconds>30</osgi.installer.BundleInstallStressTest.expect.timeout.seconds>
-
- </properties>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/osgi/it</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/osgi/it</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/installer/osgi/it</url>
- </scm>
+ <properties>
+ <pax.exam.log.level>INFO</pax.exam.log.level>
+ <!-- This can be set to activate remote debugging of the Pax Exam
tests -->
+ <pax.exam.debug.port></pax.exam.debug.port>
+
+ <!-- BundleInstallStressTest parameters -->
+
<BundleInstallStressTest.default.bundles.folder>${project.build.directory}/bundle-install-stress-test-bundles</BundleInstallStressTest.default.bundles.folder>
+
<osgi.installer.BundleInstallStressTest.bundles.folder>${BundleInstallStressTest.default.bundles.folder}</osgi.installer.BundleInstallStressTest.bundles.folder>
+
<osgi.installer.BundleInstallStressTest.cycle.count>10</osgi.installer.BundleInstallStressTest.cycle.count>
+
<osgi.installer.BundleInstallStressTest.expect.timeout.seconds>30</osgi.installer.BundleInstallStressTest.expect.timeout.seconds>
+
+ </properties>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/osgi/it</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/osgi/it</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/installer/osgi/it</url>
+ </scm>
<repositories>
<repository>
