ODE-1069: Upgraded to TOMEE 7.0.4
Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/691267bb Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/691267bb Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/691267bb Branch: refs/heads/master Commit: 691267bb507afeeb7f302a20925f0e1f9a4c7221 Parents: 39bbbf4 Author: sathwik <[email protected]> Authored: Tue Nov 28 17:01:48 2017 +0530 Committer: sathwik <[email protected]> Committed: Tue Nov 28 17:01:48 2017 +0530 ---------------------------------------------------------------------- dependencies.rb | 32 ++++++++++++------------- tomee-server/src/main/server/bin/start.bat | 2 +- tomee-server/src/main/server/bin/start.sh | 2 +- 3 files changed, 17 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/691267bb/dependencies.rb ---------------------------------------------------------------------- diff --git a/dependencies.rb b/dependencies.rb index 32de919..694c013 100644 --- a/dependencies.rb +++ b/dependencies.rb @@ -72,8 +72,8 @@ DERBY_TOOLS = "org.apache.derby:derbytools:jar:10.5.3.0_1" DOM4J = "dom4j:dom4j:jar:1.6.1" GERONIMO = struct( :kernel =>"org.apache.geronimo.modules:geronimo-kernel:jar:2.0.1", - :transaction =>"org.apache.geronimo.components:geronimo-transaction:jar:3.1.3", - :connector =>"org.apache.geronimo.components:geronimo-connector:jar:3.1.3" + :transaction =>"org.apache.geronimo.components:geronimo-transaction:jar:3.1.4", + :connector =>"org.apache.geronimo.components:geronimo-connector:jar:3.1.4" ) HAZELCAST ="com.hazelcast:hazelcast:jar:3.4.2" HIBERNATE = ["org.hibernate:hibernate-core:jar:4.3.11.Final", "org.javassist:javassist:jar:3.18.1-GA", "antlr:antlr:jar:2.7.7", @@ -178,7 +178,7 @@ TOMEE = struct( "tomee-jdbc", "tomee-juli", "tomee-util", - :under=>"org.apache.tomee", :version=>"7.0.1" + :under=>"org.apache.tomee", :version=>"7.0.4" ) ], :openejb => [ @@ -195,9 +195,8 @@ TOMEE = struct( "openejb-jpa-integration", "openejb-client", "mbean-annotation-api", - :under=>"org.apache.tomee", :version=>"7.0.1" + :under=>"org.apache.tomee", :version=>"7.0.4" ), - "org.apache.openejb.patch:openejb-jstl:jar:1.2", "org.apache.openejb.shade:quartz-openejb-shade:jar:2.2.1" ], :tomcat => [ @@ -220,18 +219,18 @@ TOMEE = struct( "tomcat-jasper-el", "tomcat-websocket", "tomcat-juli", - :under=>"org.apache.tomcat", :version=>"8.5.3" + :under=>"org.apache.tomcat", :version=>"8.5.23" ) ], - :javaee_api => "org.apache.tomee:javaee-api:jar:tomcat:7.0", - :commons => ["org.apache.commons:commons-lang3:jar:3.4", + :javaee_api => "org.apache.tomee:javaee-api:jar:7.0-1", + :commons => ["org.apache.commons:commons-lang3:jar:3.5", "org.apache.commons:commons-dbcp2:jar:2.1", "org.apache.commons:commons-pool2:jar:2.3" ], :commons_cli => "commons-cli:commons-cli:jar:1.2", :commons_collections => "commons-collections:commons-collections:jar:3.2.2", - :commons_beanutils => "commons-beanutils:commons-beanutils-core:jar:1.8.3", - :commons_lang => "commons-lang:commons-lang:jar:2.4", + :commons_beanutils => "commons-beanutils:commons-beanutils-core:jar:1.9.3", + :commons_lang => "commons-lang:commons-lang:jar:2.6", :sxc => [ group( "sxc-jaxb-core", @@ -246,13 +245,13 @@ TOMEE = struct( "activemq-client", "activemq-openwire-legacy", "activemq-jdbc-store", - :under=>"org.apache.activemq", :version=>"5.13.3" + :under=>"org.apache.activemq", :version=>"5.14.5" ), "org.apache.activemq.protobuf:activemq-protobuf:jar:1.1" ], - :geronimo => ["org.apache.geronimo.components:geronimo-transaction:jar:3.1.3", + :geronimo => ["org.apache.geronimo.components:geronimo-transaction:jar:3.1.4", "org.apache.geronimo.javamail:geronimo-javamail_1.4_mail:jar:1.9.0-alpha-2", - "org.apache.geronimo.components:geronimo-connector:jar:3.1.3", + "org.apache.geronimo.components:geronimo-connector:jar:3.1.4", ], :howl => "org.objectweb.howl:howl:jar:1.0.1-1", :xbean => group( @@ -273,18 +272,17 @@ TOMEE = struct( "openwebbeans-ee-common", "openwebbeans-web", "openwebbeans-el22", - :under=>"org.apache.openwebbeans", :version=>"1.6.3" + :under=>"org.apache.openwebbeans", :version=>"1.7.4" ), :bval => group( "bval-core", "bval-jsr", - :under=>"org.apache.bval", :version=>"1.1.1" + :under=>"org.apache.bval", :version=>"1.1.2" ), #:jaxb => ["javax.xml.bind:jaxb-api:jar:2.2.6","com.sun.xml.bind:jaxb-impl:jar:2.2.6"], - :ecj => "org.eclipse.jdt.core.compiler:ecj:jar:4.4", :velocity => "org.apache.velocity:velocity:jar:1.6.4", :oro => "oro:oro:jar:2.0.8", - :openjpa => ["org.apache.openjpa:openjpa:jar:2.4.1","net.sourceforge.serp:serp:jar:1.15.1"] + :openjpa => ["org.apache.openjpa:openjpa:jar:2.4.2","net.sourceforge.serp:serp:jar:1.15.1"] ) http://git-wip-us.apache.org/repos/asf/ode/blob/691267bb/tomee-server/src/main/server/bin/start.bat ---------------------------------------------------------------------- diff --git a/tomee-server/src/main/server/bin/start.bat b/tomee-server/src/main/server/bin/start.bat index 06759d8..fb39071 100644 --- a/tomee-server/src/main/server/bin/start.bat +++ b/tomee-server/src/main/server/bin/start.bat @@ -29,7 +29,7 @@ set ODE_SERVER_CONF=%~dp0..\conf set ODE_SERVER_JAVAOPTS=%JAVA_OPTS% set ODE_SERVER_JAVAOPTS=%ODE_SERVER_JAVAOPTS% -Dode.server.home=%ODE_SERVER_HOME% -Dderby.syste.home=%ODE_SERVER_HOME% -set ODE_SERVER_JAVAOPTS=%ODE_SERVER_JAVAOPTS% -Djava.naming.factory.initial=org.apache.openejb.core.LocalInitialContextFactory +set ODE_SERVER_JAVAOPTS=%ODE_SERVER_JAVAOPTS% -Djava.naming.factory.initial=org.apache.openejb.core.OpenEJBInitialContextFactory set ODE_SERVER_JAVAOPTS=%ODE_SERVER_JAVAOPTS% -Dorg.jboss.logging.provider=slf4j if "%JAVA_HOME%"=="" goto noJavaHome http://git-wip-us.apache.org/repos/asf/ode/blob/691267bb/tomee-server/src/main/server/bin/start.sh ---------------------------------------------------------------------- diff --git a/tomee-server/src/main/server/bin/start.sh b/tomee-server/src/main/server/bin/start.sh index ce21b61..6e3cc02 100755 --- a/tomee-server/src/main/server/bin/start.sh +++ b/tomee-server/src/main/server/bin/start.sh @@ -96,7 +96,7 @@ done ODE_SERVER_JAVAOPTS="$JAVA_OPTS \ -Dode.server.home=$ODE_SERVER_HOME \ -Dderby.system.home=$ODE_SERVER_HOME \ --Djava.naming.factory.initial=org.apache.openejb.core.LocalInitialContextFactory \ +-Djava.naming.factory.initial=org.apache.openejb.core.OpenEJBInitialContextFactory \ -Dorg.jboss.logging.provider=slf4j"
