From ac14b00040ff7ac3ae2a03c6e2e481de14a69503 Mon Sep 17 00:00:00 2001 From: iroqueta Date: Tue, 23 Aug 2022 09:56:59 -0300 Subject: [PATCH 1/9] Changes to download standard classes and dependencies at compilation time in GeneXus. Issue: 97430 --- common/pom.xml | 2 +- gxawsserverless/pom.xml | 39 ------------ gxcryptocommon/pom.xml | 5 -- gxgeospatial/pom.xml | 10 ++++ gxmail/pom.xml | 5 -- gxoffice/pom.xml | 20 ------- gxsearch/pom.xml | 25 -------- java/pom.xml | 130 ++-------------------------------------- javapns/pom.xml | 5 -- pom.xml | 3 +- wrapperjakarta/pom.xml | 61 ++++++++++--------- wrapperjavax/pom.xml | 17 ++++-- 12 files changed, 60 insertions(+), 262 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 87e280c20..56edd6bac 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -41,7 +41,7 @@ org.bouncycastle - bcpkix-jdk15on + bcprov-jdk15on 1.69 diff --git a/gxawsserverless/pom.xml b/gxawsserverless/pom.xml index ad8de1377..3dc19a7f7 100644 --- a/gxawsserverless/pom.xml +++ b/gxawsserverless/pom.xml @@ -61,51 +61,12 @@ 3.11.0 - - - org.glassfish.jersey.media - jersey-media-json-jackson - ${jersey.javax.version} - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-core - - - - - - org.glassfish.jersey.inject - jersey-hk2 - ${jersey.javax.version} - - com.fasterxml.jackson.core jackson-databind 2.13.2.1 - - org.slf4j - slf4j-api - 1.7.32 - - - - javax.servlet - javax.servlet-api - 3.1.0 - - diff --git a/gxcryptocommon/pom.xml b/gxcryptocommon/pom.xml index c35868145..e88956e1e 100644 --- a/gxcryptocommon/pom.xml +++ b/gxcryptocommon/pom.xml @@ -29,11 +29,6 @@ xmlsec 2.2.3 - - org.slf4j - slf4j-nop - 1.7.7 - diff --git a/gxgeospatial/pom.xml b/gxgeospatial/pom.xml index f67b47219..82787c164 100644 --- a/gxgeospatial/pom.xml +++ b/gxgeospatial/pom.xml @@ -24,6 +24,16 @@ spatial4j 0.6 + + com.vividsolutions + jts-core + 1.14.0 + + + com.vividsolutions + jts-io + 1.14.0 + net.sf.geographiclib GeographicLib-Java diff --git a/gxmail/pom.xml b/gxmail/pom.xml index 322fccaab..3c7a2194e 100644 --- a/gxmail/pom.xml +++ b/gxmail/pom.xml @@ -22,11 +22,6 @@ com.sun.mail jakarta.mail 2.0.1 - - - javax.xml.ws - jaxws-api - 2.3.1 diff --git a/gxoffice/pom.xml b/gxoffice/pom.xml index d5296f55c..4e26b31bc 100644 --- a/gxoffice/pom.xml +++ b/gxoffice/pom.xml @@ -24,31 +24,16 @@ gxclassR ${project.version} - - org.apache.poi - poi-scratchpad - ${poi.version} - org.apache.poi poi-ooxml ${poi.version} - - org.apache.commons - commons-compress - 1.21 - org.apache.poi poi ${poi.version} - - commons-codec - commons-codec - 1.9 - org.openoffice juh @@ -59,11 +44,6 @@ unoil 4.1.2 - - org.openoffice - ridl - 4.1.2 - diff --git a/gxsearch/pom.xml b/gxsearch/pom.xml index 49d0e35f3..a97350843 100644 --- a/gxsearch/pom.xml +++ b/gxsearch/pom.xml @@ -29,31 +29,6 @@ poi-ooxml ${poi.version} - - org.apache.poi - poi - ${poi.version} - - - commons-codec - commons-codec - 1.9 - - - org.openoffice - juh - 4.1.2 - - - org.openoffice - unoil - 4.1.2 - - - org.openoffice - ridl - 4.1.2 - org.apache.lucene lucene-core diff --git a/java/pom.xml b/java/pom.xml index 77c2d2491..730704d16 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -44,16 +44,6 @@ commons-collections4 4.1 - - org.apache.logging.log4j - log4j-1.2-api - 2.17.1 - - - org.apache.logging.log4j - log4j-core - 2.17.1 - javax.ejb ejb-api @@ -80,21 +70,11 @@ compiler 0.9.7 - - commons-logging - commons-logging - 1.0.4 - commons-net commons-net 3.3 - - org.apache.commons - commons-pool2 - 2.4.2 - javax.transaction jta @@ -115,11 +95,6 @@ jackson-databind 2.13.2.1 - - com.google.apis - google-api-services-androidpublisher - v2-rev105-1.23.0 - net.spy spymemcached @@ -131,9 +106,8 @@ 2.1.7 - - bouncycastle - bcmail-jdk14 + * + * @@ -153,11 +127,6 @@ encoder 1.2.2 - - org.owasp.encoder - encoder-jsp - 1.2.2 - org.apache.httpcomponents httpclient @@ -168,87 +137,7 @@ commons-logging - - - org.glassfish.gmbal - gmbal-api-only - 3.1.0-b001 - runtime - - - org.glassfish.ha - ha-api - 3.1.9 - runtime - - - javax.xml.bind - jaxb-api - 2.3.1 - runtime - - - com.sun.xml.bind - jaxb-core - 2.3.0 - runtime - - - com.sun.xml.bind - jaxb-impl - 2.3.1 - runtime - - - org.glassfish.external - management-api - 3.2.1 - runtime - - - com.sun.xml.ws - policy - 2.7.5 - - - * - * - - - runtime - - - org.jvnet.staxex - stax-ex - 1.8 - runtime - - - com.sun.xml.stream.buffer - streambuffer - 1.5.6 - runtime - - - com.sun.org.apache.xml.internal - resolver - 20050927 - - - com.sun.xml.messaging.saaj - saaj-impl - 1.5.0 - - - javax.xml.soap - saaj-api - 1.3.5 - - - jakarta.servlet - jakarta.servlet-api - 5.0.0 - + jakarta.ws.rs jakarta.ws.rs-api @@ -258,19 +147,8 @@ org.xerial sqlite-jdbc 3.36.0.3 + test - - com.microsoft.sqlserver - mssql-jdbc - 10.2.0.jre8 - runtime - - - com.dameng - DmJdbcDriver18 - 8.1.2.79 - runtime - diff --git a/javapns/pom.xml b/javapns/pom.xml index 5b4bb781f..4e2afb6a7 100644 --- a/javapns/pom.xml +++ b/javapns/pom.xml @@ -24,11 +24,6 @@ json 20180813 - - org.bouncycastle - bcpkix-jdk15on - 1.69 - org.bouncycastle bcprov-jdk15on diff --git a/pom.xml b/pom.xml index 7c033dfee..69d8680da 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ UTF-8 2.34 - 3.0.1 + 3.0.4 5.2.2 2.13.2 4.13.2 @@ -165,4 +165,5 @@ + diff --git a/wrapperjakarta/pom.xml b/wrapperjakarta/pom.xml index dd2bd52a0..1c8b882fd 100644 --- a/wrapperjakarta/pom.xml +++ b/wrapperjakarta/pom.xml @@ -43,6 +43,12 @@ com.sun.xml.ws jaxws-rt 3.0.0 + + + com.sun.xml.fastinfoset + FastInfoset + + org.glassfish.jersey.core @@ -77,19 +83,12 @@ org.glassfish.jersey.inject jersey-hk2 ${jersey.jakarta.version} - - - - - org.glassfish.hk2 - hk2-locator - ${jersey.jakarta.version} - - - - org.glassfish.hk2 - hk2-utils - ${jersey.jakarta.version} + + + org.glassfish.hk2.external + aopalliance-repackaged + + @@ -102,31 +101,35 @@ com.fasterxml.jackson.core jackson-databind ${jackson.version} - compile - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${jackson.version} + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + 2.12.2 + jakarta + + + * + * + + + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + 2.12.2 + jakarta + com.fasterxml.jackson.module - jackson-module-afterburner - ${jackson.version} + jackson-module-jaxb-annotations + 2.12.2 + jakarta - - com.sun.xml.ws - jaxws-tools - 3.0.0 - - - com.sun.istack - istack-commons-tools - 4.0.0 - org.apache.ws.security wss4j diff --git a/wrapperjavax/pom.xml b/wrapperjavax/pom.xml index e62261f07..a066c60fe 100644 --- a/wrapperjavax/pom.xml +++ b/wrapperjavax/pom.xml @@ -74,6 +74,12 @@ org.glassfish.jersey.inject jersey-hk2 ${jersey.javax.version} + + + org.glassfish.hk2.external + aopalliance-repackaged + + @@ -109,14 +115,13 @@ com.sun.xml.ws jaxws-rt - 2.3.1 + 2.3.5 - * - * - - - runtime + com.sun.xml.fastinfoset + FastInfoset + + From 666847866b6606f32a18ff7e5969414cc5b13bdb Mon Sep 17 00:00:00 2001 From: iroqueta Date: Sun, 28 Aug 2022 17:23:14 -0300 Subject: [PATCH 2/9] Changes to download standard classes and dependencies at compilation time in GeneXus. Issue: 97430 --- gxoffice/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gxoffice/pom.xml b/gxoffice/pom.xml index 77501d165..5ac7dad0e 100644 --- a/gxoffice/pom.xml +++ b/gxoffice/pom.xml @@ -24,6 +24,11 @@ gxclassR ${project.version} + + org.apache.poi + poi-scratchpad + ${poi.version} + org.apache.poi poi-ooxml From 6b717416e23682dc04d3b7b90298ea900fb419de Mon Sep 17 00:00:00 2001 From: iroqueta Date: Tue, 30 Aug 2022 15:45:49 -0300 Subject: [PATCH 3/9] Changes to download standard classes and dependencies at compilation time in GeneXus. Issue: 97430 --- gxcryptocommon/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gxcryptocommon/pom.xml b/gxcryptocommon/pom.xml index 1ccbbb745..b652b87ec 100644 --- a/gxcryptocommon/pom.xml +++ b/gxcryptocommon/pom.xml @@ -29,6 +29,11 @@ xmlsec 2.2.3 + + org.slf4j + slf4j-nop + 1.7.7 + From 708b40c654aaaddc1bd3c8dd5028ce5ffda16197 Mon Sep 17 00:00:00 2001 From: iroqueta Date: Wed, 31 Aug 2022 13:38:29 -0300 Subject: [PATCH 4/9] Changes to download standard classes and dependencies at compilation time in GeneXus. Issue: 97430 --- wrapperjakarta/pom.xml | 24 +----------------------- wrapperjavax/pom.xml | 17 ----------------- 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/wrapperjakarta/pom.xml b/wrapperjakarta/pom.xml index 9c45aa935..d8e308a03 100644 --- a/wrapperjakarta/pom.xml +++ b/wrapperjakarta/pom.xml @@ -23,11 +23,6 @@ jakarta.servlet jakarta.servlet-api 5.0.0 - - - jakarta.ws.rs - jakarta.ws.rs-api - 3.0.0 jakarta.xml.ws @@ -50,17 +45,6 @@ - - org.glassfish.jersey.core - jersey-client - ${jersey.jakarta.version} - - - org.glassfish.jersey.core - jersey-server - ${jersey.jakarta.version} - - org.glassfish.jersey.containers jersey-container-servlet-core @@ -73,12 +57,6 @@ ${jersey.jakarta.version} - - org.glassfish.jersey.ext - jersey-entity-filtering - ${jersey.jakarta.version} - - org.glassfish.jersey.inject jersey-hk2 @@ -121,7 +99,7 @@ jackson-jaxrs-base 2.12.2 jakarta - + com.fasterxml.jackson.module diff --git a/wrapperjavax/pom.xml b/wrapperjavax/pom.xml index 0657661d2..d14b24425 100644 --- a/wrapperjavax/pom.xml +++ b/wrapperjavax/pom.xml @@ -41,17 +41,6 @@ 1.3.3 - - org.glassfish.jersey.core - jersey-client - ${jersey.javax.version} - - - org.glassfish.jersey.core - jersey-server - ${jersey.javax.version} - - org.glassfish.jersey.containers jersey-container-servlet-core @@ -64,12 +53,6 @@ ${jersey.javax.version} - - org.glassfish.jersey.ext - jersey-entity-filtering - ${jersey.javax.version} - - org.glassfish.jersey.inject jersey-hk2 From a6edbb51217203d0324259eab88701a845c30c04 Mon Sep 17 00:00:00 2001 From: iroqueta Date: Wed, 31 Aug 2022 14:52:05 -0300 Subject: [PATCH 5/9] Changes to download standard classes and dependencies at compilation time in GeneXus. Issue: 97430 --- gxawsserverless/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gxawsserverless/pom.xml b/gxawsserverless/pom.xml index 32783ca35..8a7ec086b 100644 --- a/gxawsserverless/pom.xml +++ b/gxawsserverless/pom.xml @@ -66,6 +66,12 @@ jackson-databind 2.13.2.1 + + + org.glassfish.jersey.core + jersey-server + ${jersey.javax.version} + From 23639835239e5326f679b18036b3992c222d3d76 Mon Sep 17 00:00:00 2001 From: iroqueta Date: Wed, 31 Aug 2022 19:09:43 -0300 Subject: [PATCH 6/9] Changes to download standard classes and dependencies at compilation time in GeneXus. Issue: 97430 --- java/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/java/pom.xml b/java/pom.xml index 5de60380f..337a2c724 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -138,6 +138,11 @@ + + com.sun.org.apache.xml.internal + resolver + 20050927 + jakarta.ws.rs jakarta.ws.rs-api From 4d90dc26547cfdbb7486a8405dadcf6b5d6278ed Mon Sep 17 00:00:00 2001 From: iroqueta Date: Fri, 9 Sep 2022 18:32:32 -0300 Subject: [PATCH 7/9] Changes to download standard classes and dependencies at compilation time in GeneXus. Issue: 97430 --- java/pom.xml | 5 +++++ pom.xml | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/java/pom.xml b/java/pom.xml index 337a2c724..0f489e32f 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -111,6 +111,11 @@ + + com.lowagie + itextasian + 1.5.2 + redis.clients jedis diff --git a/pom.xml b/pom.xml index 8f238af65..d49aefda2 100644 --- a/pom.xml +++ b/pom.xml @@ -61,6 +61,14 @@ ${sha1} + + + iTextRepository + iText Repository + https://repository.openmindonline.it/ + + + common wrapperjavax From 278e3f31083b48132575be913dc24a6221efa233 Mon Sep 17 00:00:00 2001 From: iroqueta Date: Fri, 9 Sep 2022 18:56:30 -0300 Subject: [PATCH 8/9] Changes to download standard classes and dependencies at compilation time in GeneXus. Issue: 97430 --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index d49aefda2..fe9b1c935 100644 --- a/pom.xml +++ b/pom.xml @@ -62,6 +62,12 @@ + + central + Maven Central + default + https://repo1.maven.org/maven2 + iTextRepository iText Repository From f40a2415fc45a9efe92264e75441555cbc38ba08 Mon Sep 17 00:00:00 2001 From: iroqueta Date: Mon, 12 Sep 2022 15:31:30 -0300 Subject: [PATCH 9/9] Changes to download standard classes and dependencies at compilation time in GeneXus. Issue: 97430 --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index b4a40500c..538dd0232 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,6 @@ -SNAPSHOT - UTF-8 2.34 3.0.4 UTF-8