You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2009/05/06 16:48:36 UTC
svn commit: r772288 - in /openjpa/branches/1.3.x: openjpa-all/pom.xml
openjpa-integration/tck/pom.xml openjpa-project/assembly.xml
openjpa-project/pom.xml openjpa/ openjpa/pom.xml pom.xml
Author: dwoods
Date: Wed May 6 14:48:35 2009
New Revision: 772288
URL: http://svn.apache.org/viewvc?rev=772288&view=rev
Log:
OPENJPA-1063 Create a new openjpa-all artifact to include runtime depends
Added:
openjpa/branches/1.3.x/openjpa/
- copied from r772266, openjpa/branches/1.3.x/openjpa-all/
Modified:
openjpa/branches/1.3.x/openjpa-all/pom.xml
openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml
openjpa/branches/1.3.x/openjpa-project/assembly.xml
openjpa/branches/1.3.x/openjpa-project/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=772288&r1=772287&r2=772288&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-all/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-all/pom.xml Wed May 6 14:48:35 2009
@@ -23,9 +23,9 @@
-->
<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>
- <artifactId>openjpa</artifactId>
+ <artifactId>openjpa-all</artifactId>
<packaging>jar</packaging>
- <name>OpenJPA Aggregate Jar</name>
+ <name>OpenJPA with Dependencies Aggregate Jar</name>
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
@@ -36,46 +36,23 @@
<plugins>
<plugin>
<!--
- Manually build an aggregate jar of all the other
- openjpa-* jars using ant. We cannot use the assembly
- plugin, since it doesn't provide support for appending
- multiple same-named files to each other (which is
- required for correctly aggregating services files).
+ Manually extract the OpenJPA aggregate jar as the
+ maven-shade-plugin requires an existing jar to work
+ against....
-->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>build-single-jar</id>
- <phase>process-classes</phase>
+ <phase>compile</phase>
<configuration>
<tasks>
<unjar overwrite="false" dest="${basedir}/target/classes">
- <fileset dir="${basedir}/..">
- <include name="*/target/openjpa-*.jar" />
- <exclude name="*/target/openjpa-examples-*.jar" />
- <exclude name="**/*-sources.jar" />
- <exclude name="**/*-javadoc.jar" />
+ <fileset dir="${basedir}/../openjpa">
+ <include name="target/openjpa-${project.version}.jar" />
</fileset>
</unjar>
-
- <!--
- need to manually concatinate the services
- resources so they are aggregated
- -->
- <macrodef name="aggregate-file">
- <attribute name="servicename" />
- <sequential>
- <echo>Building service: @{servicename}</echo>
- <concat destfile="${basedir}/target/classes/META-INF/services/@{servicename}">
- <fileset dir="${basedir}/.." includes="*/src/main/resources/META-INF/services/@{servicename}" />
- </concat>
- </sequential>
- </macrodef>
-
- <aggregate-file servicename="org.apache.openjpa.lib.conf.ProductDerivation" />
- <aggregate-file servicename="javax.persistence.spi.PersistenceProvider" />
- <aggregate-file servicename="org.apache.openjpa.kernel.exps.ExpressionParser" />
</tasks>
</configuration>
<goals>
@@ -85,65 +62,41 @@
</executions>
</plugin>
- <!--
- create enhancer pre-main attribute
- -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
- <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>
- </manifestEntries>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-lib</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-kernel</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-jdbc</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-persistence</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-persistence-jdbc</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-xmlstore</artifactId>
+ <artifactId>openjpa</artifactId>
<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.
+ -->
<dependency>
<groupId>net.sourceforge.serp</groupId>
<artifactId>serp</artifactId>
Modified: openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml?rev=772288&r1=772287&r2=772288&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml Wed May 6 14:48:35 2009
@@ -176,7 +176,7 @@
</concat>
<path id="agent.path">
- <fileset dir="../../openjpa-all/target">
+ <fileset dir="../../openjpa/target">
<include name="*.jar" />
</fileset>
</path>
Modified: openjpa/branches/1.3.x/openjpa-project/assembly.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-project/assembly.xml?rev=772288&r1=772287&r2=772288&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-project/assembly.xml (original)
+++ openjpa/branches/1.3.x/openjpa-project/assembly.xml Wed May 6 14:48:35 2009
@@ -80,6 +80,7 @@
<scope>runtime</scope>
<includes>
<include>org.apache.openjpa:openjpa</include>
+ <include>org.apache.openjpa:openjpa-all</include>
</includes>
</dependencySet>
<dependencySet>
Modified: openjpa/branches/1.3.x/openjpa-project/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-project/pom.xml?rev=772288&r1=772287&r2=772288&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-project/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-project/pom.xml Wed May 6 14:48:35 2009
@@ -433,6 +433,11 @@
<artifactId>openjpa</artifactId>
<version>${pom.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-all</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
<!-- included so we can include it in the distribution -->
<dependency>
Modified: openjpa/branches/1.3.x/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa/pom.xml?rev=772288&r1=772266&r2=772288&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa/pom.xml Wed May 6 14:48:35 2009
@@ -54,6 +54,7 @@
<fileset dir="${basedir}/..">
<include name="*/target/openjpa-*.jar" />
<exclude name="*/target/openjpa-examples-*.jar" />
+ <exclude name="*/target/openjpa-all-*.jar" />
<exclude name="**/*-sources.jar" />
<exclude name="**/*-javadoc.jar" />
</fileset>
Modified: openjpa/branches/1.3.x/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/pom.xml?rev=772288&r1=772287&r2=772288&view=diff
==============================================================================
--- openjpa/branches/1.3.x/pom.xml (original)
+++ openjpa/branches/1.3.x/pom.xml Wed May 6 14:48:35 2009
@@ -94,10 +94,11 @@
<module>openjpa-persistence-jdbc</module>
<module>openjpa-xmlstore</module>
<module>openjpa-slice</module>
- <module>openjpa-all</module>
+ <module>openjpa</module>
<module>openjpa-project</module>
<module>openjpa-examples</module>
<module>openjpa-integration</module>
+ <module>openjpa-all</module>
</modules>
<profiles>
<profile>
@@ -673,6 +674,11 @@
<artifactId>ianal-maven-plugin</artifactId>
<version>1.0-alpha-1</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.2.1</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>