Skip to content
Permalink
Browse files
tweak karaf resources
- don't use filtered resources unnecessarily
- extract our custom system properties
- use latest bouncycastle (1.67), even if karaf is slightly lower (1.66)
  • Loading branch information
ahgittin committed Mar 30, 2021
1 parent 151265a commit 5b7804d8b2348815dfb7d733949bf43cf3bec72f
Showing 5 changed files with 36 additions and 136 deletions.
@@ -55,6 +55,10 @@
replacement="mvn:org.bouncycastle/bcprov-ext-jdk15on/${bouncycastle.version}" />
<bundle originalUri="mvn:org.bouncycastle/bcpkix-jdk15on/1.51"
replacement="mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}" />
<bundle originalUri="mvn:org.bouncycastle/bcprov-ext-jdk15on/1.66"
replacement="mvn:org.bouncycastle/bcprov-ext-jdk15on/${bouncycastle.version}" />
<bundle originalUri="mvn:org.bouncycastle/bcpkix-jdk15on/1.66"
replacement="mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}" />
<bundle originalUri="mvn:net.i2p.crypto/eddsa/0.1.0"
replacement="mvn:net.i2p.crypto/eddsa/0.2.0" />
</bundleReplacements>
@@ -0,0 +1,32 @@
################################################################################
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
################################################################################

# Customizations for Apache Brooklyn, read by default system.properties
#
# The properties defined in this file will be made available through system
# properties at the very beginning of the Karaf's boot process.

#
# Name of this Karaf instance.
#
karaf.name = brooklyn


# Needed to get CXF to run as the Jersey provider
javax.ws.rs.ext.RuntimeDelegate = org.apache.cxf.jaxrs.impl.RuntimeDelegateImpl

This file was deleted.

0 comments on commit 5b7804d

Please sign in to comment.