You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by fm...@apache.org on 2010/01/25 09:51:36 UTC
svn commit: r902731 -
/jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/pom.xml
Author: fmeschbe
Date: Mon Jan 25 08:51:35 2010
New Revision: 902731
URL: http://svn.apache.org/viewvc?rev=902731&view=rev
Log:
* Add Bundle profile and OSGi dependencies
* Upgrade Jackrabbit API dependency to 2.0.1.bundle-SNAPSHOT
Modified:
jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/pom.xml
Modified: jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/pom.xml?rev=902731&r1=902730&r2=902731&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/pom.xml (original)
+++ jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/pom.xml Mon Jan 25 08:51:35 2010
@@ -184,7 +184,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-api</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1.bundle-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
@@ -249,7 +249,6 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-benchmark</artifactId>
- <version>2.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -262,6 +261,28 @@
<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
<scope>test</scope>
</dependency>
+
+ <!-- Dependencies for OSGi/Sling bindings -->
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.jcr.api</artifactId>
+ <version>2.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.jcr.base</artifactId>
+ <version>2.0.4-incubator</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.2.0</version>
+ </dependency>
</dependencies>
<!--
@@ -492,5 +513,182 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>bundle</id>
+ <build>
+ <plugins>
+ <!-- generate the SCR descriptors -->
+ <!--
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ <version>1.4.0</version>
+ <executions>
+ <execution>
+ <id>generate-scr-scrdescriptor</id>
+ <goals>
+ <goal>scr</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ -->
+
+ <!--
+ copy the SCR descriptors into the correct location
+ because the maven-scr-plugin cannot be configured
+ to write the descriptors elsewhere
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>
+ ${project.build.outputDirectory}
+ </outputDirectory>
+ <encoding>UTF-8</encoding>
+ <resources>
+ <resource>
+ <directory>target/scr-plugin-generated</directory>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!--
+ copy the embedded libraries required for the embedded
+ Jackrabbit Repository
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>embed-dependencies</id>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>
+ commons-dbcp,commons-pool,lucene-core,concurrent<!-- ,xercesImpl -->
+ </includeArtifactIds>
+ <excludeTransitive>false</excludeTransitive>
+ <outputDirectory>
+ ${project.build.outputDirectory}
+ </outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.0.1</version>
+ <executions>
+ <execution>
+ <id>generate-manifest</id>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ <configuration>
+ <instructions>
+ <Note>Built by bundle profile</Note>
+ <Bundle-Category>
+ sling,jcr,jackrabbit
+ </Bundle-Category>
+ <Bundle-Activator>
+ org.apache.sling.jcr.jackrabbit.server.impl.Activator
+ </Bundle-Activator>
+ <Export-Package>
+ org.apache.sling.jcr.jackrabbit.server.security.*;version=2.0.4-incubator,
+ !org.apache.jackrabbit.core.embedded.impl.*;
+ org.apache.jackrabbit.core.embedded.*;
+ org.apache.jackrabbit.core.security.principal;version=2.0
+ </Export-Package>
+ <Private-Package>
+ org.apache.jackrabbit.core.embedded.impl.*,
+ org.apache.sling.jcr.jackrabbit.server.impl.*
+ </Private-Package>
+ <Import-Package>
+ <!-- Sling and OSGi -->
+ org.apache.sling.*, org.osgi.*,
+ <!-- JNDI, Security, Transactions -->
+ javax.naming.*,
+ javax.security.*,
+ javax.sql.*,
+ javax.transaction.xa,
+ <!-- Helpers -->
+ org.apache.commons.io.*,
+ org.apache.commons.collections.*,
+ <!-- JCR and Jackrabbit API -->
+ javax.jcr.*, org.apache.jackrabbit.api.*,
+ <!-- Logging -->
+ org.slf4j,
+ <!-- XML stuff -->
+ javax.xml.*, org.xml.sax.*, org.w3c.dom.*,
+ <!-- JAR Service Registry for Query -->
+ javax.imageio.spi,
+
+ <!-- Exclude package, see JCR-2412 -->
+ !org.apache.jackrabbit.test,
+ org.apache.jackrabbit.*,
+
+ <!-- playground imports -->
+ org.apache.tika.*,
+
+ <!-- Our default configuration uses derby, so import the driver -->
+ org.apache.derby.jdbc;resolution:=optional,
+
+ <!-- Required by concurrent lib SynchronizationTimer class -->
+ javax.swing.*;resolution:=optional
+ </Import-Package>
+ <!--
+ <DynamicImport-Package>*</DynamicImport-Package>
+ -->
+
+ <!-- Embedd some libraries -->
+ <Embed-Transitive>true</Embed-Transitive>
+ <Embed-Dependency>
+ commons-dbcp,
+ commons-pool,
+ lucene-core,
+ concurrent
+ </Embed-Dependency>
+ <_removeheaders>
+ Embed-Dependency,
+ Embed-Transitive,
+ Private-Package,
+ Include-Resource
+ </_removeheaders>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <archive>
+ <manifestFile>
+ ${project.build.outputDirectory}/META-INF/MANIFEST.MF
+ </manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>