You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2013/12/11 15:34:12 UTC
svn commit: r1550151 - in /tomee/tomee/trunk: ./ container/
container/mbean-annotation-api/ container/openejb-concurrency-utilities-ee/
container/openejb-jee-accessors/ container/openejb-jee/
container/openejb-jpa-integration/ container/openejb-junit/ ...
Author: andygumbrecht
Date: Wed Dec 11 14:34:11 2013
New Revision: 1550151
URL: http://svn.apache.org/r1550151
Log:
More pom cleanups. Need to ensure versions go up to top pom to avoid conflicts.
mbean-annotation-api now belongs to container.
Modified:
tomee/tomee/trunk/container/mbean-annotation-api/pom.xml
tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/pom.xml
tomee/tomee/trunk/container/openejb-jee-accessors/pom.xml
tomee/tomee/trunk/container/openejb-jee/pom.xml
tomee/tomee/trunk/container/openejb-jpa-integration/pom.xml
tomee/tomee/trunk/container/openejb-junit/pom.xml
tomee/tomee/trunk/container/openejb-loader/pom.xml
tomee/tomee/trunk/container/pom.xml
tomee/tomee/trunk/examples/tomee-jersey-eclipselink/pom.xml
tomee/tomee/trunk/pom.xml
tomee/tomee/trunk/shade/quartz/dependency-reduced-pom.xml
tomee/tomee/trunk/shade/quartz/pom.xml
tomee/tomee/trunk/tomee/pom.xml
tomee/tomee/trunk/tomee/tomee-embedded/pom.xml
tomee/tomee/trunk/tomee/tomee-plus-webapp/pom.xml
tomee/tomee/trunk/tomee/tomee-webapp/pom.xml
tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml
Modified: tomee/tomee/trunk/container/mbean-annotation-api/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/mbean-annotation-api/pom.xml?rev=1550151&r1=1550150&r2=1550151&view=diff
==============================================================================
--- tomee/tomee/trunk/container/mbean-annotation-api/pom.xml (original)
+++ tomee/tomee/trunk/container/mbean-annotation-api/pom.xml Wed Dec 11 14:34:11 2013
@@ -24,5 +24,5 @@
<version>4.6.1-SNAPSHOT</version>
</parent>
<artifactId>mbean-annotation-api</artifactId>
- <name>OpenEJB :: Dependencies :: MBean Annotation API</name>
+ <name>OpenEJB :: Container :: MBean Annotation API</name>
</project>
Modified: tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/pom.xml?rev=1550151&r1=1550150&r2=1550151&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/pom.xml (original)
+++ tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/pom.xml Wed Dec 11 14:34:11 2013
@@ -24,8 +24,8 @@
<groupId>org.apache.openejb</groupId>
<version>4.6.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
<artifactId>openejb-concurrency-utilities-ee</artifactId>
<name>OpenEJB :: Container :: Concurrency Utilities EE</name>
@@ -36,13 +36,10 @@
<version>${project.version}</version>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-concurrent_1.0_spec</artifactId>
- <version>TODO</version>
- </dependency>
- -->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.specs</groupId>-->
+ <!--<artifactId>geronimo-concurrent_1.0_spec</artifactId>-->
+ <!--</dependency>-->
<dependency> <!-- to replace with geronimo -->
<groupId>javax.enterprise.concurrent</groupId>
Modified: tomee/tomee/trunk/container/openejb-jee-accessors/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee-accessors/pom.xml?rev=1550151&r1=1550150&r2=1550151&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-jee-accessors/pom.xml (original)
+++ tomee/tomee/trunk/container/openejb-jee-accessors/pom.xml Wed Dec 11 14:34:11 2013
@@ -31,10 +31,10 @@
<name>OpenEJB :: Container :: Java EE Accessors</name>
<properties>
- <openejb.osgi.import.pkg>
- org.apache.geronimo.specs.jpa;resolution:=optional,
- org.apache.geronimo.specs.activation;resolution:=optional,
- *
+ <openejb.osgi.import.pkg>
+ org.apache.geronimo.specs.jpa;resolution:=optional,
+ org.apache.geronimo.specs.activation;resolution:=optional,
+ *
</openejb.osgi.import.pkg>
</properties>
Modified: tomee/tomee/trunk/container/openejb-jee/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/pom.xml?rev=1550151&r1=1550150&r2=1550151&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-jee/pom.xml (original)
+++ tomee/tomee/trunk/container/openejb-jee/pom.xml Wed Dec 11 14:34:11 2013
@@ -31,11 +31,11 @@
<name>OpenEJB :: Container :: Java EE</name>
- <properties>
- <openejb.osgi.import.pkg>
- org.apache.geronimo.specs.jpa;resolution:=optional,
- org.apache.geronimo.specs.activation;resolution:=optional,
- *
+ <properties>
+ <openejb.osgi.import.pkg>
+ org.apache.geronimo.specs.jpa;resolution:=optional,
+ org.apache.geronimo.specs.activation;resolution:=optional,
+ *
</openejb.osgi.import.pkg>
</properties>
@@ -97,7 +97,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
- <version>1.3</version>
<executions>
<execution>
<goals>
@@ -106,7 +105,7 @@
</execution>
</executions>
<configuration>
- <!--<schemaDirectory>src/main/xsd</schemaDirectory>-->
+ <!--<schemaDirectory>src/main/xsd</schemaDirectory>-->
<packageName>org.apache.openejb.jee</packageName>
<schemaListFileName>src/main/xsdlist/xsdlist.txt</schemaListFileName>
<extension>true</extension>
Modified: tomee/tomee/trunk/container/openejb-jpa-integration/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jpa-integration/pom.xml?rev=1550151&r1=1550150&r2=1550151&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-jpa-integration/pom.xml (original)
+++ tomee/tomee/trunk/container/openejb-jpa-integration/pom.xml Wed Dec 11 14:34:11 2013
@@ -34,13 +34,11 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm4-shaded</artifactId>
- <version>${xbeanVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <version>4.1.4.Final</version>
<exclusions>
<exclusion>
<artifactId>jboss-logging</artifactId>
@@ -52,25 +50,15 @@
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>eclipselink</artifactId>
- <version>2.3.0</version>
<optional>true</optional>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>eclipselink-repo</id>
- <name>EclipseLink Repository</name>
- <url>http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/rt/eclipselink/maven.repo</url>
- </repository>
- </repositories>
-
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
<executions>
<execution>
<id>generate-integration</id>
Modified: tomee/tomee/trunk/container/openejb-junit/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-junit/pom.xml?rev=1550151&r1=1550150&r2=1550151&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-junit/pom.xml (original)
+++ tomee/tomee/trunk/container/openejb-junit/pom.xml Wed Dec 11 14:34:11 2013
@@ -22,10 +22,12 @@
<groupId>org.apache.openejb</groupId>
<version>4.6.1-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-junit</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: Container :: JUnit</name>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: tomee/tomee/trunk/container/openejb-loader/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-loader/pom.xml?rev=1550151&r1=1550150&r2=1550151&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-loader/pom.xml (original)
+++ tomee/tomee/trunk/container/openejb-loader/pom.xml Wed Dec 11 14:34:11 2013
@@ -45,7 +45,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.3</version>
</plugin>
</plugins>
</reporting>
@@ -54,7 +53,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.0.1</version>
<configuration>
<linkXRef>true</linkXRef>
<sourceEncoding>utf-8</sourceEncoding>
Modified: tomee/tomee/trunk/container/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/pom.xml?rev=1550151&r1=1550150&r2=1550151&view=diff
==============================================================================
--- tomee/tomee/trunk/container/pom.xml (original)
+++ tomee/tomee/trunk/container/pom.xml Wed Dec 11 14:34:11 2013
@@ -22,10 +22,12 @@
<groupId>org.apache.openejb</groupId>
<version>4.6.1-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<artifactId>container</artifactId>
<packaging>pom</packaging>
<name>OpenEJB :: Container</name>
+
<modules>
<module>mbean-annotation-api</module>
<module>openejb-api</module>
Modified: tomee/tomee/trunk/examples/tomee-jersey-eclipselink/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/tomee-jersey-eclipselink/pom.xml?rev=1550151&r1=1550150&r2=1550151&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/tomee-jersey-eclipselink/pom.xml (original)
+++ tomee/tomee/trunk/examples/tomee-jersey-eclipselink/pom.xml Wed Dec 11 14:34:11 2013
@@ -27,6 +27,11 @@
<packaging>war</packaging>
<name>OpenEJB :: Examples :: TomEE, Jersey, Eclipselink</name>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <version.eclipselink>2.5.1</version.eclipselink>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.openejb</groupId>
@@ -37,22 +42,22 @@
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.core</artifactId>
- <version>2.3.0</version>
+ <version>${version.eclipselink}</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.antlr</artifactId>
- <version>2.3.0</version>
+ <version>${version.eclipselink}</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.asm</artifactId>
- <version>2.3.0</version>
+ <version>${version.eclipselink}</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpa</artifactId>
- <version>2.3.0</version>
+ <version>${version.eclipselink}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
@@ -78,7 +83,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -133,7 +138,5 @@
</snapshotRepository>
</distributionManagement>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+
</project>
Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1550151&r1=1550150&r2=1550151&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Wed Dec 11 14:34:11 2013
@@ -141,22 +141,6 @@
-->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <bval.version>0.5</bval.version>
- <org.apache.activemq.version>5.9.0</org.apache.activemq.version>
- <quartz.version>2.2.1</quartz.version>
- <org.springframework.version>3.1.3.RELEASE</org.springframework.version>
- <junit.version>4.11</junit.version>
- <org.apache.axis2.version>1.4.1</org.apache.axis2.version>
- <scannotation.version>1.0.2</scannotation.version>
- <geronimo.connector.version>3.1.1</geronimo.connector.version>
- <geronimo-osgi.version>1.1</geronimo-osgi.version>
- <geronimo-javamail_1.4_spec.version>1.7.1</geronimo-javamail_1.4_spec.version>
- <myfaces.version>2.1.13</myfaces.version>
- <slf4j.version>1.7.5</slf4j.version>
- <log4j.version>1.2.17</log4j.version>
- <osgi.framework.version>4.2.0</osgi.framework.version>
- <hsqldb.version>2.3.0</hsqldb.version>
-
<!-- Apache Commons -->
<commons-beanutils.version>1.8.3</commons-beanutils.version>
<commons-cli.version>1.2</commons-cli.version>
@@ -172,8 +156,26 @@
<commons-lang.version>2.6</commons-lang.version>
<commons-io.version>1.4</commons-io.version>
<commons-net.version>3.2</commons-net.version>
+
+ <bval.version>0.5</bval.version>
+ <org.apache.activemq.version>5.9.0</org.apache.activemq.version>
+ <quartz.version>2.2.1</quartz.version>
+ <org.springframework.version>3.1.3.RELEASE</org.springframework.version>
+ <junit.version>4.11</junit.version>
+ <org.apache.axis2.version>1.4.1</org.apache.axis2.version>
+ <scannotation.version>1.0.2</scannotation.version>
+ <geronimo.connector.version>3.1.1</geronimo.connector.version>
+ <geronimo-osgi.version>1.1</geronimo-osgi.version>
+ <geronimo-javamail_1.4_spec.version>1.7.1</geronimo-javamail_1.4_spec.version>
+ <myfaces.version>2.1.13</myfaces.version>
+ <slf4j.version>1.7.5</slf4j.version>
+ <log4j.version>1.2.17</log4j.version>
+ <osgi.framework.version>4.2.0</osgi.framework.version>
+ <version.hsqldb>2.3.0</version.hsqldb>
<version.axiom>1.2.14</version.axiom>
<version.xalan>2.7.1</version.xalan>
+ <version.hibernate>4.2.8.Final</version.hibernate>
+ <version.eclipselink>2.5.1</version.eclipselink>
</properties>
<build>
@@ -186,8 +188,8 @@
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven-bundle-plugin.version}</version>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.2</version>
</plugin>
@@ -236,11 +238,41 @@
<artifactId>dependency-report-plugin</artifactId>
<version>1.0.2</version>
</plugin>
- <plugin>
- <groupId>org.metatype.sxc</groupId>
- <artifactId>sxc-jaxb-maven-plugin</artifactId>
- <version>0.8</version>
- </plugin>
+ <plugin>
+ <groupId>org.metatype.sxc</groupId>
+ <artifactId>sxc-jaxb-maven-plugin</artifactId>
+ <version>0.8</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>3.0.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jaxb2-maven-plugin</artifactId>
+ <version>1.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>com.googlecode.jslint4java</groupId>
+ <artifactId>jslint4java-maven-plugin</artifactId>
+ <version>2.0.5</version>
+ </plugin>
</plugins>
</pluginManagement>
@@ -936,7 +968,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>${hsqldb.version}</version>
+ <version>${version.hsqldb}</version>
</dependency>
<dependency>
<groupId>idb</groupId>
@@ -1362,12 +1394,12 @@
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-bundleutils</artifactId>
<version>${xbeanVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
- </exclusions>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
@@ -1442,27 +1474,27 @@
<artifactId>tomcat-catalina</artifactId>
<version>${tomcat.version}</version>
</dependency>
- <!-- we now use our shade
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <version>${quartz.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- <exclusion>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- -->
+ <!-- we now use our shade
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <version>${quartz.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -1752,21 +1784,62 @@
<artifactId>derbyclient</artifactId>
<version>10.9.1.0</version>
</dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>2.2.3</version>
- </dependency>
- <dependency>
- <groupId>org.metatype.sxc</groupId>
- <artifactId>sxc-jaxb-core</artifactId>
- <version>0.8</version>
- </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.metatype.sxc</groupId>
+ <artifactId>sxc-jaxb-core</artifactId>
+ <version>0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>${version.hibernate}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jboss-logging</artifactId>
+ <groupId>org.jboss.logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>5.0.1.Final</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-logging</artifactId>
+ <groupId>org.jboss.logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>eclipselink</artifactId>
+ <version>${version.eclipselink}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-concurrent_1.0_spec</artifactId>
+ <version>1.1-EA-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.2_spec</artifactId>
+ <version>1.0.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<distributionManagement>
Modified: tomee/tomee/trunk/shade/quartz/dependency-reduced-pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/shade/quartz/dependency-reduced-pom.xml?rev=1550151&r1=1550150&r2=1550151&view=diff
==============================================================================
--- tomee/tomee/trunk/shade/quartz/dependency-reduced-pom.xml (original)
+++ tomee/tomee/trunk/shade/quartz/dependency-reduced-pom.xml Wed Dec 11 14:34:11 2013
@@ -13,7 +13,6 @@
<plugins>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.2</version>
<executions>
<execution>
<phase>package</phase>
Modified: tomee/tomee/trunk/shade/quartz/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/shade/quartz/pom.xml?rev=1550151&r1=1550150&r2=1550151&view=diff
==============================================================================
--- tomee/tomee/trunk/shade/quartz/pom.xml (original)
+++ tomee/tomee/trunk/shade/quartz/pom.xml Wed Dec 11 14:34:11 2013
@@ -30,55 +30,11 @@
<artifactId>openejb-shade-quartz</artifactId>
<name>OpenEJB :: Shade :: Quartz</name>
- <dependencies>
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <version>${quartz.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- <exclusion>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <version>${quartz.version}</version>
- <classifier>sources</classifier>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- <exclusion>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.2</version>
<executions>
<execution>
<phase>package</phase>
@@ -103,4 +59,48 @@
</plugin>
</plugins>
</build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <version>${quartz.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <version>${quartz.version}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
</project>
\ No newline at end of file
Modified: tomee/tomee/trunk/tomee/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/pom.xml?rev=1550151&r1=1550150&r2=1550151&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/pom.xml (original)
+++ tomee/tomee/trunk/tomee/pom.xml Wed Dec 11 14:34:11 2013
@@ -195,8 +195,5 @@
</profile>
</profiles>
- <properties>
- <openejb.version>4.6.1-SNAPSHOT</openejb.version>
- </properties>
</project>
Modified: tomee/tomee/trunk/tomee/tomee-embedded/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-embedded/pom.xml?rev=1550151&r1=1550150&r2=1550151&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-embedded/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-embedded/pom.xml Wed Dec 11 14:34:11 2013
@@ -69,7 +69,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.4</version>
<executions>
<execution>
<phase>package</phase>
Modified: tomee/tomee/trunk/tomee/tomee-plus-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-plus-webapp/pom.xml?rev=1550151&r1=1550150&r2=1550151&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-plus-webapp/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-plus-webapp/pom.xml Wed Dec 11 14:34:11 2013
@@ -158,7 +158,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.2</version>
<executions>
<execution>
<id>war</id>
Modified: tomee/tomee/trunk/tomee/tomee-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webapp/pom.xml?rev=1550151&r1=1550150&r2=1550151&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webapp/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-webapp/pom.xml Wed Dec 11 14:34:11 2013
@@ -21,21 +21,23 @@
<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">
+
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
<version>1.6.1-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-webapp</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: TomEE :: Webapp</name>
+
<build>
<plugins>
<plugin> <!-- the jar is only for resources and other classes are for the gui -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
<configuration>
<includes>
<include>META-INF/**/*</include>
@@ -45,7 +47,6 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.2</version>
<executions>
<execution>
<id>war</id>
@@ -65,7 +66,6 @@
<plugin>
<groupId>com.googlecode.jslint4java</groupId>
<artifactId>jslint4java-maven-plugin</artifactId>
- <version>2.0.3</version>
<configuration>
<failOnError>true</failOnError>
<options>
@@ -106,12 +106,10 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.1</version>
</dependency>
<dependency> <!-- will be moved over endorsed dir so simply adding it alone (= not in javaee-api) -->
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxb_2.2_spec</artifactId>
- <version>1.0.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml?rev=1550151&r1=1550150&r2=1550151&view=diff
==============================================================================
--- tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml (original)
+++ tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml Wed Dec 11 14:34:11 2013
@@ -55,7 +55,6 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <version>${hibernate.version}</version>
<exclusions>
<exclusion>
<groupId>org.hibernate.javax.persistence</groupId>
@@ -74,7 +73,6 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>${hibernate-validator.version}</version>
<exclusions>
<exclusion>
<groupId>javax.validation</groupId>
@@ -89,7 +87,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-ehcache</artifactId>
- <version>${hibernate.version}</version>
+ <version>${version.hibernate}</version>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
@@ -121,8 +119,4 @@
-->
</dependencies>
- <properties>
- <hibernate.version>4.1.8.Final</hibernate.version>
- <hibernate-validator.version>4.3.0.Final</hibernate-validator.version>
- </properties>
</project>