applygin Roberto's PR about MP distro + MP-config TCK + fixing pom merge issues
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/62f75fc6 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/62f75fc6 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/62f75fc6 Branch: refs/heads/fb_tomee8 Commit: 62f75fc6c7d0a7e179012e9466a43c553998e9fc Parents: 27639ab 021b9ca Author: Romain Manni-Bucau <rmannibu...@gmail.com> Authored: Mon Mar 12 14:25:47 2018 +0100 Committer: Romain Manni-Bucau <rmannibu...@gmail.com> Committed: Mon Mar 12 14:25:47 2018 +0100 ---------------------------------------------------------------------- .../arquillian/tests/jms/EnvEntryTest.java | 2 + .../apache/openejb/config/DeploymentLoader.java | 12 +- .../src/main/resources/default.exclusions | 4 +- .../superbiz/counter/CounterCallbacksTest.java | 2 +- pom.xml | 12 +- tck/microprofile-tck/config/pom.xml | 129 ++ .../microprofile/config/ConfigurationBean.java | 25 + .../MicroProfileConfigTCKArchiveProcessor.java | 33 + .../config/MicroProfileConfigTCKExtension.java | 11 + .../config/MicroProfileConfigurationTest.java | 69 + ....jboss.arquillian.core.spi.LoadableExtension | 1 + .../config/src/test/resources/arquillian.xml | 41 + tck/microprofile-tck/pom.xml | 37 + tck/pom.xml | 1 + tomee/apache-tomee/pom.xml | 68 + .../src/main/assembly/tomee-microprofile.xml | 84 ++ tomee/pom.xml | 1 + .../org/apache/tomee/catalina/TomcatLoader.java | 2 + tomee/tomee-microprofile-webapp/pom.xml | 101 ++ .../src/main/assembly/war.xml | 92 ++ .../src/main/resources/META-INF/LICENSE | 1197 ++++++++++++++++++ .../src/main/resources/META-INF/NOTICE | 140 ++ 22 files changed, 2052 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/62f75fc6/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/62f75fc6/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index e143fc2,0fc7f2e..92db56b --- a/pom.xml +++ b/pom.xml @@@ -94,17 -94,16 +94,17 @@@ <properties> <tomee.version>${project.version}</tomee.version> - <maven.compiler.source>1.7</maven.compiler.source> - <maven.compiler.target>1.7</maven.compiler.target> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + <surefire.version>2.20</surefire.version> <!-- To easily change the javaee api version --> - <version.javaee-api>7.0-1</version.javaee-api> + <version.javaee-api>8.0-SNAPSHOT</version.javaee-api> - <openjpa.version>2.4.2</openjpa.version> - <org.apache.openwebbeans.version>1.7.4</org.apache.openwebbeans.version> + <openjpa.version>3.0.0-SNAPSHOT</openjpa.version> + <openwebbeans.version>2.0.4</openwebbeans.version> <jcs.version>2.1</jcs.version> - <johnzon.version>1.1.6</johnzon.version> - <johnzon.version>1.0.0</johnzon.version> ++ <johnzon.version>1.1.7</johnzon.version> <!-- Maven module versions --> <maven-bundle-plugin.version>3.3.0</maven-bundle-plugin.version> @@@ -126,15 -125,18 +126,15 @@@ <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> - <batchee.version>0.5-incubating</batchee.version> - <batchee.version>0.4-incubating</batchee.version> ++ <batchee.version>0.5-incubating</batchee.version> <version.arquillian>1.1.13.Final</version.arquillian> - <version.shrinkwrap.descriptor>2.0.0-alpha-10</version.shrinkwrap.descriptor> + <version.shrinkwrap.descriptor>2.0.0</version.shrinkwrap.descriptor> <version.shrinkwrap.shrinkwrap>1.2.6</version.shrinkwrap.shrinkwrap> - <tomcat.version>9.0.5</tomcat.version> - <tomcat.version>8.5.23</tomcat.version> ++ <tomcat.version>9.0.6</tomcat.version> - <cxf.version>3.1.13</cxf.version> - <version.shrinkwrap.shrinkwrap>1.2.6</version.shrinkwrap.shrinkwrap> - <version.shrinkwrap.descriptor>2.0.0</version.shrinkwrap.descriptor> - <version.arquillian>1.1.13.Final</version.arquillian> + <cxf.version>3.2.1</cxf.version> <ehcache.version>2.10.3</ehcache.version> <!-- used by cxf for security (replay attack) --> <jetty.version>7.5.3.v20111011</jetty.version> @@@ -175,8 -177,8 +175,8 @@@ <geronimo.connector.version>3.1.4</geronimo.connector.version> <geronimo-osgi.version>1.1</geronimo-osgi.version> <geronimo-javamail_1.4_spec.version>1.9.0-alpha-2</geronimo-javamail_1.4_spec.version> - <myfaces.version>2.3.0-SNAPSHOT</myfaces.version> - <myfaces.version>2.2.12</myfaces.version> - <mojarra.version>2.2.12</mojarra.version> ++ <myfaces.version>2.3.0</myfaces.version> + <mojarra.version>2.3.3</mojarra.version> <slf4j.version>1.7.21</slf4j.version> <log4j.version>1.2.17</log4j.version> <log4j2.version>2.0.1</log4j2.version> http://git-wip-us.apache.org/repos/asf/tomee/blob/62f75fc6/tck/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/62f75fc6/tomee/apache-tomee/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/62f75fc6/tomee/pom.xml ----------------------------------------------------------------------
