This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-distribution.git
commit 7b6327935a7d21ddd7c435505d092afaef7ac2f4 Author: Oliver Lietz <[email protected]> AuthorDate: Wed Sep 7 12:12:35 2016 +0000 SLING-4869 Provide a Karaf-based distribution remove obsolete configurations git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1759599 13f79535-47bb-0310-9956-ffa450edef68 --- .../org.apache.felix.eventadmin.impl.EventAdmin | 21 ---------------- src/main/resources/etc/startup.properties | 29 ---------------------- 2 files changed, 50 deletions(-) diff --git a/src/main/resources/etc/org.apache.felix.eventadmin.impl.EventAdmin b/src/main/resources/etc/org.apache.felix.eventadmin.impl.EventAdmin deleted file mode 100755 index baa1ddd..0000000 --- a/src/main/resources/etc/org.apache.felix.eventadmin.impl.EventAdmin +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# 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. -# -################################################################################ - -org.apache.felix.eventadmin.AddTimestamp=true -org.apache.felix.eventadmin.AddSubject=true diff --git a/src/main/resources/etc/startup.properties b/src/main/resources/etc/startup.properties deleted file mode 100755 index 476957b..0000000 --- a/src/main/resources/etc/startup.properties +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# 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. -# -################################################################################ - -# Bundles to be started on startup, with startlevel -mvn\:org.apache.sshd/sshd-core/0.14.0 = 20 -mvn\:org.apache.felix/org.apache.felix.metatype/1.1.2 = 5 -mvn\:org.apache.karaf.services/org.apache.karaf.services.eventadmin/4.0.5 = 5 -mvn\:org.ops4j.pax.url/pax-url-aether/2.4.7 = 5 -mvn\:org.ops4j.pax.logging/pax-logging-api/1.8.5 = 8 -mvn\:org.ops4j.pax.logging/pax-logging-service/1.8.5 = 8 -mvn\:org.apache.felix/org.apache.felix.configadmin/1.8.8 = 10 -mvn\:org.apache.felix/org.apache.felix.fileinstall/3.5.4 = 11 -mvn\:org.apache.karaf.features/org.apache.karaf.features.core/4.0.5 = 15 -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
