cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r1543116 - in /cayenne/main/trunk: cayenne-di/pom.xml cayenne-server/pom.xml pom.xml
Date Mon, 18 Nov 2013 19:24:02 GMT
Author: aadamchik
Date: Mon Nov 18 19:24:02 2013
New Revision: 1543116

URL: http://svn.apache.org/r1543116
Log:
CAY-1882 Porting to OSGi environment

building OSGi manifests for Cayenne jars

Modified:
    cayenne/main/trunk/cayenne-di/pom.xml
    cayenne/main/trunk/cayenne-server/pom.xml
    cayenne/main/trunk/pom.xml

Modified: cayenne/main/trunk/cayenne-di/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/pom.xml?rev=1543116&r1=1543115&r2=1543116&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-di/pom.xml (original)
+++ cayenne/main/trunk/cayenne-di/pom.xml Mon Nov 18 19:24:02 2013
@@ -46,6 +46,28 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>  
+						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+					</archive> 
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>bundle-manifest</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>manifest</goal>
+						</goals>
+						<!-- TODO: should we hide .spi package? -->
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>

Modified: cayenne/main/trunk/cayenne-server/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/pom.xml?rev=1543116&r1=1543115&r2=1543116&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/pom.xml (original)
+++ cayenne/main/trunk/cayenne-server/pom.xml Mon Nov 18 19:24:02 2013
@@ -51,54 +51,62 @@
 		<dependency>
 			<groupId>com.caucho</groupId>
 			<artifactId>resin-hessian</artifactId>
+			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>jgroups</groupId>
 			<artifactId>jgroups-all</artifactId>
+			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>jivesoftware</groupId>
 			<artifactId>smack</artifactId>
+			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>jivesoftware</groupId>
 			<artifactId>smackx</artifactId>
+			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>opensymphony</groupId>
 			<artifactId>oscache</artifactId>
+			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>net.sf.ehcache</groupId>
 			<artifactId>ehcache-core</artifactId>
+			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>commons-dbcp</groupId>
 			<artifactId>commons-dbcp</artifactId>
+			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>commons-pool</groupId>
 			<artifactId>commons-pool</artifactId>
+			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
-
-		<!-- Provided Dependencies (those coming from environment) -->
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jms_1.1_spec</artifactId>
 			<scope>provided</scope>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jms_1.1_spec</artifactId>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
 			<scope>provided</scope>
+			<optional>true</optional>
 		</dependency>
 
 		<!-- Test dependencies -->
@@ -210,6 +218,28 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>  
+						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+					</archive> 
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>bundle-manifest</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>manifest</goal>
+						</goals>
+						<!-- TODO: export package filters. -->
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>

Modified: cayenne/main/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/pom.xml?rev=1543116&r1=1543115&r2=1543116&view=diff
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Mon Nov 18 19:24:02 2013
@@ -534,6 +534,19 @@
 								</pluginExecution>
 								<pluginExecution>
 									<pluginExecutionFilter>
+										<groupId>org.apache.felix</groupId>
+  										<artifactId>maven-bundle-plugin</artifactId>
+										<versionRange>[1.0,)</versionRange>
+										<goals>
+											<goal>manifest</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore />
+									</action>
+								</pluginExecution>
+								<pluginExecution>
+									<pluginExecutionFilter>
 										<groupId>com.agilejava.docbkx</groupId>
 										<artifactId>docbkx-maven-plugin</artifactId>
 										<versionRange>[1.0,)</versionRange>
@@ -683,6 +696,11 @@
 					<artifactId>maven-surefire-plugin</artifactId>
 					<version>2.5</version>
 				</plugin>
+				<plugin>   
+					<groupId>org.apache.felix</groupId>
+  					<artifactId>maven-bundle-plugin</artifactId>
+					<version>2.3.7</version>
+				</plugin>
 				<plugin>
 					<artifactId>maven-surefire-report-plugin</artifactId>
 					<version>2.8</version>



Mime
View raw message