openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r778762 - in /openjpa/branches/1.3.x: ./ openjpa-all/ openjpa-examples/ openjpa-jdbc/ openjpa-kernel/ openjpa-lib/ openjpa-persistence-jdbc/ openjpa-persistence/ openjpa-slice/ openjpa-xmlstore/ openjpa/
Date Tue, 26 May 2009 15:45:10 GMT
Author: dwoods
Date: Tue May 26 15:45:09 2009
New Revision: 778762

URL: http://svn.apache.org/viewvc?rev=778762&view=rev
Log:
OPENJPA-1062 - Include OSGi bundle metadata.  Also merged in artifact scopes from trunk to
cleanup maven genereated depend info.

Modified:
    openjpa/branches/1.3.x/openjpa-all/pom.xml
    openjpa/branches/1.3.x/openjpa-examples/pom.xml
    openjpa/branches/1.3.x/openjpa-jdbc/pom.xml
    openjpa/branches/1.3.x/openjpa-kernel/pom.xml
    openjpa/branches/1.3.x/openjpa-lib/pom.xml
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml
    openjpa/branches/1.3.x/openjpa-persistence/pom.xml
    openjpa/branches/1.3.x/openjpa-slice/pom.xml
    openjpa/branches/1.3.x/openjpa-xmlstore/pom.xml
    openjpa/branches/1.3.x/openjpa/pom.xml
    openjpa/branches/1.3.x/pom.xml

Modified: openjpa/branches/1.3.x/openjpa-all/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-all/pom.xml?rev=778762&r1=778761&r2=778762&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-all/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-all/pom.xml Tue May 26 15:45:09 2009
@@ -62,12 +62,30 @@
                 </executions>
             </plugin>
 
+            <!--
+                create enhancer pre-main attribute
+            -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <archive>
+                        <!-- only if we're using maven-bundle-plugin
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        -->
+                        <!-- reset openjpa aggregate bundle metadata -->
+                        <manifest>
+                           <mainClass>org.apache.openjpa.conf.OpenJPAVersion</mainClass>
+                        </manifest>
+                        <manifestEntries>
+                            <Premain-Class>
+                                org.apache.openjpa.enhance.PCEnhancerAgent
+                            </Premain-Class>
+                            <Can-Redefine-Classes>true</Can-Redefine-Classes>
+                            <Specification-Title>JSR-317 Java Persistence</Specification-Title>
+                            <Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor>
+                            <Specification-Version>2.0</Specification-Version>
+                        </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>
@@ -81,6 +99,10 @@
                         <goals>
                             <goal>shade</goal>
                         </goals>
+                        <configuration>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                            <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -93,7 +115,7 @@
             <version>${pom.version}</version>
             <scope>provided</scope>
         </dependency>
-        <!-- 
+        <!--
             Only include the openjpa.jar required dependencies here, which
             will be used by maven-shade-plugin to determine the inclusions.
         -->

Modified: openjpa/branches/1.3.x/openjpa-examples/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-examples/pom.xml?rev=778762&r1=778761&r2=778762&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-examples/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-examples/pom.xml Tue May 26 15:45:09 2009
@@ -39,7 +39,6 @@
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
             <version>${pom.version}</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>

Modified: openjpa/branches/1.3.x/openjpa-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-jdbc/pom.xml?rev=778762&r1=778761&r2=778762&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-jdbc/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-jdbc/pom.xml Tue May 26 15:45:09 2009
@@ -38,7 +38,6 @@
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel</artifactId>
             <version>${pom.version}</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
@@ -60,5 +59,10 @@
             <version>8.3-603.jdbc3</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>ant</groupId>
+            <artifactId>ant</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

Modified: openjpa/branches/1.3.x/openjpa-kernel/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-kernel/pom.xml?rev=778762&r1=778761&r2=778762&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-kernel/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-kernel/pom.xml Tue May 26 15:45:09 2009
@@ -38,22 +38,18 @@
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-lib</artifactId>
             <version>${pom.version}</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jms_1.1_spec</artifactId>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.1_spec</artifactId>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>commons-pool</groupId>
             <artifactId>commons-pool</artifactId>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.ibm.websphere</groupId>
@@ -61,6 +57,11 @@
             <version>0.0.1</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>ant</groupId>
+            <artifactId>ant</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

Modified: openjpa/branches/1.3.x/openjpa-lib/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-lib/pom.xml?rev=778762&r1=778761&r2=778762&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-lib/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-lib/pom.xml Tue May 26 15:45:09 2009
@@ -42,32 +42,28 @@
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>ant</groupId>
             <artifactId>ant</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.sourceforge.serp</groupId>
             <artifactId>serp</artifactId>
