diff options
| author |   Dan Timoney <dtimoney@att.com> | 2021-12-16 16:25:49 -0500 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2022-01-04 10:17:08 -0500 |
| commit | 9738cbd82ca59fdd3108462507df31f4e219af81 (patch) | |
| tree | 8a43cef7ca988b4fc9e8bb40261a08333d1e6a5f /opendaylight/silicon/silicon-alpine/pom.xml | |
| parent | 4bd26f61d7684fe30f7aa86643c4cff3d241287d (diff) | |
Patch OpenDaylight to upgrade to latest pax-logging package
Patch OpenDaylight to replace the shipped version of pax-logging -
which includes log4j-core v2.14.1 - with the latest version, which
includes log4j-core v2.17.1
Issue-ID: CCSDK-3556
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I3db01bf762f683807d555658610a6a0dade0504a
Diffstat (limited to 'opendaylight/silicon/silicon-alpine/pom.xml')
| -rw-r--r-- | opendaylight/silicon/silicon-alpine/pom.xml | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/opendaylight/silicon/silicon-alpine/pom.xml b/opendaylight/silicon/silicon-alpine/pom.xml index d1288130..51ac47b4 100644 --- a/opendaylight/silicon/silicon-alpine/pom.xml +++ b/opendaylight/silicon/silicon-alpine/pom.xml @@ -22,6 +22,9 @@ <odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId> <odl.shiro.version>0.13.5</odl.shiro.version> <odl.ops4j.version>7.3.16</odl.ops4j.version> + <odl.pax.logging.version>2.0.9</odl.pax.logging.version> + <patch.pax.logging.version>2.0.12</patch.pax.logging.version> + <odl.karaf.framework.version>4.3.2</odl.karaf.framework.version> <odl.netconf.version>1.13.4</odl.netconf.version> </properties> @@ -112,6 +115,30 @@ <destFileName>sal-netconf-connector-${odl.netconf.version}.jar</destFileName> <excludes>*</excludes> </artifactItem> + <artifactItem> + <groupId>org.ops4j.pax.logging</groupId> + <artifactId>pax-logging-log4j2</artifactId> + <version>${patch.pax.logging.version}</version> + <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/logging/pax-logging-log4j2/${patch.pax.logging.version}</outputDirectory> + <destFileName>pax-logging-log4j2-${patch.pax.logging.version}.jar</destFileName> + <excludes>*</excludes> + </artifactItem> + <artifactItem> + <groupId>org.ops4j.pax.logging</groupId> + <artifactId>pax-logging-logback</artifactId> + <version>${patch.pax.logging.version}</version> + <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/logging/pax-logging-logback/${patch.pax.logging.version}</outputDirectory> + <destFileName>pax-logging-logback-${patch.pax.logging.version}.jar</destFileName> + <excludes>*</excludes> + </artifactItem> + <artifactItem> + <groupId>org.ops4j.pax.logging</groupId> + <artifactId>pax-logging-api</artifactId> + <version>${patch.pax.logging.version}</version> + <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/logging/pax-logging-api/${patch.pax.logging.version}</outputDirectory> + <destFileName>pax-logging-api-${patch.pax.logging.version}.jar</destFileName> + <excludes>*</excludes> + </artifactItem> </artifactItems> <overWriteReleases>false</overWriteReleases> <overWriteSnapshots>true</overWriteSnapshots> @@ -151,6 +178,26 @@ </resources> </configuration> </execution> + <execution> + <id>copy-karaf-framework-features</id> + <goals> + <goal>copy-resources</goal> + </goals><!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>${basedir}/target/docker-stage</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>framework-${odl.karaf.framework.version}-features.xml</include> + <include>startup.properties</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> </executions> </plugin> |