Repository: tomee Updated Branches: refs/heads/master bd1bc848e -> ca641297d
Pull versions up to parent activemq 5.15.0 commons-logging 1.2 Remove BeanValidationAppendixInterceptor ref Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6998e215 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6998e215 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6998e215 Branch: refs/heads/master Commit: 6998e215055299ff45e20f24439eaa6f79e21a98 Parents: bd1bc84 Author: andygumbrecht <andy...@gmx.de> Authored: Wed Sep 13 18:26:34 2017 +0200 Committer: andygumbrecht <andy...@gmx.de> Committed: Wed Sep 13 18:26:34 2017 +0200 ---------------------------------------------------------------------- container/openejb-core/pom.xml | 8 +++++--- .../WebApp1/src/main/webapp/WEB-INF/ejb-jar.xml | 6 ------ .../WebApp2/src/main/webapp/WEB-INF/ejb-jar.xml | 6 ------ examples/bval-evaluation-redeployment/pom.xml | 18 +++++++++--------- pom.xml | 14 ++++++++++++-- tck/cdi-embedded/pom.xml | 1 - tomee/tomee-embedded/pom.xml | 1 - tomee/tomee-webapp/pom.xml | 1 - 8 files changed, 26 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/6998e215/container/openejb-core/pom.xml ---------------------------------------------------------------------- diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml index 1d061f9..ceeeaef 100644 --- a/container/openejb-core/pom.xml +++ b/container/openejb-core/pom.xml @@ -236,9 +236,9 @@ <excludes> <!-- This file is encoded in UTF-16LE so it causes trouble - as the default encoding is UTF-8. However as it's + as the default encoding is UTF-8. However as it's obviously only used as an input file for the corresponding - properties we're just ignoring it here. + properties we're just ignoring it here. --> <exclude>**/Messages_hi_input.txt</exclude> </excludes> @@ -423,6 +423,7 @@ </plugin> </plugins> </build> + <dependencies> <dependency> <groupId>${project.groupId}</groupId> @@ -701,7 +702,6 @@ <dependency> <!-- licence apache, only 110ko --> <groupId>org.fusesource.jansi</groupId> <artifactId>jansi</artifactId> - <version>1.8</version> <scope>provided</scope> </dependency> @@ -711,7 +711,9 @@ <version>${batchee.version}</version> <scope>provided</scope> </dependency> + </dependencies> + <profiles> <profile> <id>openejb.debug</id> http://git-wip-us.apache.org/repos/asf/tomee/blob/6998e215/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/ejb-jar.xml ---------------------------------------------------------------------- diff --git a/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/ejb-jar.xml b/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/ejb-jar.xml index bfafcc3..7b36835 100644 --- a/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/ejb-jar.xml +++ b/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/ejb-jar.xml @@ -21,10 +21,4 @@ version="3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd";> - <assembly-descriptor> - <interceptor-binding> - <ejb-name>WebApp1Service</ejb-name> - <interceptor-class>org.apache.openejb.bval.BeanValidationAppendixInterceptor</interceptor-class> - </interceptor-binding> - </assembly-descriptor> </ejb-jar> http://git-wip-us.apache.org/repos/asf/tomee/blob/6998e215/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/ejb-jar.xml ---------------------------------------------------------------------- diff --git a/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/ejb-jar.xml b/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/ejb-jar.xml index e1c9b17..7b36835 100644 --- a/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/ejb-jar.xml +++ b/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/ejb-jar.xml @@ -21,10 +21,4 @@ version="3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd";> - <assembly-descriptor> - <interceptor-binding> - <ejb-name>WebApp2Service</ejb-name> - <interceptor-class>org.apache.openejb.bval.BeanValidationAppendixInterceptor</interceptor-class> - </interceptor-binding> - </assembly-descriptor> </ejb-jar> http://git-wip-us.apache.org/repos/asf/tomee/blob/6998e215/examples/bval-evaluation-redeployment/pom.xml ---------------------------------------------------------------------- diff --git a/examples/bval-evaluation-redeployment/pom.xml b/examples/bval-evaluation-redeployment/pom.xml index 1cc3474..f104476 100644 --- a/examples/bval-evaluation-redeployment/pom.xml +++ b/examples/bval-evaluation-redeployment/pom.xml @@ -44,7 +44,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.6.1</version> + <version>3.6.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -54,7 +54,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> + <version>3.0.0</version> </plugin> </plugins> </pluginManagement> @@ -65,7 +65,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>javaee-api</artifactId> - <version>7.0</version> + <version>7.0-1</version> <scope>provided</scope> </dependency> <dependency> @@ -88,23 +88,23 @@ <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-json-provider</artifactId> - <version>2.4.0</version> + <version>2.8.8</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.4.0</version> + <version>2.8.2</version> </dependency> <dependency> <groupId>org.apache.deltaspike.core</groupId> <artifactId>deltaspike-core-api</artifactId> - <version>0.7</version> + <version>1.3.0</version> </dependency> <dependency> <groupId>org.apache.deltaspike.core</groupId> <artifactId>deltaspike-core-impl</artifactId> <scope>runtime</scope> - <version>0.7</version> + <version>1.3.0</version> </dependency> <dependency> <groupId>org.apache.tomee</groupId> @@ -121,13 +121,13 @@ <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> - <version>1.1.10.Final</version> + <version>1.1.13.Final</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> - <version>2.6.13</version> + <version>2.6.17</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/tomee/blob/6998e215/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4599d27..a2facde 100644 --- a/pom.xml +++ b/pom.xml @@ -153,7 +153,7 @@ <!-- Apache Commons --> <commons-beanutils.version>1.9.3</commons-beanutils.version> <commons-cli.version>1.2</commons-cli.version> - <commons-logging.version>1.1.1</commons-logging.version> + <commons-logging.version>1.2</commons-logging.version> <commons-logging-api.version>1.1</commons-logging-api.version> <commons-dbcp.version>2.1</commons-dbcp.version> <commons-pool.version>2.3</commons-pool.version> @@ -166,7 +166,7 @@ <commons-net.version>3.3</commons-net.version> <bval.version>1.1.2</bval.version> - <org.apache.activemq.version>5.14.3</org.apache.activemq.version> + <org.apache.activemq.version>5.15.0</org.apache.activemq.version> <org.springframework.version>3.1.4.RELEASE</org.springframework.version> <junit.version>4.12</junit.version> <org.apache.axis2.version>1.4.1</org.apache.axis2.version> @@ -1693,6 +1693,16 @@ <artifactId>jaxb-core</artifactId> <version>2.3.0-b170127.1453</version> </dependency> + <dependency> <!-- licence apache, only 110ko --> + <groupId>org.fusesource.jansi</groupId> + <artifactId>jansi</artifactId> + <version>1.16</version> + </dependency> + <dependency> + <groupId>org.apache.taglibs</groupId> + <artifactId>taglibs-standard-jstlel</artifactId> + <version>1.2.5</version> + </dependency> </dependencies> </dependencyManagement> http://git-wip-us.apache.org/repos/asf/tomee/blob/6998e215/tck/cdi-embedded/pom.xml ---------------------------------------------------------------------- diff --git a/tck/cdi-embedded/pom.xml b/tck/cdi-embedded/pom.xml index 322c11d..da4b989 100644 --- a/tck/cdi-embedded/pom.xml +++ b/tck/cdi-embedded/pom.xml @@ -66,7 +66,6 @@ <dependency> <groupId>org.apache.taglibs</groupId> <artifactId>taglibs-standard-jstlel</artifactId> - <version>1.2.5</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/tomee/blob/6998e215/tomee/tomee-embedded/pom.xml ---------------------------------------------------------------------- diff --git a/tomee/tomee-embedded/pom.xml b/tomee/tomee-embedded/pom.xml index cc9d1c2..9ae8a36 100644 --- a/tomee/tomee-embedded/pom.xml +++ b/tomee/tomee-embedded/pom.xml @@ -332,7 +332,6 @@ <dependency> <groupId>org.apache.taglibs</groupId> <artifactId>taglibs-standard-jstlel</artifactId> - <version>1.2.5</version> </dependency> <dependency> <groupId>org.apache.tomcat</groupId> http://git-wip-us.apache.org/repos/asf/tomee/blob/6998e215/tomee/tomee-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/tomee/tomee-webapp/pom.xml b/tomee/tomee-webapp/pom.xml index b251a36..c4e6821 100644 --- a/tomee/tomee-webapp/pom.xml +++ b/tomee/tomee-webapp/pom.xml @@ -169,7 +169,6 @@ <dependency> <groupId>org.apache.taglibs</groupId> <artifactId>taglibs-standard-jstlel</artifactId> - <version>1.2.5</version> </dependency> <dependency> <groupId>${project.groupId}</groupId>
