Repository: tomee Updated Branches: refs/heads/tomee-1.7.3-prepare 124eb43b8 -> 4408e959e
commons-collections 3.2.2 Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/9897c846 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9897c846 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9897c846 Branch: refs/heads/tomee-1.7.3-prepare Commit: 9897c84621966cd9dd2f72e02d16cf06b547c57c Parents: 62c58ff Author: AndyGee <andy...@gmx.de> Authored: Thu Dec 3 02:19:19 2015 +0100 Committer: AndyGee <andy...@gmx.de> Committed: Thu Dec 3 02:19:19 2015 +0100 ---------------------------------------------------------------------- examples/deltaspike-fullstack/pom.xml | 2 +- .../simple-osgi/simple-osgi-camel-client/pom.xml | 1 - examples/troubleshooting/README.md | 2 +- pom.xml | 19 ++++++++++++------- 4 files changed, 14 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/9897c846/examples/deltaspike-fullstack/pom.xml ---------------------------------------------------------------------- diff --git a/examples/deltaspike-fullstack/pom.xml b/examples/deltaspike-fullstack/pom.xml index fc06d46..ccafd05 100644 --- a/examples/deltaspike-fullstack/pom.xml +++ b/examples/deltaspike-fullstack/pom.xml @@ -130,7 +130,7 @@ <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.1</version> + <version>3.2.2</version> </dependency> <dependency> <groupId>org.slf4j</groupId> http://git-wip-us.apache.org/repos/asf/tomee/blob/9897c846/examples/simple-osgi/simple-osgi-camel-client/pom.xml ---------------------------------------------------------------------- diff --git a/examples/simple-osgi/simple-osgi-camel-client/pom.xml b/examples/simple-osgi/simple-osgi-camel-client/pom.xml index 8b08d1b..7096317 100644 --- a/examples/simple-osgi/simple-osgi-camel-client/pom.xml +++ b/examples/simple-osgi/simple-osgi-camel-client/pom.xml @@ -42,7 +42,6 @@ org.superbiz.osgi.calculator, org.apache.openejb.client;version="[4.0,5.0)" </Import-Package> - <Include-Resource>${pom.basedir}/src/main/resources</Include-Resource> </instructions> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/tomee/blob/9897c846/examples/troubleshooting/README.md ---------------------------------------------------------------------- diff --git a/examples/troubleshooting/README.md b/examples/troubleshooting/README.md index bde0325..094ac12 100644 --- a/examples/troubleshooting/README.md +++ b/examples/troubleshooting/README.md @@ -300,7 +300,7 @@ Title: Troubleshooting 2011-10-29 11:50:20,012 - DEBUG - Descriptors path: jar:file:/Users/dblevins/.m2/repository/org/apache/xbean/xbean-asm-shaded/3.8/xbean-asm-shaded-3.8.jar!/ 2011-10-29 11:50:20,012 - DEBUG - Descriptors path: jar:file:/Users/dblevins/.m2/repository/org/apache/openwebbeans/openwebbeans-ee-common/1.1.1/openwebbeans-ee-common-1.1.1.jar!/ 2011-10-29 11:50:20,012 - DEBUG - Descriptors path: jar:file:/Users/dblevins/.m2/repository/commons-pool/commons-pool/1.5.6/commons-pool-1.5.6.jar!/ - 2011-10-29 11:50:20,012 - DEBUG - Descriptors path: jar:file:/Users/dblevins/.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/ + 2011-10-29 11:50:20,012 - DEBUG - Descriptors path: jar:file:/Users/dblevins/.m2/repository/commons-collections/commons-collections/3.2.2/commons-collections-3.2.1.jar!/ 2011-10-29 11:50:20,013 - DEBUG - Descriptors path: jar:file:/Users/dblevins/.m2/repository/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar!/ 2011-10-29 11:50:20,013 - DEBUG - Descriptors path: jar:file:/Users/dblevins/.m2/repository/org/apache/openwebbeans/openwebbeans-impl/1.1.1/openwebbeans-impl-1.1.1.jar!/ 2011-10-29 11:50:20,013 - DEBUG - Descriptors path: jar:file:/Users/dblevins/.m2/repository/org/apache/xbean/xbean-finder-shaded/3.8/xbean-finder-shaded-3.8.jar!/ http://git-wip-us.apache.org/repos/asf/tomee/blob/9897c846/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6ae0220..40d4980 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,8 @@ <!-- $Rev$ $Date$ --> -<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";> +<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";> <modelVersion>4.0.0</modelVersion> @@ -109,15 +110,15 @@ <xbeanVersion>4.2</xbeanVersion> <!-- OSGi bundles properties --> - <openejb.bundle.activator /> + <openejb.bundle.activator/> <openejb.osgi.import.pkg>*</openejb.osgi.import.pkg> <openejb.osgi.import>${openejb.osgi.import.pkg}</openejb.osgi.import> <openejb.osgi.export.pkg>org.apache.openejb</openejb.osgi.export.pkg> <openejb.osgi.export>${openejb.osgi.export.pkg}*;version=${openejb.osgi.export.version}</openejb.osgi.export> - <openejb.osgi.fragment /> - <openejb.osgi.require /> + <openejb.osgi.fragment/> + <openejb.osgi.require/> <openejb.osgi.private.pkg>!*</openejb.osgi.private.pkg> - <openejb.osgi.dynamic.import.pkg /> + <openejb.osgi.dynamic.import.pkg/> <openejb.osgi.export.version>${project.version}</openejb.osgi.export.version> <openejb.osgi.dynamic.import>${openejb.osgi.dynamic.import.pkg}</openejb.osgi.dynamic.import> <openejb.osgi.symbolic.name>${project.groupId}.${project.artifactId}</openejb.osgi.symbolic.name> @@ -154,7 +155,7 @@ <commons-logging-api.version>1.1</commons-logging-api.version> <commons-dbcp.version>1.4</commons-dbcp.version> <commons-pool.version>1.5.7</commons-pool.version> - <commons-collections.version>3.2.1</commons-collections.version> + <commons-collections.version>3.2.2</commons-collections.version> <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> @@ -340,7 +341,7 @@ <!-- the following settings are important when working with git --> <localCheckout>true</localCheckout> <pushChanges>false</pushChanges> - <releaseProfiles /> + <releaseProfiles/> </configuration> </plugin> @@ -1540,6 +1541,10 @@ <artifactId>geronimo-jta_1.1_spec</artifactId> </exclusion> <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + <exclusion> <groupId>commons-pool</groupId> <artifactId>commons-pool</artifactId> </exclusion>
