From commits-return-8105-archive-asf-public=cust-asf.ponee.io@openwebbeans.apache.org Mon Mar 18 08:22:09 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 011EE180651 for ; Mon, 18 Mar 2019 09:22:07 +0100 (CET) Received: (qmail 9545 invoked by uid 500); 18 Mar 2019 08:22:06 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 9534 invoked by uid 99); 18 Mar 2019 08:22:06 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Mar 2019 08:22:06 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id C0A463A0044 for ; Mon, 18 Mar 2019 08:22:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1855734 - in /openwebbeans/meecrowave/trunk: ./ integration-tests/beanvalidation/ meecrowave-core/ meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/ meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/ meecrowave-cor... Date: Mon, 18 Mar 2019 08:22:05 -0000 To: commits@openwebbeans.apache.org From: rmannibucau@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20190318082205.C0A463A0044@svn01-us-west.apache.org> Author: rmannibucau Date: Mon Mar 18 08:22:04 2019 New Revision: 1855734 URL: http://svn.apache.org/viewvc?rev=1855734&view=rev Log: MEECROWAVE-187 tomcat 9.0.17 + some adjustment of java11 profile Modified: openwebbeans/meecrowave/trunk/integration-tests/beanvalidation/pom.xml openwebbeans/meecrowave/trunk/meecrowave-core/pom.xml openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnownJarsFilter.java openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/OWBJarScanner.java openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/apache/meecrowave/MeecrowaveTest.java openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/apache/meecrowave/PrincipalTest.java openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/apache/meecrowave/SharedLibTest.java openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/superbiz/app/Endpoint.java openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/content/meecrowave-maven/index.adoc openwebbeans/meecrowave/trunk/meecrowave-oauth2/pom.xml openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/test/java/org/apache/meecrowave/oauth2/OAuth2Test.java openwebbeans/meecrowave/trunk/meecrowave-specs-api/pom.xml openwebbeans/meecrowave/trunk/pom.xml Modified: openwebbeans/meecrowave/trunk/integration-tests/beanvalidation/pom.xml URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/integration-tests/beanvalidation/pom.xml?rev=1855734&r1=1855733&r2=1855734&view=diff ============================================================================== --- openwebbeans/meecrowave/trunk/integration-tests/beanvalidation/pom.xml (original) +++ openwebbeans/meecrowave/trunk/integration-tests/beanvalidation/pom.xml Mon Mar 18 08:22:04 2019 @@ -17,7 +17,8 @@ specific language governing permissions and limitations under the License. --> - + integration-tests org.apache.meecrowave @@ -52,4 +53,23 @@ test + + + + java11 + + 11 + + + + javax.xml.bind + jaxb-api + + + com.sun.xml.bind + jaxb-impl + + + + Modified: openwebbeans/meecrowave/trunk/meecrowave-core/pom.xml URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/pom.xml?rev=1855734&r1=1855733&r2=1855734&view=diff ============================================================================== --- openwebbeans/meecrowave/trunk/meecrowave-core/pom.xml (original) +++ openwebbeans/meecrowave/trunk/meecrowave-core/pom.xml Mon Mar 18 08:22:04 2019 @@ -234,7 +234,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.1.1 + 3.2.1 bundle Modified: openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnownJarsFilter.java URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnownJarsFilter.java?rev=1855734&r1=1855733&r2=1855734&view=diff ============================================================================== --- openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnownJarsFilter.java (original) +++ openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnownJarsFilter.java Mon Mar 18 08:22:04 2019 @@ -86,6 +86,8 @@ public class KnownJarsFilter implements add("cglib-"); add("charsets.jar"); add("checker-qual"); + add("common-java5"); + add("common-junit"); add("commons-beanutils"); add("commons-cli-"); add("commons-codec-"); @@ -174,6 +176,7 @@ public class KnownJarsFilter implements add("javax."); add("jaxb-"); add("jaxp-"); + add("jaxws-api"); add("jbake-"); add("jboss-"); add("jbossall-"); @@ -295,6 +298,7 @@ public class KnownJarsFilter implements add("sshd-"); add("stax2-api-"); add("stax-api-"); + add("stax-ex-"); add("sunec.jar"); add("surefire-"); add("swizzle-"); Modified: openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/OWBJarScanner.java URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/OWBJarScanner.java?rev=1855734&r1=1855733&r2=1855734&view=diff ============================================================================== --- openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/OWBJarScanner.java (original) +++ openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/OWBJarScanner.java Mon Mar 18 08:22:04 2019 @@ -50,6 +50,10 @@ public class OWBJarScanner implements Ja try { final URL url = new URL(u); final File asFile = Files.toFile(url); + if (!filter.check(jarScanType, asFile.getName())) { + return; + } + if (asFile.getName().endsWith(Constants.JAR_EXT)) { try (final Jar jar = JarFactory.newInstance(asFile.toURI().toURL())) { callback.scan(jar, u, true); Modified: openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/apache/meecrowave/MeecrowaveTest.java URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/apache/meecrowave/MeecrowaveTest.java?rev=1855734&r1=1855733&r2=1855734&view=diff ============================================================================== --- openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/apache/meecrowave/MeecrowaveTest.java (original) +++ openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/apache/meecrowave/MeecrowaveTest.java Mon Mar 18 08:22:04 2019 @@ -101,9 +101,9 @@ public class MeecrowaveTest { try (final Meecrowave meecrowave = new Meecrowave(new Meecrowave.Builder().randomHttpPort().includePackages("org.superbiz.app")).start()) { meecrowave.deployWebapp("", root); assertEquals("hello", slurp(new URL("http://localhost:" + meecrowave.getConfiguration().getHttpPort() + "/index.html"))); - assertEquals("simple", slurp(new URL("http://localhost:" + meecrowave.getConfiguration().getHttpPort() + "/api/test"))); - assertEquals("simplepathinfo", slurp(new URL("http://localhost:" + meecrowave.getConfiguration().getHttpPort() - + "/api/test?checkcustom=pathinfo#is=fine"))); + assertEquals("simplefalse", slurp(new URL("http://localhost:" + meecrowave.getConfiguration().getHttpPort() + "/api/test"))); + assertEquals("simpletrue", slurp(new URL("http://localhost:" + meecrowave.getConfiguration().getHttpPort() + + "/api/test?checkcustom=true"))); assertEquals("simple", slurp(new URL("http://localhost:" + meecrowave.getConfiguration().getHttpPort() + "/api/other"))); assertEquals("simplefiltertrue", slurp(new URL("http://localhost:" + meecrowave.getConfiguration().getHttpPort() + "/filter"))); assertEquals("filtertrue", slurp(new URL("http://localhost:" + meecrowave.getConfiguration().getHttpPort() + "/other"))); @@ -115,7 +115,7 @@ public class MeecrowaveTest { @Test public void classpath() { try (final Meecrowave meecrowave = new Meecrowave(new Meecrowave.Builder().randomHttpPort().includePackages("org.superbiz.app")).bake()) { - assertEquals("simple", slurp(new URL("http://localhost:" + meecrowave.getConfiguration().getHttpPort() + "/api/test"))); + assertEquals("simplefalse", slurp(new URL("http://localhost:" + meecrowave.getConfiguration().getHttpPort() + "/api/test"))); assertEquals("simplefiltertrue", slurp(new URL("http://localhost:" + meecrowave.getConfiguration().getHttpPort() + "/filter"))); assertEquals( "sci:" + Bounced.class.getName() + Endpoint.class.getName() + InterfaceApi.class.getName() + RsApp.class.getName(), Modified: openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/apache/meecrowave/PrincipalTest.java URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/apache/meecrowave/PrincipalTest.java?rev=1855734&r1=1855733&r2=1855734&view=diff ============================================================================== --- openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/apache/meecrowave/PrincipalTest.java (original) +++ openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/apache/meecrowave/PrincipalTest.java Mon Mar 18 08:22:04 2019 @@ -28,8 +28,8 @@ import java.net.URL; import java.net.URLConnection; import java.nio.charset.StandardCharsets; import java.security.Principal; +import java.util.Base64; -import static javax.xml.bind.DatatypeConverter.printBase64Binary; import static org.junit.Assert.assertEquals; public class PrincipalTest { @@ -64,7 +64,7 @@ public class PrincipalTest { private String slurp(final URL url) throws IOException { final URLConnection is = HttpURLConnection.class.cast(url.openConnection()); - is.setRequestProperty("Authorization", "Basic " + printBase64Binary("foo:pwd".getBytes(StandardCharsets.UTF_8))); + is.setRequestProperty("Authorization", "Basic " + Base64.getEncoder().encodeToString("foo:pwd".getBytes(StandardCharsets.UTF_8))); return IO.toString(is.getInputStream()); } Modified: openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/apache/meecrowave/SharedLibTest.java URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/apache/meecrowave/SharedLibTest.java?rev=1855734&r1=1855733&r2=1855734&view=diff ============================================================================== --- openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/apache/meecrowave/SharedLibTest.java (original) +++ openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/apache/meecrowave/SharedLibTest.java Mon Mar 18 08:22:04 2019 @@ -37,7 +37,7 @@ public class SharedLibTest { .bake()) { assertEquals( "org.apache.deltaspike.core.api.config.ConfigProperty", - slurp(new URL("http://localhost:" + container.getConfiguration().getHttpPort() + "/api/test/load/org.apache.deltaspike.core.api.config.ConfigProperty"))); + slurp(new URL("http://localhost:" + container.getConfiguration().getHttpPort() + "/api/test/load/true"))); } } Modified: openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/superbiz/app/Endpoint.java URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/superbiz/app/Endpoint.java?rev=1855734&r1=1855733&r2=1855734&view=diff ============================================================================== --- openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/superbiz/app/Endpoint.java (original) +++ openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/superbiz/app/Endpoint.java Mon Mar 18 08:22:04 2019 @@ -18,6 +18,10 @@ */ package org.superbiz.app; +import static org.junit.Assert.assertNotNull; + +import java.security.Principal; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.spi.BeanManager; import javax.inject.Inject; @@ -28,10 +32,6 @@ import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; -import java.security.Principal; - -import static java.util.Optional.ofNullable; -import static org.junit.Assert.assertNotNull; @Path("test") @ApplicationScoped @@ -50,8 +50,8 @@ public class Endpoint { @GET @Produces(MediaType.TEXT_PLAIN) - public String simple(@QueryParam("checkcustom") final String query) { - return Boolean.parseBoolean(injectable.injected()) ? "simple" + ofNullable(query).orElse("") : "fail"; + public String simple(@QueryParam("checkcustom") final boolean query) { + return Boolean.parseBoolean(injectable.injected()) ? "simple" + query : "fail"; } @GET @@ -72,15 +72,15 @@ public class Endpoint { @GET @Path("load/{name}") @Produces(MediaType.TEXT_PLAIN) - public String load(@PathParam("name") final String fqn) { + public String load(@PathParam("name") final boolean ds) { try { final ClassLoader loader = Thread.currentThread().getContextClassLoader(); // if sharedlib is set should be MeecrowaveClassloader - if (fqn.contains("deltaspike")) { + if (ds) { final Class ce = loader.loadClass("org.apache.deltaspike.core.impl.config.ConfigurationExtension"); final Object extensionBeanInstance = bm.getReference(bm.resolve(bm.getBeans(ce)), ce, bm.createCreationalContext(null)); assertNotNull(extensionBeanInstance); } - return loader.loadClass(fqn).getName(); + return loader.loadClass("org.apache.deltaspike.core.api.config.ConfigProperty").getName(); } catch (final ClassNotFoundException cnfe) { return "oops"; } Modified: openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/content/meecrowave-maven/index.adoc URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/content/meecrowave-maven/index.adoc?rev=1855734&r1=1855733&r2=1855734&view=diff ============================================================================== --- openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/content/meecrowave-maven/index.adoc (original) +++ openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/content/meecrowave-maven/index.adoc Mon Mar 18 08:22:04 2019 @@ -80,7 +80,7 @@ Points to take care are: org.apache.maven.plugins maven-shade-plugin - 2.4.3 + 3.2.1 bundle Modified: openwebbeans/meecrowave/trunk/meecrowave-oauth2/pom.xml URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-oauth2/pom.xml?rev=1855734&r1=1855733&r2=1855734&view=diff ============================================================================== --- openwebbeans/meecrowave/trunk/meecrowave-oauth2/pom.xml (original) +++ openwebbeans/meecrowave/trunk/meecrowave-oauth2/pom.xml Mon Mar 18 08:22:04 2019 @@ -130,7 +130,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.1.0 + 3.2.1 bundle Modified: openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/test/java/org/apache/meecrowave/oauth2/OAuth2Test.java URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/test/java/org/apache/meecrowave/oauth2/OAuth2Test.java?rev=1855734&r1=1855733&r2=1855734&view=diff ============================================================================== --- openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/test/java/org/apache/meecrowave/oauth2/OAuth2Test.java (original) +++ openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/test/java/org/apache/meecrowave/oauth2/OAuth2Test.java Mon Mar 18 08:22:04 2019 @@ -22,7 +22,6 @@ import static java.util.Collections.sing import static javax.ws.rs.client.Entity.entity; import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED_TYPE; import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; -import static javax.xml.bind.DatatypeConverter.printBase64Binary; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; @@ -183,7 +182,7 @@ public class OAuth2Test { .queryParam(OAuthConstants.CLIENT_SECRET, "cpwd") .queryParam(OAuthConstants.REDIRECT_URI, "http://localhost:" + httpPort + "/redirected") .request(APPLICATION_JSON_TYPE) - .header("authorization", "Basic " + printBase64Binary("test:pwd".getBytes(StandardCharsets.UTF_8))) + .header("authorization", "Basic " + Base64.getEncoder().encodeToString("test:pwd".getBytes(StandardCharsets.UTF_8))) .get(); final OAuthAuthorizationData data = authorization.readEntity(OAuthAuthorizationData.class); assertNotNull(data.getAuthenticityToken()); @@ -198,7 +197,7 @@ public class OAuth2Test { .queryParam(OAuthConstants.AUTHORIZATION_DECISION_KEY, "allow") .request(APPLICATION_JSON_TYPE) .cookie(authorization.getCookies().get("JSESSIONID")) - .header("authorization", "Basic " + printBase64Binary("test:pwd".getBytes(StandardCharsets.UTF_8))) + .header("authorization", "Basic " + Base64.getEncoder().encodeToString("test:pwd".getBytes(StandardCharsets.UTF_8))) .get(); assertEquals(Response.Status.SEE_OTHER.getStatusCode(), decision.getStatus()); assertTrue(decision.getLocation().toASCIIString(), decision.getLocation().toASCIIString().startsWith("http://localhost:" + httpPort + "/redirected?code=")); Modified: openwebbeans/meecrowave/trunk/meecrowave-specs-api/pom.xml URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-specs-api/pom.xml?rev=1855734&r1=1855733&r2=1855734&view=diff ============================================================================== --- openwebbeans/meecrowave/trunk/meecrowave-specs-api/pom.xml (original) +++ openwebbeans/meecrowave/trunk/meecrowave-specs-api/pom.xml Mon Mar 18 08:22:04 2019 @@ -72,7 +72,7 @@ org.apache.maven.plugins maven-shade-plugin - 2.3 + 3.2.1 mw-javaee-api Modified: openwebbeans/meecrowave/trunk/pom.xml URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/pom.xml?rev=1855734&r1=1855733&r2=1855734&view=diff ============================================================================== --- openwebbeans/meecrowave/trunk/pom.xml (original) +++ openwebbeans/meecrowave/trunk/pom.xml Mon Mar 18 08:22:04 2019 @@ -50,7 +50,7 @@ ${project.groupId}.${project.artifactId} 4.12 - 9.0.16 + 9.0.17 2.0.10 3.3.1 1.1.10 @@ -185,40 +185,42 @@ 11 - - - org.apache.geronimo.specs - geronimo-jaxws_2.2_spec - 1.1 - - - org.apache.geronimo.specs - geronimo-ws-metadata_2.0_spec - 1.1.3 - - - org.apache.geronimo.specs - geronimo-activation_1.1_spec - 1.1 - - - javax.xml.bind - jaxb-api - ${java11.jaxb.version} - - - com.sun.xml.bind - jaxb-impl - ${java11.jaxb.version} - - + + + + org.apache.geronimo.specs + geronimo-jaxws_2.2_spec + 1.1 + + + org.apache.geronimo.specs + geronimo-ws-metadata_2.0_spec + 1.1.3 + + + org.apache.geronimo.specs + geronimo-activation_1.1_spec + 1.1 + + + javax.xml.bind + jaxb-api + ${java11.jaxb.version} + + + com.sun.xml.bind + jaxb-impl + ${java11.jaxb.version} + + + - cxf-staging - https://repository.apache.org/content/repositories/orgapachecxf-1133/ + tomcat-staging + https://repository.apache.org/content/repositories/orgapachetomcat-1205/