Skip to content

Commit

Permalink
Merge branch 'tesb/cxf-3.4.10.0tesb731.x' into bugfix/tesb/cxf-3.4.10…
Browse files Browse the repository at this point in the history
….0tesb731.x/TPRUN-8232
  • Loading branch information
andreasmattes committed Jun 13, 2024
2 parents 1bfc5f3 + cc004f8 commit 360e08d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions osgi/karaf/features/src/main/resources/features.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
<feature name="cxf-abdera" version="${upstream.version}">
<feature version="${upstream.version}">cxf-specs</feature>
<bundle start-level="25" dependency="true">mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle>
<bundle dependency='true'>mvn:commons-io/commons-io/${cxf.commons-io.tesb.version}</bundle>
<bundle start-level="35">mvn:org.apache.abdera/abdera-core/${cxf.abdera.version}</bundle>
<bundle start-level="35">mvn:org.apache.abdera/abdera-extensions-main/${cxf.abdera.version}</bundle>
<bundle start-level="35">mvn:org.apache.abdera/abdera-i18n/${cxf.abdera.version}</bundle>
Expand Down
2 changes: 2 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
<cxf.guava.tesb.version>32.0.1-jre</cxf.guava.tesb.version>
<cxf.ehcache3.tesb.version>3.10.8</cxf.ehcache3.tesb.version>
<cxf.netty.tesb.version>4.1.100.Final</cxf.netty.tesb.version>
<cxf.commons-io.tesb.version>2.14.0</cxf.commons-io.tesb.version>
<cxf.jettison.tesb.version>1.5.4</cxf.jettison.tesb.version>
<cxf.activemq.tesb.version>5.15.16</cxf.activemq.tesb.version>
<cxf.james.mime4j.tesb.version>0.8.11</cxf.james.mime4j.tesb.version>
Expand Down Expand Up @@ -470,6 +471,7 @@
<cxf.james.mime4j.tesb.version>${cxf.james.mime4j.tesb.version}</cxf.james.mime4j.tesb.version>
<cxf.xmlsec.bundle.tesb.version>${cxf.xmlsec.bundle.tesb.version}</cxf.xmlsec.bundle.tesb.version>
<cxf.xerces.bundle.tesb.version>${cxf.xerces.bundle.tesb.version}</cxf.xerces.bundle.tesb.version>
<cxf.commons-io.tesb.version>${cxf.commons-io.tesb.version}</cxf.commons-io.tesb.version>
</properties>
</configuration>
<executions>
Expand Down

0 comments on commit 360e08d

Please sign in to comment.