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/11 17:21:53 UTC
svn commit: r773601 - in /openjpa/trunk: 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: Mon May 11 15:21:52 2009
New Revision: 773601
URL: http://svn.apache.org/viewvc?rev=773601&view=rev
Log:
OPENJPA-1063 Create a new openjpa-all artifact to include runtime depends. Matches changes made to branches/1.3.x.
Added:
openjpa/trunk/openjpa/
openjpa/trunk/openjpa/pom.xml (with props)
Modified:
openjpa/trunk/openjpa-all/pom.xml
openjpa/trunk/openjpa-integration/tck/pom.xml
openjpa/trunk/openjpa-project/assembly.xml
openjpa/trunk/openjpa-project/pom.xml
openjpa/trunk/pom.xml
Modified: openjpa/trunk/openjpa-all/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-all/pom.xml?rev=773601&r1=773600&r2=773601&view=diff
==============================================================================
--- openjpa/trunk/openjpa-all/pom.xml (original)
+++ openjpa/trunk/openjpa-all/pom.xml Mon May 11 15:21:52 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/trunk/openjpa-integration/tck/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/tck/pom.xml?rev=773601&r1=773600&r2=773601&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/tck/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/tck/pom.xml Mon May 11 15:21:52 2009
@@ -175,7 +175,7 @@
</concat>
<path id="agent.path">
- <fileset dir="../../openjpa-all/target">
+ <fileset dir="../../openjpa/target">
<include name="*.jar" />
</fileset>
</path>
Modified: openjpa/trunk/openjpa-project/assembly.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/assembly.xml?rev=773601&r1=773600&r2=773601&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/assembly.xml (original)
+++ openjpa/trunk/openjpa-project/assembly.xml Mon May 11 15:21:52 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/trunk/openjpa-project/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/pom.xml?rev=773601&r1=773600&r2=773601&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/pom.xml (original)
+++ openjpa/trunk/openjpa-project/pom.xml Mon May 11 15:21:52 2009
@@ -437,6 +437,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>
Added: openjpa/trunk/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa/pom.xml?rev=773601&view=auto
==============================================================================
--- openjpa/trunk/openjpa/pom.xml (added)
+++ openjpa/trunk/openjpa/pom.xml Mon May 11 15:21:52 2009
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!--
+ Please keep the project tag on one line to avoid confusing
+ the release plugin.
+-->
+<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>
+ <packaging>jar</packaging>
+ <name>OpenJPA Aggregate Jar</name>
+ <parent>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <build>
+ <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).
+ -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-single-jar</id>
+ <phase>process-classes</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="*/target/openjpa-all-*.jar" />
+ <exclude name="**/*-sources.jar" />
+ <exclude name="**/*-javadoc.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>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </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>
+ </archive>
+ </configuration>
+ </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>
+ <version>${pom.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.serp</groupId>
+ <artifactId>serp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Propchange: openjpa/trunk/openjpa/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=773601&r1=773600&r2=773601&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Mon May 11 15:21:52 2009
@@ -95,10 +95,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>
@@ -646,6 +647,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.2</version>
</plugin>