You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2016/10/09 14:11:09 UTC
svn commit: r1763982 - in /felix/trunk/prefs: ./
src/main/appended-resources/ src/main/appended-resources/META-INF/
src/main/java/org/apache/felix/prefs/
Author: cziegeler
Date: Sun Oct 9 14:11:09 2016
New Revision: 1763982
URL: http://svn.apache.org/viewvc?rev=1763982&view=rev
Log:
Update to latest parent, use latest maven bundle plugin, clean up configuration, correct license, notice, dependencies
Added:
felix/trunk/prefs/src/main/appended-resources/
felix/trunk/prefs/src/main/appended-resources/META-INF/
felix/trunk/prefs/src/main/appended-resources/META-INF/DEPENDENCIES
felix/trunk/prefs/src/main/appended-resources/META-INF/NOTICE
felix/trunk/prefs/src/main/java/org/apache/felix/prefs/package-info.java (with props)
Removed:
felix/trunk/prefs/LICENSE
felix/trunk/prefs/NOTICE
Modified:
felix/trunk/prefs/pom.xml
Modified: felix/trunk/prefs/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/prefs/pom.xml?rev=1763982&r1=1763981&r2=1763982&view=diff
==============================================================================
--- felix/trunk/prefs/pom.xml (original)
+++ felix/trunk/prefs/pom.xml Sun Oct 9 14:11:09 2016
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>1.2.0</version>
+ <version>4</version>
<relativePath>../pom</relativePath>
</parent>
@@ -33,25 +33,37 @@
<name>Apache Felix Preferences Service</name>
<description>
- Implementation of the OSGi Preferences Service Specification 1.1
+ Implementation of the OSGi Preferences Service Specification 1.1.1
</description>
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <version>6.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>5.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.log</artifactId>
+ <version>1.3.0</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>1.2.0</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.prefs</artifactId>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.3</version>
+ <version>1.10</version>
</dependency>
</dependencies>
@@ -60,33 +72,37 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>3.2.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-Category>osgi</Bundle-Category>
<Bundle-SymbolicName>
- ${artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
<Export-Package>
org.apache.felix.prefs,
- org.osgi.service.prefs;version=1.1
+ org.osgi.service.prefs
</Export-Package>
- <Private-Package>
- org.apache.felix.prefs.impl,
- org.apache.commons.codec,
- org.apache.commons.codec.binary
- </Private-Package>
<Bundle-Activator>
org.apache.felix.prefs.impl.PreferencesManager
</Bundle-Activator>
+ <Conditional-Package>org.apache.commons.codec,org.apache.commons.codec.binary</Conditional-Package>
<Provide-Capability>
osgi.service;objectClass:List<String>="org.osgi.service.prefs.PreferencesService";
uses:="org.osgi.service.prefs"
</Provide-Capability>
</instructions>
</configuration>
+ <executions>
+ <execution>
+ <id>baseline</id>
+ <goals>
+ <goal>baseline</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Added: felix/trunk/prefs/src/main/appended-resources/META-INF/DEPENDENCIES
URL: http://svn.apache.org/viewvc/felix/trunk/prefs/src/main/appended-resources/META-INF/DEPENDENCIES?rev=1763982&view=auto
==============================================================================
--- felix/trunk/prefs/src/main/appended-resources/META-INF/DEPENDENCIES (added)
+++ felix/trunk/prefs/src/main/appended-resources/META-INF/DEPENDENCIES Sun Oct 9 14:11:09 2016
@@ -0,0 +1,16 @@
+I. Included Third-Party Software
+
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2015).
+Licensed under the Apache License 2.0.
+
+II. Used Third-Party Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org).
+Copyright (c) OSGi Alliance (2000, 2015).
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
Added: felix/trunk/prefs/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/prefs/src/main/appended-resources/META-INF/NOTICE?rev=1763982&view=auto
==============================================================================
--- felix/trunk/prefs/src/main/appended-resources/META-INF/NOTICE (added)
+++ felix/trunk/prefs/src/main/appended-resources/META-INF/NOTICE Sun Oct 9 14:11:09 2016
@@ -0,0 +1,5 @@
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2015).
+Licensed under the Apache License 2.0.
+
Added: felix/trunk/prefs/src/main/java/org/apache/felix/prefs/package-info.java
URL: http://svn.apache.org/viewvc/felix/trunk/prefs/src/main/java/org/apache/felix/prefs/package-info.java?rev=1763982&view=auto
==============================================================================
--- felix/trunk/prefs/src/main/java/org/apache/felix/prefs/package-info.java (added)
+++ felix/trunk/prefs/src/main/java/org/apache/felix/prefs/package-info.java Sun Oct 9 14:11:09 2016
@@ -0,0 +1,25 @@
+/*
+ * 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.osgi.annotation.versioning.Version("1.0.0")
+package org.apache.felix.prefs;
+
+
+
+
Propchange: felix/trunk/prefs/src/main/java/org/apache/felix/prefs/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: felix/trunk/prefs/src/main/java/org/apache/felix/prefs/package-info.java
------------------------------------------------------------------------------
svn:keywords = author date id revision rev url