-            <scope>compile</scope>
         </dependency>
     </dependencies>
     <build>

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml?rev=778762&r1=778761&r2=778762&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml Tue May 26 15:45:09 2009
@@ -77,11 +77,12 @@
                 <dependency>
                     <groupId>hsqldb</groupId>
                     <artifactId>hsqldb</artifactId>
-                    <version>1.8.0.7</version>
+                    <version>${hsqldb.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
-             <properties>
+            <properties>
+                <hsqldb.version>1.8.0.7</hsqldb.version>
                 <connection.driver.name>org.hsqldb.jdbcDriver</connection.driver.name>
                 <connection.url>jdbc:hsqldb:target/database/openjpa-hsqldb-database;create=true</connection.url>
                 <connection.username>sa</connection.username>
@@ -97,10 +98,12 @@
                 <dependency>
                     <groupId>mysql</groupId>
                     <artifactId>mysql-connector-java</artifactId>
-                    <version>5.1.5</version>
+                    <version>${mysql.version}</version>
+                    <scope>test</scope>
                 </dependency>
             </dependencies>
             <properties>
+                <mysql.version>5.1.5</mysql.version>
                 <connection.driver.name>com.mysql.jdbc.Driver</connection.driver.name>
                 <connection.url>${openjpa.mysql.url}</connection.url>
                 <connection.username>${openjpa.mysql.username}</connection.username>
@@ -116,11 +119,12 @@
                 <dependency>
                     <groupId>postgresql</groupId>
                     <artifactId>postgresql</artifactId>
-                    <version>8.3-603.jdbc3</version>
+                    <version>${postgresql.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
             <properties>
+                <postgresql.version>8.3-603.jdbc3</postgresql.version>
                 <connection.driver.name>org.postgresql.Driver</connection.driver.name>
                 <connection.url>${openjpa.postgresql.url}</connection.url>
                 <connection.username>${openjpa.postgresql.username}</connection.username>
@@ -194,7 +198,6 @@
         <!-- Profile for testing with SQLServer DB using the jTDS driver -->
         <profile>
             <id>test-sqlserver</id>
-            <activation><property><name>test-sqlserver</name></property></activation>
             <dependencies>
                 <dependency>
                     <groupId>net.sourceforge.jtds</groupId>
@@ -314,18 +317,18 @@
                 Example db2 profile. You can use this profile if you:
                 1) have the DB2 artifacts installed in a local repo and supply
                 the URL:
-                    -Ddb2.maven.repo=http://my.local.repo
+	            -Ddb2.maven.repo=http://my.local.repo
                 2) have a copy of the DB2 JCC driver and run the following
                 commands :
                     mvn install:install-file -Dfile=${path to db2jcc.jar} \
                                              -DgroupId=com.ibm.db2 \
-                                             -DartifactId=jcc-driver \
+                                             -DartifactId=jcc-driver \ 
                                              -Dversion=9.5 \
                                              -Dpackaging=jar
-
+                                         
                     mvn install:install-file -Dfile=${path to db2jcc_license.jar} \
                                              -DgroupId=com.ibm.db2 \
-                                             -DartifactId=jcc-license \
+                                             -DartifactId=jcc-license \ 
                                              -Dversion=9.5 \
                                              -Dpackaging=jar
 
@@ -334,22 +337,25 @@
                     -Dopenjpa.db2.username=<db2_uid>
                     -Dopenjpa.db2.password=<db2_pwd>
 
-                Optionally, you can override the default DB2 groupId and version
-                by also supplying the following properties:
+                Optionally, you can override the default DB2 groupId,
+                artifactIds and version by also supplying the following
+                properties:
                     -Ddb2.groupid=com.ibm.db2
+                    -Dids.driver.artifactid=jcc-driver
+                    -Dids.license.artifactid=jcc-license
                     -Ddb2.version=9.5
             -->
             <id>test-db2-jcc</id>
             <dependencies>
                 <dependency>
                     <groupId>${db2.groupid}</groupId>
-                    <artifactId>jcc-driver</artifactId>
+                    <artifactId>${db2.driver.artifactid}</artifactId>
                     <version>${db2.version}</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>${db2.groupid}</groupId>
-                    <artifactId>jcc-license</artifactId>
+                    <artifactId>${db2.license.artifactid}</artifactId>
                     <version>${db2.version}</version>
                     <scope>test</scope>
                 </dependency>
@@ -357,6 +363,8 @@
             <properties>
                 <db2.maven.repo>http://not.a.real.repository</db2.maven.repo>
                 <db2.groupid>com.ibm.db2</db2.groupid>
+                <db2.driver.artifactid>jcc-driver</db2.driver.artifactid>
+                <db2.license.artifactid>jcc-license</db2.license.artifactid>
                 <db2.version>9.5</db2.version>
                 <connection.driver.name>com.ibm.db2.jcc.DB2Driver</connection.driver.name>
                 <connection.url>${openjpa.db2.url}</connection.url>
