12:26 p.m.
Author: jeff.yuchang
Date: 2009-12-20 06:26:46 -0500 (Sun, 20 Dec 2009)
New Revision: 430
Modified:
branches/ODE/ODE-2.0-maven/bpel-store/pom.xml
branches/ODE/ODE-2.0-maven/dao-jpa/pom.xml
branches/ODE/ODE-2.0-maven/pom.xml
Log:
* update the bpel-store module.
* remove the jetty jars dependencies.
Modified: branches/ODE/ODE-2.0-maven/bpel-store/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/bpel-store/pom.xml 2009-12-18 19:29:14 UTC (rev 429)
+++ branches/ODE/ODE-2.0-maven/bpel-store/pom.xml 2009-12-20 11:26:46 UTC (rev 430)
@@ -170,7 +170,6 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>net.sourceforge.serp</groupId>
@@ -195,6 +194,20 @@
</goals>
</execution>
</executions>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>${wsdl4j.version}</version>
+ </dependency>
+ </dependencies>
+
</plugin>
<plugin>
Modified: branches/ODE/ODE-2.0-maven/dao-jpa/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/dao-jpa/pom.xml 2009-12-18 19:29:14 UTC (rev 429)
+++ branches/ODE/ODE-2.0-maven/dao-jpa/pom.xml 2009-12-20 11:26:46 UTC (rev 430)
@@ -86,8 +86,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>1.0</version>
-
<executions>
<execution>
<id>enhancer</id>
@@ -97,7 +95,6 @@
</goals>
</execution>
</executions>
-
</plugin>
</plugins>
Modified: branches/ODE/ODE-2.0-maven/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/pom.xml 2009-12-18 19:29:14 UTC (rev 429)
+++ branches/ODE/ODE-2.0-maven/pom.xml 2009-12-20 11:26:46 UTC (rev 430)
@@ -125,7 +125,7 @@
<module>bpel-ql</module>
<module>dao-hibernate</module>
<module>tools</module>
- <module>bpel-store</module>
+ <!--module>bpel-store</module-->
</modules>
<build>
@@ -179,31 +179,27 @@
</dependency>
</dependencies>
</plugin>
- <!--|
- | This version removes dependency on JSR173,
- | which is not available in public repositories.
- |
- -->
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>openjpa-maven-plugin</artifactId>
+ <version>1.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ </dependencies>
+
+ </plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xmlbeans-maven-plugin</artifactId>
<version>2.3.3</version>
</plugin>
- <plugin>
- <artifactId>maven-one-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>install-maven-one-repository</goal>
- <goal>deploy-maven-one-repository</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <remoteRepositoryId>ode</remoteRepositoryId>
-
<remoteRepositoryUrl>scpexe://ode.intalio.org/var/www/public/maven1<...
- </configuration>
- </plugin>
+
<!-- Allows direct usage of the javadoc:javadoc goal. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -318,11 +314,6 @@
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-epr</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-api-jca</artifactId>
<version>${project.version}</version>
</dependency>
@@ -333,11 +324,6 @@
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-dd</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-obj</artifactId>
<version>${project.version}</version>
</dependency>
@@ -363,12 +349,6 @@
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
- <artifactId>ode-dao-hibernate-db-derby</artifactId>
- <version>${project.version}</version>
- <type>tar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
<artifactId>ode-jacob-ap</artifactId>
<version>${project.version}</version>
</dependency>
@@ -409,11 +389,6 @@
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-scheduler-quartz</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
<artifactId>ode-utils</artifactId>
<version>${project.version}</version>
</dependency>
@@ -703,41 +678,7 @@
<version>${javassist.version}</version>
</dependency>
- <!--
- | Jetty is used for the standalone-distro. The
- | JASPER modules are actually required by Jetty
- | but the transitive dependencies are not present.
- -->
-
<dependency>
- <groupId>jetty</groupId>
- <artifactId>org.mortbay.jetty</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>jetty</groupId>
- <artifactId>jasper-compiler</artifactId>
- <version>${jasper.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>jetty</groupId>
- <artifactId>jasper-runtime</artifactId>
- <version>${jasper.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>jetty</groupId>
- <artifactId>org.mortbay.jmx</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
@@ -782,18 +723,6 @@
<version>${saxon.version}</version>
</dependency>
<dependency>
- <groupId>jencks</groupId>
- <artifactId>xapool-without-pool</artifactId>
- <version>${xapool.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jencks</groupId>
- <artifactId>jencks</artifactId>
- <version>${jencks.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>${xerces.version}</version>