diff --git a/distribution/ddf-catalog/pom.xml b/distribution/ddf-catalog/pom.xml index 46d11c2ab477..cb7edb19fc3c 100644 --- a/distribution/ddf-catalog/pom.xml +++ b/distribution/ddf-catalog/pom.xml @@ -183,7 +183,7 @@ - 384000000 + 416000000 240000000 ${project.build.directory}/${distribution.file.name}.zip diff --git a/distribution/ddf-catalog/src/main/filtered-resources/component.xml b/distribution/ddf-catalog/src/main/filtered-resources/component.xml index 94fbcdb0250a..42c30ea4fe2b 100644 --- a/distribution/ddf-catalog/src/main/filtered-resources/component.xml +++ b/distribution/ddf-catalog/src/main/filtered-resources/component.xml @@ -19,9 +19,6 @@ ./ etc/org.apache.karaf.features.cfg - - **/jetty/**/${karaf.jetty.version}/* - **/jetty/**/${karaf.jetty.version} diff --git a/distribution/ddf-common/src/main/resources-filtered/etc/org.apache.karaf.features.xml b/distribution/ddf-common/src/main/resources-filtered/etc/org.apache.karaf.features.xml index c6da6e695180..38e76da76fa9 100644 --- a/distribution/ddf-common/src/main/resources-filtered/etc/org.apache.karaf.features.xml +++ b/distribution/ddf-common/src/main/resources-filtered/etc/org.apache.karaf.features.xml @@ -39,77 +39,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/distribution/ddf-common/src/main/resources/common-bin.xml b/distribution/ddf-common/src/main/resources/common-bin.xml index 043948f08a23..ed46e2d06306 100644 --- a/distribution/ddf-common/src/main/resources/common-bin.xml +++ b/distribution/ddf-common/src/main/resources/common-bin.xml @@ -45,9 +45,6 @@ system/**/*kibana* **/jetty/**/9.4.6.v20170531/* **/jetty/**/8.1.14.v20131031/* - - **/jetty/**/${karaf.jetty.version}/* - **/jetty/**/${karaf.jetty.version} **/pax/web/**/7.0.0/* - 9.4.57.v20241219 3.6.13.Final 1.7 3.2.4 @@ -241,7 +240,7 @@ 1.17.1 2.6.1 1.3.3 - 4.4.8 + 4.4.10 2.4.2 1.2.0 1.2.0 @@ -942,7 +941,7 @@ org.codehaus.mojo exec-maven-plugin - 3.5.1 + 3.6.3 org.codehaus.mojo