You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2010/11/15 19:15:26 UTC
svn commit: r1035385 - in /openejb/branches/openejb-3.1.x:
container/openejb-activemq4/pom.xml container/openejb-core/pom.xml
container/openejb-spring/pom.xml pom.xml server/openejb-ejbd/pom.xml
server/openejb-http/pom.xml server/openejb-webadmin/pom.xml
Author: dblevins
Date: Mon Nov 15 18:15:25 2010
New Revision: 1035385
URL: http://svn.apache.org/viewvc?rev=1035385&view=rev
Log:
Patch from Stephen Connolly, OPENEJB-1398: Use dependency:copy-dependencies to copy dependencies from the reactor
Thanks, Stephen!
Modified:
openejb/branches/openejb-3.1.x/container/openejb-activemq4/pom.xml
openejb/branches/openejb-3.1.x/container/openejb-core/pom.xml
openejb/branches/openejb-3.1.x/container/openejb-spring/pom.xml
openejb/branches/openejb-3.1.x/pom.xml
openejb/branches/openejb-3.1.x/server/openejb-ejbd/pom.xml
openejb/branches/openejb-3.1.x/server/openejb-http/pom.xml
openejb/branches/openejb-3.1.x/server/openejb-webadmin/pom.xml
Modified: openejb/branches/openejb-3.1.x/container/openejb-activemq4/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-activemq4/pom.xml?rev=1035385&r1=1035384&r2=1035385&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/container/openejb-activemq4/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/container/openejb-activemq4/pom.xml Mon Nov 15 18:15:25 2010
@@ -59,17 +59,14 @@
<id>copy</id>
<phase>process-resources</phase>
<goals>
- <goal>copy</goal>
+ <goal>copy-dependencies</goal>
</goals>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-javaagent</artifactId>
- <version>${version}</version>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
+ <includeGroupIds>org.apache.openejb</includeGroupIds>
+ <includeArtifactIds>openejb-javaagent</includeArtifactIds>
+ <includeTypes>jar</includeTypes>
+ <excludeTransitive>true</excludeTransitive>
+ <outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
@@ -147,8 +144,13 @@
</plugins>
</build>
<dependencies>
-
- <dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-javaagent</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
<version>${version}</version>
Modified: openejb/branches/openejb-3.1.x/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/pom.xml?rev=1035385&r1=1035384&r2=1035385&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/container/openejb-core/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/container/openejb-core/pom.xml Mon Nov 15 18:15:25 2010
@@ -101,17 +101,14 @@
<id>copy</id>
<phase>process-resources</phase>
<goals>
- <goal>copy</goal>
+ <goal>copy-dependencies</goal>
</goals>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-javaagent</artifactId>
- <version>${version}</version>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
+ <includeGroupIds>org.apache.openejb</includeGroupIds>
+ <includeArtifactIds>openejb-javaagent</includeArtifactIds>
+ <includeTypes>jar</includeTypes>
+ <excludeTransitive>true</excludeTransitive>
+ <outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
Modified: openejb/branches/openejb-3.1.x/container/openejb-spring/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-spring/pom.xml?rev=1035385&r1=1035384&r2=1035385&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/container/openejb-spring/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/container/openejb-spring/pom.xml Mon Nov 15 18:15:25 2010
@@ -52,17 +52,14 @@
<id>copy</id>
<phase>process-resources</phase>
<goals>
- <goal>copy</goal>
+ <goal>copy-dependencies</goal>
</goals>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-javaagent</artifactId>
- <version>${version}</version>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
+ <includeGroupIds>org.apache.openejb</includeGroupIds>
+ <includeArtifactIds>openejb-javaagent</includeArtifactIds>
+ <includeTypes>jar</includeTypes>
+ <excludeTransitive>true</excludeTransitive>
+ <outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
@@ -116,6 +113,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-javaagent</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<version>2.5.5</version>
Modified: openejb/branches/openejb-3.1.x/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/pom.xml?rev=1035385&r1=1035384&r2=1035385&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/pom.xml Mon Nov 15 18:15:25 2010
@@ -120,6 +120,10 @@
<pluginManagement>
<plugins>
<plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.2</version>
Modified: openejb/branches/openejb-3.1.x/server/openejb-ejbd/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-ejbd/pom.xml?rev=1035385&r1=1035384&r2=1035385&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-ejbd/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-ejbd/pom.xml Mon Nov 15 18:15:25 2010
@@ -39,17 +39,14 @@
<id>copy</id>
<phase>process-resources</phase>
<goals>
- <goal>copy</goal>
+ <goal>copy-dependencies</goal>
</goals>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-javaagent</artifactId>
- <version>${version}</version>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
+ <includeGroupIds>org.apache.openejb</includeGroupIds>
+ <includeArtifactIds>openejb-javaagent</includeArtifactIds>
+ <includeTypes>jar</includeTypes>
+ <excludeTransitive>true</excludeTransitive>
+ <outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
@@ -62,7 +59,7 @@
<!-- DEBUG: Uncomment this line and comment out the next -->
<!--<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -javaagent:${project.build.directory}/openejb-javaagent-${version}.jar=foo=bar</argLine>-->
<argLine>"-javaagent:${project.build.directory}/openejb-javaagent-${version}.jar=foo=bar"</argLine>
- <!--
+ <!--
<systemProperties>
<property>
<name>openejb.home</name>
@@ -114,6 +111,12 @@
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-javaagent</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-client</artifactId>
<version>${version}</version>
<scope>test</scope>
Modified: openejb/branches/openejb-3.1.x/server/openejb-http/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-http/pom.xml?rev=1035385&r1=1035384&r2=1035385&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-http/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-http/pom.xml Mon Nov 15 18:15:25 2010
@@ -45,17 +45,14 @@
<id>copy</id>
<phase>process-resources</phase>
<goals>
- <goal>copy</goal>
+ <goal>copy-dependencies</goal>
</goals>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-javaagent</artifactId>
- <version>${version}</version>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
+ <includeGroupIds>org.apache.openejb</includeGroupIds>
+ <includeArtifactIds>openejb-javaagent</includeArtifactIds>
+ <includeTypes>jar</includeTypes>
+ <excludeTransitive>true</excludeTransitive>
+ <outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
@@ -123,6 +120,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-javaagent</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>idb</groupId>
<artifactId>idb</artifactId>
<scope>test</scope>
Modified: openejb/branches/openejb-3.1.x/server/openejb-webadmin/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-webadmin/pom.xml?rev=1035385&r1=1035384&r2=1035385&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-webadmin/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-webadmin/pom.xml Mon Nov 15 18:15:25 2010
@@ -39,17 +39,14 @@
<id>copy</id>
<phase>process-resources</phase>
<goals>
- <goal>copy</goal>
+ <goal>copy-dependencies</goal>
</goals>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-javaagent</artifactId>
- <version>${version}</version>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
+ <includeGroupIds>org.apache.openejb</includeGroupIds>
+ <includeArtifactIds>openejb-javaagent</includeArtifactIds>
+ <includeTypes>jar</includeTypes>
+ <excludeTransitive>true</excludeTransitive>
+ <outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
@@ -104,6 +101,12 @@
<version>${version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-javaagent</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.2</version>