@@ -381,18 +389,84 @@
         </profile>          
         <profile>
             <!-- 
+                Example Informix JCC profile. You can use this profile if you:
+                1a) have the DB2 JCC artifacts installed in a local repo and 
+                supply the URL:
+	            -Dids.maven.repo=http://my.local.repo
+                1b) or have a copy of the DB2 JCC driver and run the commands
+                listed above in the test-db2-jcc profile.
+		2) have the DRDA service enabled on the IDS server, which
+                is usually port 9089
+
+                You must also set the following properties:
+                    -Dopenjpa.ids.url=jdbc:ids://<HOST>:<PORT>/<DBNAME>
+                    -Dopenjpa.ids.username=<ids_uid>
+                    -Dopenjpa.ids.password=<ids_pwd>
+
+                Optionally, you can override the default DB2 JCC groupId,
+                artifactIds and version by also supplying the following
+                properties:
+                    -Dids.groupid=com.ibm.db2
+                    -Dids.driver.artifactid=jcc-driver
+                    -Dids.license.artifactid=jcc-license
+                    -Dids.version=9.5
+            -->
+            <id>test-ids-jcc</id>
+            <dependencies>
+                <dependency>
+                    <groupId>${ids.groupid}</groupId>
+                    <artifactId>${ids.driver.artifactid}</artifactId>
+                    <version>${ids.version}</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${ids.groupid}</groupId>
+                    <artifactId>${ids.license.artifactid}</artifactId>
+                    <version>${ids.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <ids.maven.repo>http://not.a.real.repository</ids.maven.repo>
+                <ids.groupid>com.ibm.db2</ids.groupid>
+                <ids.driver.artifactid>jcc-driver</ids.driver.artifactid>
+                <ids.license.artifactid>jcc-license</ids.license.artifactid>
+                <ids.version>9.5</ids.version>
+                <connection.driver.name>com.ibm.db2.jcc.DB2Driver</connection.driver.name>
+                <connection.url>${openjpa.ids.url}</connection.url>
+                <connection.username>${openjpa.ids.username}</connection.username>
+                <connection.password>${openjpa.ids.password}</connection.password>
+            </properties>
+            <repositories>
+                <repository>
+                    <id>ids.repository</id>
+                    <name>Informix Repository</name>
+                    <url>${ids.maven.repo}</url>
+                    <layout>default</layout>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                    <releases>
+                        <enabled>true</enabled>
+                        <checksumPolicy>ignore</checksumPolicy>
+                    </releases>
+                </repository>
+            </repositories>
+        </profile>          
+        <profile>
+            <!-- 
                 Example oracle profile. You can use this profile if you:
                 1) have the Oracle artifacts installed in a local repo and
                 supply the URL:
-                    -Doracle.maven.repo=http://my.local.repo
+	            -Doracle.maven.repo=http://my.local.repo
                 2) have a copy of the Oracle driver and run the following
                 command:
                     mvn install:install-file -Dfile=${path to ojdbc.jar} \
                                              -DgroupId=com.oracle \
-                                             -DartifactId=jdbc-driver \
+                                             -DartifactId=jdbc-driver \ 
                                              -Dversion=10g \
                                              -Dpackaging=jar
-
+                                         
                 You must also set the following properties:
                     -Dopenjpa.oracle.url
                     -Dopenjpa.oracle.username
@@ -407,7 +481,7 @@
             <dependencies>
                 <dependency>
                     <groupId>${oracle.groupid}</groupId>
-                    <artifactId>jdbc-driver</artifactId>
+                    <artifactId>${oracle.artifactid}</artifactId>
                     <version>${oracle.version}</version>
                     <scope>test</scope>
                 </dependency>
@@ -415,6 +489,7 @@
             <properties>
                 <oracle.maven.repo>http://not.a.real.repository</oracle.maven.repo>
                 <oracle.groupid>com.oracle</oracle.groupid>
+                <oracle.artifactid>jdbc-driver</oracle.artifactid>
                 <oracle.version>10g</oracle.version>
                 <connection.driver.name>oracle.jdbc.driver.OracleDriver</connection.driver.name>
                 <connection.url>${openjpa.oracle.url}</connection.url>
@@ -436,7 +511,8 @@
                     </releases>
                 </repository>
             </repositories>
-        </profile>  
+        </profile>
+          
     </profiles>
 
     <dependencies>
@@ -444,13 +520,11 @@
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-jdbc</artifactId>
             <version>${pom.version}</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence</artifactId>
             <version>${pom.version}</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>commons-dbcp</groupId>

