Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Snyk] Upgrade org.apache.felix:org.apache.felix.configadmin from 1.0.10 to 1.9.24 #30

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Snyk] Upgrade org.apache.felix:org.apache.felix.configadmin from 1.0.10 to 1.9.24 #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions ...bution/META-INF/maven/org.apache.cxf.dosgi/cxf-dosgi-ri-singlebundle-distribution/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
<version>1.0.10</version>
<version>1.9.24</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Expand Down Expand Up @@ -347,35 +347,35 @@
<configuration>
<tasks>
<!-- removing this directory as it confuses Eclipse when importing the bundle as a plugin -->
<delete dir="target/classes" />
<delete dir="target/classes"/>

<fileset dir="target" id="single.bundle">
<include name="*.jar" />
<include name="*.jar"/>
</fileset>
<pathconvert pathsep="" property="bundle" refid="single.bundle" />
<pathconvert pathsep="" property="bundle" refid="single.bundle"/>

<fileset dir="target/deps" id="felix.dep.bundles">
<include name="*.jar" />
<include name="*.jar"/>
</fileset>
<pathconvert pathsep=" file:/" property="felix.deps" refid="felix.dep.bundles" />
<pathconvert pathsep=" file:/" property="felix.deps" refid="felix.dep.bundles"/>

<!-- config.properties file for Felix -->
<echo file="target/felix.config.properties.append">
org.ops4j.pax.web.session.timeout=30
org.osgi.framework.startlevel=2
felix.auto.start.2=
</echo>
<echo message="file:/${felix.deps} file:/${bundle}" file="target/felix.config.properties.append" append="true" />
<replace file="target/felix.config.properties.append" token="\" value="/" />
<echo message="file:/${felix.deps} file:/${bundle}" file="target/felix.config.properties.append" append="true"/>
<replace file="target/felix.config.properties.append" token="\" value="/"/>

<!-- config.ini file for Equinox -->
<echo file="target/equinox.config.ini.append">
org.ops4j.pax.web.session.timeout=30

osgi.bundles=org.eclipse.osgi.services@start,
</echo>
<echo message="${bundle}@start" file="target/equinox.config.ini.append" append="true" />
<replace file="target/equinox.config.ini.append" token="\" value="/" />
<echo message="${bundle}@start" file="target/equinox.config.ini.append" append="true"/>
<replace file="target/equinox.config.ini.append" token="\" value="/"/>
</tasks>
</configuration>
<goals>
Expand Down