Author: andygumbrecht
Date: Thu May 8 13:14:23 2014
New Revision: 1593266
URL: http://svn.apache.org/r1593266
Log:
https://issues.apache.org/jira/browse/TOMEE-1200
OpenJPA 2.4.0-nonfinal-1591689
Modified:
tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TestClassDiscoverer.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEInjectionEnricher.java
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml
tomee/tomee/trunk/container/openejb-core/pom.xml
tomee/tomee/trunk/examples/alternate-descriptors/pom.xml
tomee/tomee/trunk/examples/multi-jpa-provider-testing/pom.xml
tomee/tomee/trunk/examples/polling-parent/polling-client/pom.xml
tomee/tomee/trunk/examples/polling-parent/polling-domain/pom.xml
tomee/tomee/trunk/examples/rest-example/pom.xml
tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml
tomee/tomee/trunk/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
tomee/tomee/trunk/pom.xml
tomee/tomee/trunk/tomee/pom.xml
tomee/tomee/trunk/tomee/tomee-deb/pom.xml
tomee/tomee/trunk/utils/openejb-core-eclipselink/pom.xml
tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml
Modified:
tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java?rev=1593266&r1=1593265&r2=1593266&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java
(original)
+++
tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java
Thu May 8 13:14:23 2014
@@ -56,7 +56,7 @@ public final class OpenEJBEnricher {
new MockitoEnricher().enrich(testInstance);
final BeanContext context =
SystemInstance.get().getComponent(ContainerSystem.class)
- .getBeanContext(testInstance.getClass().getName());
+ .getBeanContext(ctx.getId() + "_" +
testInstance.getClass().getName());
final BeanManagerImpl bm = findBeanManager(ctx);
if (bm != null && bm.isInUse()) {
Modified:
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java?rev=1593266&r1=1593265&r2=1593266&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
(original)
+++
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
Thu May 8 13:14:23 2014
@@ -155,11 +155,12 @@ public class OpenEJBArchiveProcessor {
if (javaClass != null) {
final EjbJar ejbJar = new EjbJar();
final OpenejbJar openejbJar = new OpenejbJar();
- final ManagedBean bean = ejbJar.addEnterpriseBean(new
ManagedBean(javaClass.getSimpleName(), javaClass.getName(), true));
+ final String ejbName = appModule.getModuleId() + "_" +
javaClass.getName();
+ final ManagedBean bean = ejbJar.addEnterpriseBean(new
ManagedBean(ejbName, javaClass.getName(), true));
bean.localBean();
bean.setTransactionType(TransactionType.BEAN);
final EjbDeployment ejbDeployment =
openejbJar.addEjbDeployment(bean);
- ejbDeployment.setDeploymentId(javaClass.getName());
+ ejbDeployment.setDeploymentId(ejbName);
final EjbModule e = new EjbModule(ejbJar, openejbJar);
e.setClassLoader(tempClassLoader);
appModule.getEjbModules().add(e);
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml?rev=1593266&r1=1593265&r2=1593266&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml Thu May 8
13:14:23 2014
@@ -179,7 +179,7 @@
</exclusion>
<exclusion>
<artifactId>openjpa</artifactId>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
</exclusion>
<exclusion>
<artifactId>openwebbeans-web</artifactId>
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TestClassDiscoverer.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TestClassDiscoverer.java?rev=1593266&r1=1593265&r2=1593266&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TestClassDiscoverer.java
(original)
+++
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TestClassDiscoverer.java
Thu May 8 13:14:23 2014
@@ -34,11 +34,24 @@ import java.io.InputStream;
public class TestClassDiscoverer implements AdditionalBeanDiscoverer {
@Override
public AppModule discover(final AppModule module) {
- final String name = findTestName(module.getFile(),
module.getClassLoader());
- if (name == null) {
+ final File file = module.getFile();
+ final String line = findTestName(file, module.getClassLoader());
+ if (line == null) {
return module;
}
+ final String name;
+ final int endIndex = line.indexOf('#');
+ if (endIndex > 0) {
+ name = line.substring(0, endIndex);
+ if (file != null && !file.getName().equals(line.substring(endIndex
+ 1, line.length()))) {
+ // skip
+ return module;
+ }
+ } else {
+ name = line;
+ }
+
try {
// call some reflection methods to make it fail if some dep are
missing...
Class<?> current = module.getClassLoader().loadClass(name);
@@ -56,11 +69,12 @@ public class TestClassDiscoverer impleme
final EjbJar ejbJar = new EjbJar();
final OpenejbJar openejbJar = new OpenejbJar();
- final ManagedBean bean = ejbJar.addEnterpriseBean(new
ManagedBean(name, name, true));
+ final String ejbName = module.getModuleId() + "_" + name;
+ final ManagedBean bean = ejbJar.addEnterpriseBean(new
ManagedBean(ejbName, name, true));
bean.localBean();
bean.setTransactionType(TransactionType.BEAN);
final EjbDeployment ejbDeployment = openejbJar.addEjbDeployment(bean);
- ejbDeployment.setDeploymentId(name);
+ ejbDeployment.setDeploymentId(ejbName);
module.getEjbModules().add(new EjbModule(ejbJar, openejbJar));
return module;
}
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java?rev=1593266&r1=1593265&r2=1593266&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
(original)
+++
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
Thu May 8 13:14:23 2014
@@ -367,7 +367,13 @@ public abstract class TomEEContainer<Con
}
protected Assignable archiveWithTestInfo(final Archive<?> archive) {
- return archive.add(new
StringAsset(testClass.get().getJavaClass().getName()),
ArchivePaths.create("arquillian-tomee-info.txt"));
+ String name = archive.getName();
+ if (name.endsWith(".war") || name.endsWith(".ear")) {
+ name = name.substring(0, name.length() - ".war".length());
+ }
+ return archive.add(
+ new StringAsset(testClass.get().getJavaClass().getName() + '#'
+ name),
+ ArchivePaths.create("arquillian-tomee-info.txt"));
}
protected Deployer deployer() throws NamingException {
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEInjectionEnricher.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEInjectionEnricher.java?rev=1593266&r1=1593265&r2=1593266&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEInjectionEnricher.java
(original)
+++
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEInjectionEnricher.java
Thu May 8 13:14:23 2014
@@ -38,11 +38,14 @@ public class TomEEInjectionEnricher impl
}
private AppContext getAppContext(final String className) {
- final BeanContext context =
SystemInstance.get().getComponent(ContainerSystem.class).getBeanContext(className);
- if (context == null) {
- return null;
+ final ContainerSystem containerSystem =
SystemInstance.get().getComponent(ContainerSystem.class);
+ for (final AppContext app : containerSystem.getAppContexts()) {
+ final BeanContext context =
containerSystem.getBeanContext(app.getId() + "_" + className);
+ if (context != null) {
+ return context.getModuleContext().getAppContext();
+ }
}
- return context.getModuleContext().getAppContext();
+ return null;
}
@Override
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml?rev=1593266&r1=1593265&r2=1593266&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml
(original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml Thu May
8 13:14:23 2014
@@ -203,7 +203,7 @@
</exclusion>
<exclusion>
<artifactId>openjpa</artifactId>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
</exclusion>
<exclusion>
<artifactId>openwebbeans-web</artifactId>
Modified: tomee/tomee/trunk/container/openejb-core/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/pom.xml?rev=1593266&r1=1593265&r2=1593266&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/pom.xml (original)
+++ tomee/tomee/trunk/container/openejb-core/pom.xml Thu May 8 13:14:23 2014
@@ -698,7 +698,7 @@
<artifactId>openwebbeans-web</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa</artifactId>
</dependency>
<!--
Modified: tomee/tomee/trunk/examples/alternate-descriptors/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/alternate-descriptors/pom.xml?rev=1593266&r1=1593265&r2=1593266&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/alternate-descriptors/pom.xml (original)
+++ tomee/tomee/trunk/examples/alternate-descriptors/pom.xml Thu May 8
13:14:23 2014
@@ -58,9 +58,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa</artifactId>
- <version>2.2.1</version>
+ <version>2.4.0-nonfinal-1591689</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -91,7 +91,7 @@
<exclusions>
<exclusion>
<artifactId>openjpa</artifactId>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
</exclusion>
</exclusions>
</dependency>
Modified: tomee/tomee/trunk/examples/multi-jpa-provider-testing/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multi-jpa-provider-testing/pom.xml?rev=1593266&r1=1593265&r2=1593266&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multi-jpa-provider-testing/pom.xml (original)
+++ tomee/tomee/trunk/examples/multi-jpa-provider-testing/pom.xml Thu May 8
13:14:23 2014
@@ -130,9 +130,9 @@
otherwise arquillian has some difficulties in embedded mode to find your
classes
-->
<dependency>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa</artifactId>
- <version>2.2.0</version>
+ <version>2.4.0-nonfinal-1591689</version>
<scope>test</scope>
</dependency>
<dependency> <!-- just a facade pom which will bring hibernate for us -->
Modified: tomee/tomee/trunk/examples/polling-parent/polling-client/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/polling-parent/polling-client/pom.xml?rev=1593266&r1=1593265&r2=1593266&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/polling-parent/polling-client/pom.xml (original)
+++ tomee/tomee/trunk/examples/polling-parent/polling-client/pom.xml Thu May 8
13:14:23 2014
@@ -89,9 +89,9 @@
<version>6.0-5</version>
</dependency>
<dependency> <!-- because entities was enhanced -->
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa</artifactId>
- <version>2.2.0</version>
+ <version>2.4.0-nonfinal-1591689</version>
</dependency>
</dependencies>
</plugin>
Modified: tomee/tomee/trunk/examples/polling-parent/polling-domain/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/polling-parent/polling-domain/pom.xml?rev=1593266&r1=1593265&r2=1593266&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/polling-parent/polling-domain/pom.xml (original)
+++ tomee/tomee/trunk/examples/polling-parent/polling-domain/pom.xml Thu May 8
13:14:23 2014
@@ -39,9 +39,9 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.2.0</version>
+ <version>2.4.0-nonfinal-1591689</version>
<configuration>
<includes>jug/domain/*.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
@@ -58,9 +58,9 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa</artifactId>
- <version>2.2.0</version>
+ <version>2.4.0-nonfinal-1591689</version>
</dependency>
</dependencies>
</plugin>
Modified: tomee/tomee/trunk/examples/rest-example/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-example/pom.xml?rev=1593266&r1=1593265&r2=1593266&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/rest-example/pom.xml (original)
+++ tomee/tomee/trunk/examples/rest-example/pom.xml Thu May 8 13:14:23 2014
@@ -107,9 +107,9 @@
</configuration>
</plugin>
<plugin> <!-- needed otherwise it will not work at runtime -->
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.3.0</version>
+ <version>2.4.0-nonfinal-1591689</version>
<configuration>
<includes>org/superbiz/rest/model/*.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
@@ -126,9 +126,9 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa</artifactId>
- <version>2.3.0</version>
+ <version>2.4.0-nonfinal-1591689</version>
</dependency>
</dependencies>
</plugin>
Modified: tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml?rev=1593266&r1=1593265&r2=1593266&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml Thu May 8
13:14:23 2014
@@ -43,9 +43,9 @@
</configuration>
</plugin>
<plugin> <!-- needed otherwise it will not work at runtime -->
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.2.1</version>
+ <version>2.4.0-nonfinal-1591689</version>
<configuration>
<includes>org/superbiz/osgi/moviefun/Movie.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
@@ -62,9 +62,9 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa</artifactId>
- <version>2.2.1</version>
+ <version>2.4.0-nonfinal-1591689</version>
</dependency>
</dependencies>
</plugin>
Modified:
tomee/tomee/trunk/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml?rev=1593266&r1=1593265&r2=1593266&view=diff
==============================================================================
---
tomee/tomee/trunk/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++
tomee/tomee/trunk/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
Thu May 8 13:14:23 2014
@@ -106,9 +106,9 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.3.0</version>
+ <version>2.4.0-nonfinal-1591689</version>
<configuration>
<includes>**/entities/*.class</includes>
<excludes>**/entities/XML*.class</excludes>
@@ -126,10 +126,10 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa</artifactId>
<!-- set the version to be the same as the level in your
runtime -->
- <version>2.3.0</version>
+ <version>2.4.0-nonfinal-1591689</version>
</dependency>
</dependencies>
</plugin>
Modified: tomee/tomee/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1593266&r1=1593265&r2=1593266&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Thu May 8 13:14:23 2014
@@ -97,7 +97,7 @@
<openejb.version>4.6.1-SNAPSHOT</openejb.version>
<tomee.version>1.6.1-SNAPSHOT</tomee.version>
- <openjpa.version>2.4.0-SNAPSHOT</openjpa.version>
+ <openjpa.version>2.4.0-nonfinal-1591689</openjpa.version>
<org.apache.openwebbeans.version>1.2.4</org.apache.openwebbeans.version>
<!-- Maven module versions -->
@@ -155,7 +155,7 @@
<commons-codec.version>1.9</commons-codec.version>
<commons-fileupload.version>1.3.1</commons-fileupload.version>
<commons-discovery.version>0.5</commons-discovery.version>
- <commons-lang3.version>3.2.1</commons-lang3.version>
+ <commons-lang3.version>3.3.2</commons-lang3.version>
<commons-io.version>2.4</commons-io.version>
<commons-net.version>3.3</commons-net.version>
@@ -1330,7 +1330,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa</artifactId>
<version>${openjpa.version}</version>
<exclusions>
@@ -1622,6 +1622,11 @@
<version>${commons-collections.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>1.8</version>
+ </dependency>
+ <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
Modified: tomee/tomee/trunk/tomee/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/pom.xml?rev=1593266&r1=1593265&r2=1593266&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/pom.xml (original)
+++ tomee/tomee/trunk/tomee/pom.xml Thu May 8 13:14:23 2014
@@ -54,7 +54,7 @@
<module>tomee-jaxrs-webapp</module>
<module>apache-tomee</module>
<module>tomee-util</module>
- <!--module>tomee-deb</module-->
+ <module>tomee-deb</module>
</modules>
<repositories>
@@ -126,7 +126,7 @@
<version>${version.openejb}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa</artifactId>
</exclusion>
<exclusion>
Modified: tomee/tomee/trunk/tomee/tomee-deb/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/pom.xml?rev=1593266&r1=1593265&r2=1593266&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-deb/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-deb/pom.xml Thu May 8 13:14:23 2014
@@ -23,25 +23,12 @@
<artifactId>tomee-deb</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: TomEE :: Debian Package Builder</name>
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <commons.compress>1.8</commons.compress>
- <commons.io>2.4</commons.io>
- <commons.codec>1.9</commons.codec>
<distribution.workdir>${project.build.directory}/work-dir</distribution.workdir>
</properties>
<repositories>
<repository>
- <id>apache.snapshots</id>
- <url>http://repository.apache.org/snapshots/</url>
- <releases>
- <updatePolicy>daily</updatePolicy>
- </releases>
- <snapshots>
- <updatePolicy>daily</updatePolicy>
- </snapshots>
- </repository>
- <repository>
<id>atlassian-public</id>
<url>https://m2proxy.atlassian.com/repository/public</url>
<snapshots>
@@ -55,8 +42,8 @@
</releases>
</repository>
</repositories>
- <dependencies>
+ <dependencies>
<!-- Dependencies used by builder logic. -->
<dependency>
<groupId>org.apache.maven</groupId>
@@ -70,22 +57,18 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>${commons.compress}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.3.2</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${commons.io}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${commons.codec}</version>
</dependency>
<!-- We need to be sure the ZIP files are built before the debian
package. -->
Modified: tomee/tomee/trunk/utils/openejb-core-eclipselink/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/utils/openejb-core-eclipselink/pom.xml?rev=1593266&r1=1593265&r2=1593266&view=diff
==============================================================================
--- tomee/tomee/trunk/utils/openejb-core-eclipselink/pom.xml (original)
+++ tomee/tomee/trunk/utils/openejb-core-eclipselink/pom.xml Thu May 8
13:14:23 2014
@@ -35,7 +35,7 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa</artifactId>
</exclusion>
</exclusions>
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=1593266&r1=1593265&r2=1593266&view=diff
==============================================================================
--- tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml (original)
+++ tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml Thu May 8 13:14:23
2014
@@ -35,7 +35,7 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa</artifactId>
</exclusion>
<exclusion>
