This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git
commit 6e13cc709f558cd747b4f7a7ceef43dd157cec0d Author: Mark Struberg <[email protected]> AuthorDate: Mon Dec 13 11:36:27 2021 +0100 MEECROWAVE-305 update some dependencies * tomcat 9.0.54 -> 9.0.56 * OpenWebBeans 2.0.23 -> 2.0.25 * DeltaSpike 1.8.2 -> 1.9.5 * JPA to 2.2 spec --- .../java/org/apache/meecrowave/MeecrowaveTest.java | 18 +++++++++--------- meecrowave-jpa/pom.xml | 2 +- meecrowave-oauth2-minimal/pom.xml | 2 +- meecrowave-oauth2/pom.xml | 2 +- pom.xml | 10 +++++----- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/meecrowave-core/src/test/java/org/apache/meecrowave/MeecrowaveTest.java b/meecrowave-core/src/test/java/org/apache/meecrowave/MeecrowaveTest.java index e5a2caa..0e17504 100644 --- a/meecrowave-core/src/test/java/org/apache/meecrowave/MeecrowaveTest.java +++ b/meecrowave-core/src/test/java/org/apache/meecrowave/MeecrowaveTest.java @@ -172,7 +172,7 @@ public class MeecrowaveTest { 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"))); - } catch (final IOException e) { + } catch (final Exception e) { fail(e.getMessage()); } } @@ -220,14 +220,14 @@ public class MeecrowaveTest { } private void assertNotAvailable(final URL url) { - try { - URLConnection connection = url.openConnection(); - connection.setReadTimeout(500); - connection.getInputStream(); - fail(url.toString() + " is available"); - } catch (Exception e) { - assertTrue(e.getMessage(), e instanceof IOException); - } + try { + URLConnection connection = url.openConnection(); + connection.setReadTimeout(500); + connection.getInputStream(); + fail(url.toString() + " is available"); + } catch (Exception e) { + assertTrue(e.getMessage(), e instanceof IOException); + } } private String slurp(final URL url) { diff --git a/meecrowave-jpa/pom.xml b/meecrowave-jpa/pom.xml index b85338e..cedcda7 100644 --- a/meecrowave-jpa/pom.xml +++ b/meecrowave-jpa/pom.xml @@ -35,7 +35,7 @@ <dependencies> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_2.1_spec</artifactId> + <artifactId>geronimo-jpa_2.2_spec</artifactId> <version>${jpa-spec.version}</version> </dependency> <dependency> diff --git a/meecrowave-oauth2-minimal/pom.xml b/meecrowave-oauth2-minimal/pom.xml index 5d87910..37eb994 100644 --- a/meecrowave-oauth2-minimal/pom.xml +++ b/meecrowave-oauth2-minimal/pom.xml @@ -111,7 +111,7 @@ </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_2.1_spec</artifactId> + <artifactId>geronimo-jpa_2.2_spec</artifactId> <version>${jpa-spec.version}</version> <scope>provided</scope> </dependency> diff --git a/meecrowave-oauth2/pom.xml b/meecrowave-oauth2/pom.xml index af40579..b6756e5 100644 --- a/meecrowave-oauth2/pom.xml +++ b/meecrowave-oauth2/pom.xml @@ -68,7 +68,7 @@ </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_2.1_spec</artifactId> + <artifactId>geronimo-jpa_2.2_spec</artifactId> <version>${jpa-spec.version}</version> </dependency> <dependency> diff --git a/pom.xml b/pom.xml index ff2abe2..693ef3b 100644 --- a/pom.xml +++ b/pom.xml @@ -50,16 +50,16 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <meecrowave.build.name>${project.groupId}.${project.artifactId}</meecrowave.build.name> - <junit.version>4.13.1</junit.version> - <tomcat.version>9.0.54</tomcat.version> - <openwebbeans.version>2.0.23</openwebbeans.version> + <junit.version>4.13.2</junit.version> + <tomcat.version>9.0.56</tomcat.version> + <openwebbeans.version>2.0.25-SNAPSHOT</openwebbeans.version> <cxf.version>3.4.5</cxf.version> <johnzon.version>1.2.14</johnzon.version> <log4j2.version>2.15.0</log4j2.version> - <deltaspike.version>1.8.2</deltaspike.version> + <deltaspike.version>1.9.5</deltaspike.version> <jaxb.version>2.2.11</jaxb.version> <openjpa.version>3.2.0</openjpa.version> - <jpa-spec.version>1.0-alpha-1</jpa-spec.version> + <jpa-spec.version>1.1</jpa-spec.version> <h2.version>1.4.200</h2.version> <dbcp2.version>2.8.0</dbcp2.version> <commons-cli.version>1.4</commons-cli.version>
