Author: jeff.yuchang Date: 2011-06-08 07:45:47 -0400 (Wed, 08 Jun 2011) New Revision: 1375 Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/pom.xml branches/ODE/RiftSaw-ODE-trunk/dao-jpa-db/pom.xml branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml branches/ODE/RiftSaw-ODE-trunk/pom.xml Log: * remove the openjpa dependencies as we don't need it. * exclude the openjpa related modules. * removing the warnings from maven3. Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/pom.xml 2011-06-07 15:17:28 UTC (rev 1374) +++ branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/pom.xml 2011-06-08 11:45:47 UTC (rev 1375) @@ -80,11 +80,6 @@ </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> - <artifactId>riftsaw-dao-jpa-ojpa</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-dao-jpa-hibernate</artifactId> <scope>test</scope> </dependency> @@ -117,24 +112,7 @@ <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-agents</artifactId> </dependency> - <dependency> - <groupId>org.jboss.soa.bpel</groupId> - <artifactId>riftsaw-jacob</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.soa.bpel</groupId> - <artifactId>riftsaw-utils</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.soa.bpel</groupId> - <artifactId>riftsaw-bpel-api</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.soa.bpel</groupId> - <artifactId>riftsaw-bpel-dao</artifactId> - </dependency> - <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </dependency> @@ -197,13 +175,6 @@ <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>tranql</groupId> <artifactId>tranql-connector-derby-common</artifactId> Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml 2011-06-07 15:17:28 UTC (rev 1374) +++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml 2011-06-08 11:45:47 UTC (rev 1375) @@ -76,11 +76,6 @@ <artifactId>xmlParserAPIs</artifactId> </dependency> <dependency> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>net.sourceforge.serp</groupId> <artifactId>serp</artifactId> </dependency> @@ -94,41 +89,7 @@ </dependencies> <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>openjpa-enhancer</id> - <phase>process-classes</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <copy todir="${basedir}/target/classes-openjpa"> - <fileset dir="${basedir}/target/classes"> - <include name="**/*" /> - </fileset> - </copy> - <property name="maven.compile.classpath" refid="maven.compile.classpath"/> - <path id="classpath"> - <pathelement location="${basedir}/target/classes-openjpa"/> - <pathelement path="${maven.compile.classpath}"/> - </path> - <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask" classpathref="classpath"/> - <openjpac directory="${basedir}/target/classes-openjpa"> - <fileset dir="${basedir}/src/main"> - <include name="**/*.java" /> - </fileset> - <classpath refid="classpath"/> - </openjpac> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - + <plugins> <!-- copy orm.xml to classes folder for using custom sequence --> <plugin> <artifactId>maven-antrun-plugin</artifactId> @@ -152,24 +113,6 @@ </execution> </executions> </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>openjpa-enhancer-package</id> - <phase>package</phase> - <configuration> - <classifier>openjpa</classifier> - <classesDirectory>${project.build.directory}/classes-openjpa</classesDirectory> - </configuration> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-db/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-jpa-db/pom.xml 2011-06-07 15:17:28 UTC (rev 1374) +++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-db/pom.xml 2011-06-08 11:45:47 UTC (rev 1375) @@ -81,11 +81,6 @@ </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> - <artifactId>riftsaw-dao-jpa</artifactId> - <classifier>openjpa</classifier> - </dependency> - <dependency> - <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-store</artifactId> </dependency> <dependency> @@ -93,10 +88,6 @@ <artifactId>xercesImpl</artifactId> </dependency> <dependency> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> - </dependency> - <dependency> <groupId>net.sourceforge.serp</groupId> <artifactId>serp</artifactId> </dependency> Modified: branches/ODE/RiftSaw-ODE-trunk/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/pom.xml 2011-06-07 15:17:28 UTC (rev 1374) +++ branches/ODE/RiftSaw-ODE-trunk/pom.xml 2011-06-08 11:45:47 UTC (rev 1375) @@ -139,7 +139,6 @@ <persistence-api.version>1.0</persistence-api.version> <xalan.version>2.7.1</xalan.version> <ant.version>1.6.5</ant.version> - <openjpa.version>1.3.0-SNAPSHOT</openjpa.version> <serp.version>1.13.1</serp.version> <dom4j.version>1.6.1</dom4j.version> <derby.version>10.5.3.0_1</derby.version> @@ -172,9 +171,9 @@ <!--module>dao-hibernate</module--> <module>tools</module> <module>dao-jpa-hibernate</module> - <module>dao-jpa-ojpa</module> + <!--module>dao-jpa-ojpa</module> <module>dao-jpa-db</module> - <!--module>dao-hibernate-db</module--> + <module>dao-hibernate-db</module--> <module>scheduler-simple</module> <module>bpel-store</module> <module>bpel-runtime</module> @@ -268,6 +267,11 @@ <maxmemory>512m</maxmemory> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.3.1</version> + </plugin> </plugins> </pluginManagement> </build> @@ -281,17 +285,6 @@ --> <repositories> <repository> - <id>servicemix-repo</id> - <name>ServiceMix Repository</name> - <url>https://repository.apache.org/content/groups/public</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> <id>jboss-public-repository-group</id> <name>JBoss Public Maven Repository Group</name> <url>https://repository.jboss.org/nexus/content/groups/public/</url> @@ -304,18 +297,6 @@ <updatePolicy>never</updatePolicy> </snapshots> </repository> - - <repository> - <id>intalio</id> - <name>intalio repo</name> - <url>http://www.intalio.org/public/maven2</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> </repositories> <!-- | @@ -419,12 +400,6 @@ </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> - <artifactId>riftsaw-dao-jpa</artifactId> - <version>${ode.version}</version> - <classifier>openjpa</classifier> - </dependency> - <dependency> - <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-jca-ra</artifactId> <version>${ode.version}</version> </dependency> @@ -450,11 +425,6 @@ </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> - <artifactId>riftsaw-dao-jpa-ojpa</artifactId> - <version>${ode.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-scheduler-simple</artifactId> <version>${ode.version}</version> </dependency> @@ -707,11 +677,6 @@ <version>${javax.mail.version}</version> </dependency> <dependency> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> - <version>${openjpa.version}</version> - </dependency> - <dependency> <groupId>net.sourceforge.serp</groupId> <artifactId>serp</artifactId> <version>${serp.version}</version>