Modified: openjpa/branches/1.3.x/openjpa-persistence/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence/pom.xml?rev=778762&r1=778761&r2=778762&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-persistence/pom.xml Tue May 26 15:45:09 2009
@@ -38,12 +38,10 @@
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel</artifactId>
             <version>${pom.version}</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jpa_3.0_spec</artifactId>
-            <scope>compile</scope>
         </dependency>
     </dependencies>
 </project>

Modified: openjpa/branches/1.3.x/openjpa-slice/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-slice/pom.xml?rev=778762&r1=778761&r2=778762&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-slice/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-slice/pom.xml Tue May 26 15:45:09 2009
@@ -45,13 +45,11 @@
 			<groupId>org.apache.openjpa</groupId>
 			<artifactId>openjpa-kernel</artifactId>
 			<version>${pom.version}</version>
-			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.openjpa</groupId>
 			<artifactId>openjpa-jdbc</artifactId>
 			<version>${pom.version}</version>
-			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
@@ -106,6 +104,7 @@
 					<groupId>mysql</groupId>
 					<artifactId>mysql-connector-java</artifactId>
 					<version>5.1.5</version>
+					<scope>test</scope>
 				</dependency>
 			</dependencies>
 			<properties>

Modified: openjpa/branches/1.3.x/openjpa-xmlstore/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-xmlstore/pom.xml?rev=778762&r1=778761&r2=778762&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-xmlstore/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-xmlstore/pom.xml Tue May 26 15:45:09 2009
@@ -38,7 +38,6 @@
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel</artifactId>
             <version>${pom.version}</version>
-            <scope>compile</scope>
         </dependency>
     </dependencies>
 </project>

Modified: openjpa/branches/1.3.x/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa/pom.xml?rev=778762&r1=778761&r2=778762&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa/pom.xml Tue May 26 15:45:09 2009
@@ -47,7 +47,7 @@
                 <executions>
                     <execution>
                         <id>build-single-jar</id>
-                        <phase>process-classes</phase>
+                        <phase>compile</phase>
                         <configuration>
                             <tasks>
                                 <unjar overwrite="false" dest="${basedir}/target/classes">
@@ -94,6 +94,7 @@
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                         <manifest>
                            <mainClass>org.apache.openjpa.conf.OpenJPAVersion</mainClass>
                         </manifest>
@@ -106,6 +107,41 @@
                     </archive>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>${artifactId}</Bundle-Name>
+                        <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
+                        <Bundle-DocURL>http://openjpa.apache.org/documentation.html</Bundle-DocURL>
+                        <Implementation-Title>Apache OpenJPA</Implementation-Title>
+                        <Implementation-Version>${project.version}</Implementation-Version>
+                        <Specification-Title>JSR-220 Java Persistence</Specification-Title>
+                        <Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor>
+                        <Specification-Version>1.0</Specification-Version>
+                        <!-- OSGi Bundle Metadata -->
+                        <Private-Package>org.openjpa.lib.ant*,org.apache.jdbc.ant*,META-INF*</Private-Package>
+                        <Export-Package>!META-INF*,!org.openjpa.lib.ant*,!org.apache.jdbc.ant*,org.apache.openjpa*</Export-Package>
+                        <Import-Package>com.ibm.*;resolution:=optional,org.postgresql.*;resolution:=optional,org.apache.tools.ant.*;resolution:=optional,org.apache.log4j.*;resolution:=optional,javax.activation.xa*;resolution:=optional,javax.jms.*;resolution:=optional,javax.transaction.*;resolution:=optional,javax.xml.bind.*;resolution:=optional,serp.*;resolution:=optional,*</Import-Package>
+                        <!-- Eclipse metadata -->
+                        <Eclipse-Autostart>false</Eclipse-Autostart>
+                        <Bundle-ClassPath>.</Bundle-ClassPath>
+                    </instructions>
+                    <unpackBundle>true</unpackBundle>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>bundle-manifest</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>manifest</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <dependencies>
@@ -146,6 +182,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-slice</artifactId>
+            <version>${pom.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>net.sourceforge.serp</groupId>
             <artifactId>serp</artifactId>
         </dependency>

Modified: openjpa/branches/1.3.x/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/pom.xml?rev=778762&r1=778761&r2=778762&view=diff
==============================================================================
--- openjpa/branches/1.3.x/pom.xml (original)
+++ openjpa/branches/1.3.x/pom.xml Tue May 26 15:45:09 2009
@@ -298,6 +298,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>2.2</version>
                         <executions>
                             <execution>
                                 <phase>process-classes</phase>
@@ -679,6 +680,11 @@
                     <artifactId>maven-shade-plugin</artifactId>
                     <version>1.2.1</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>1.4.3</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>



Mime
View raw message