You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:25:14 UTC
[sling-org-apache-sling-commons-osgi] annotated tag
org.apache.sling.commons.osgi-2.3.0 created (now 161091f)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.commons.osgi-2.3.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-osgi.git.
at 161091f (tag)
tagging e6846b694cab2fc13aac0ace6cb3b93b1dd030c3 (commit)
by Stefan Seifert
on Fri May 22 20:05:14 2015 +0000
- Log -----------------------------------------------------------------
org.apache.sling.commons.osgi-2.3.0
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new df63e8f First steps towards a Prototype of 'Everything is a Resource'
new 341e8d7 Make OosgiUtil more generic and cleanup imports
new 8b99d1f Prevent NPE if the property value is null in toStringArray
new d93b1e0 Remove adapter stuff from osgi/commons
new ae3cfac SLING-197 Merge resource integration concept into trunk
new 53d562f Use OSGi core and cmpendium jars from Felix project.
new 5d64b45 SLING-204 - add svn ignore patterns for intellij
new 9451bc4 Move licence and notice to top level dir.
new 2ca28a2 Add incubator disclaimer.
new 410331b Write first element in pom in one line (to avoid problems with the maven release plugin) and minor pom fixes.
new 8866927 Update notice files.
new 8534b0e SLING-402 Move osgi/commons to commons/osgi
new eb6efe5 SLING-402: Move osgi/commons to commons/osgi - correct poms.
new d353e24 SLING-402: Move osgi/commons to commons/osgi - refactor to commons package.
new afb619a Eclude maven-eclipse.xml generated by the maven eclipse plugin.
new 0665281 SLING-456: Add manifest header parser and junit test.
new 36986a1 Use new manifest parser in content loader.
new b1bc9f4 SLING-460: Preserve order of attributes and directives.
new 554a87f SLING-442: Clean up exports, imports, dependencies and used plugins.
new ff7572e Add method for handling integer properties.
new 2fb950c Add method for handling integer properties.
new 3ac6bd1 SLING-495 - NOTICE files generated using mknotice script
new c913b91 SLING-495 - NOTICE files updated according to changes in revision 662927
new 5b61be1 SLING-495 - NOTICE files regenerated with revision 663097 changes
new 08a1bf1 Use released version of parent pom.
new a2f82a9 Use released versions (or soon to be released versions).
new 056094f [maven-release-plugin] prepare release org.apache.sling.commons.osgi-2.0.0-incubator
new 078fd76 [maven-release-plugin] prepare for next development iteration
new 0288d72 Set version to next development version.
new b65ac41 Fix reference to parent pom.
new b13381d SLING-521: Restore more notice files.
new ddcb4d2 SLING-521: Separate between notice files for bin and src dists.
new 997457a SLING-521: Separate between notice files for bin and src dists.
new 831ffe0 SLING-521: Separate between notice files for bin and src dists.
new 1e008e6 Change copyright year to 2008.
new 6ed3e27 Update to released versions.
new 7c1fff4 [maven-release-plugin] prepare release org.apache.sling.commons.osgi-2.0.2-incubator
new a039ceb [maven-release-plugin] prepare for next development iteration
new 0e2142e Use latest snapshots again to make project buildable.
new 0065d7f Use released versions.
new aaa7929 Use released parent pom where possible.
new 07b69ff Add a test case with several directives and multiple lines.
new 6badaf3 SLING-555 : Update all poms to use the latest parent pom; update parent pom to include the incubator repo for plugins and use latest plugins.
new 5c546cb Add toStringArray method with additional default value.
new 8869a12 Add more tests.
new bbb03a8 SLING-782 - Remove dependency to Sling API
new e2d30f4 SLING-808 : Increase version to 5-incubator-SNAPSHOT
new acb81c8 Update notice files to include 2009 in copyright statement.
new 019d7ff SLING-829 Cosmetics to the bundle/project names
new 362853f SLING-833 Accept Collection values and do not require Vector values
new 960e563 SLING-833 Accept Collection values and do not require Vector values
new 78aaced SLING-865 : Move to bundles
new c0d258d SLING-865 : Adjust reactor pom and svn information in each module.
new d27c9ca SLING-865 : Adjust path to parent pom and add profiles for samples and contrib
new 256d3f4 Deprecate getProperty(Object, double) and add toDouble(Object, double) to align with the rest of the toTYPE methods taking the object and the default value.
new 1efaf58 JavaDoc and use Java 5 annotation for deprecation
new 543d7a9 Use release parent pom
new d3fcb84 [maven-release-plugin] prepare release org.apache.sling.commons.osgi-2.0.4-incubator
new b206e97 [maven-release-plugin] prepare for next development iteration
new 2a6c3d7 Use next dev version of parent pom
new ca93db2 Set parent pom to released version.
new 50e721b Move Sling to new TLP location
new 428dbbb SLING-1011 : Remove disclaimer file.
new db20824 SLING-1011 : Adjust svn location
new 0c6d1d4 SLING-1011 : Remove disclaimer from readme's, adjust links to webite, fix versions in poms.
new b3d732e SLING-1033 Upgrade to Sling parent POM 6 (and ensure web app has the leglize stuff, too)
new 629278b Use generics.
new eef9262 SLING-1205 Upgrade all projects to parent POM 8 and use OSGi provided OSGi libraries
new 8ad219e Add some javadocs.
new 404fc99 Correct javadocs.
new fad56ae Add some tests for the OsgiUtil
new d475594 SLING-1278 - Utilities for bundle version extraction and comparison
new 93f3b11 SLING-1278 - make BundleVersionInfo abstract and Comparable
new db67575 SLING-1278 - comparison was reversed
new cfe23d4 SLING-1285 - Launchpad did not start under Windows
new 55158d5 Clean up code.
new 24fb4d3 clean up code.
new 8a4075e SLING-1431 : Utility method to get the service ranking
new 01b2201 SLING-1431 : Utility method to get the service ranking
new 2602d92 SLING-1431 : Utility method to get the service ranking
new 8093e62 Use new osgi util to order services based on their ranking
new e40f3ef SLING-1431 : Utility method to get the service ranking - implement equals and hashCode
new 6f04ac5 formatting
new 6c07ba6 [maven-release-plugin] prepare release org.apache.sling.commons.osgi-2.0.6
new e510fc8 [maven-release-plugin] prepare for next development iteration
new 39f6c65 Update some notice files
new a88ca89 Use released parent pom.
new e023c37 updating all modules to parent 10-SNAPSHOT in anticipation of emma additions to parent
new 37f3bab Update to recent snapshots
new dd7c7bc Use latest releases.
new a4d182b SLING-2008 : Move properties support to own class
new 8b0b615 SLING-2081 : Bundle version manifest entry is a string (not a Version object)
new 5f058cb Remove obsolete licence and notice files
new b40897c SLING-2150 : Update plugins to use the latest available versions
new e2843fd Update to recent snapshot
new 82d3a9a Using latest released parent pom
new 44c5dcc [maven-release-plugin] prepare release org.apache.sling.commons.osgi-2.1.0
new 591a844 [maven-release-plugin] prepare for next development iteration
new 8d4d39b SLING-2187 - adding new module to contain our custom notice file; adding remote-resources plugin configuration to parent pom and removing all existing appended-resources NOTICE files
new 08b1fbb temporarily using snapshots during release vote
new d67d549 using latest releases
new 2c7bc53 SLING-2480 : Add config for maven-sling-plugin to m2e configuration
new 4f76a87 Update to latest parent pom
new 33e3b0c Use released versions
new 39e39fd SLING-2645 Move SortingServiceTracker from org.apache.sling.installer.core.impl to org.apache.sling.commons.osgi
new f47b5ff SLING-2625 Patch from Chetan Mehrotra to include utility method to convert config values to maps, applied. Thank you. Incremented version of the o.a.s.commons.osgi to 2.2.0 due to addition of new method.
new 8e03546 [maven-release-plugin] prepare release org.apache.sling.commons.osgi-2.2.0
new cb59820 [maven-release-plugin] prepare for next development iteration
new bfdfa48 Use latest releases and update to new parent pom
new 5b660af Update to latest parent pom and use latest releases in launchpad
new c9ad51f SLING-2008 - indicate alternatives for deprecated OsgiUtil
new 0226a7d Correct reactor pom and update to parent pom 16
new 1f333d4 SLING-2908 : Replace StringBuffer with StringBuilder
new b26b7af Update to latest parent pom
new 42cc86a Update to parent pom 18
new adb759e Update to parent pom v19
new 35e7cc9 Updated to parent version 20
new 28d88e1 [maven-release-plugin] prepare release org.apache.sling.commons.osgi-2.2.2
new 5729bba [maven-release-plugin] prepare for next development iteration
new fc370a0 Update to Sling Parent POM 22 with baselining enabled
new a28aeaf ignore deprecation warnings in unit tests
new 0b498b4 SLING-4520 Commons OSGi: Define package versions via package-info.java this additionally exports the package org.apache.sling.commons.osgi.bundleversion which was not exported before, but i assume this was by accident
new 609eaf5 SLING-4521 Commons OSGi: Add helper class for thread-safe access list of ranked service dependencies
new 310f714 fix typo and javadoc
new 08f3dd4 SLING-4553 - Avoid unneeded unboxing in PropertiesUtil
new 86d830b SLING-4698 - Set parent.relativePath to empty for all modules
new 553cb5c update javadocs
new bf038e3 [maven-release-plugin] prepare release org.apache.sling.commons.osgi-2.3.0
new e6846b6 [maven-release-plugin] copy for tag org.apache.sling.commons.osgi-2.3.0
The 129 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-commons-osgi] 10/11: [maven-release-plugin]
prepare release org.apache.sling.commons.osgi-2.3.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.commons.osgi-2.3.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-osgi.git
commit bf038e3b614f5eef0a569625560a001b96322911
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Fri May 22 20:05:01 2015 +0000
[maven-release-plugin] prepare release org.apache.sling.commons.osgi-2.3.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/osgi@1681223 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index de27aa2..624e8fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,20 +24,20 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
<version>22</version>
- <relativePath/>
+ <relativePath />
</parent>
<artifactId>org.apache.sling.commons.osgi</artifactId>
- <version>2.2.3-SNAPSHOT</version>
+ <version>2.3.0</version>
<packaging>bundle</packaging>
<name>Apache Sling Commons OSGi support</name>
<description>Commons OSGi</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/commons/osgi</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/osgi</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/bundles/commons/osgi</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.osgi-2.3.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.osgi-2.3.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.commons.osgi-2.3.0</url>
</scm>
<properties>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-commons-osgi] 11/11: [maven-release-plugin]
copy for tag org.apache.sling.commons.osgi-2.3.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.commons.osgi-2.3.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-osgi.git
commit e6846b694cab2fc13aac0ace6cb3b93b1dd030c3
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Fri May 22 20:05:14 2015 +0000
[maven-release-plugin] copy for tag org.apache.sling.commons.osgi-2.3.0
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.osgi-2.3.0@1681224 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-commons-osgi] 09/11: update javadocs
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.commons.osgi-2.3.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-osgi.git
commit 553cb5c49ebab560ea65089dc799532cffb9879b
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Fri May 22 20:03:57 2015 +0000
update javadocs
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/osgi@1681221 13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/sling/commons/osgi/ManifestHeader.java | 10 ++++++----
src/main/java/org/apache/sling/commons/osgi/OsgiUtil.java | 9 +++++++++
.../java/org/apache/sling/commons/osgi/PropertiesUtil.java | 9 +++++++++
.../java/org/apache/sling/commons/osgi/RankedServices.java | 4 ++--
.../org/apache/sling/commons/osgi/SortingServiceTracker.java | 4 ++++
.../sling/commons/osgi/bundleversion/BundleVersionInfo.java | 10 +++++-----
6 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/apache/sling/commons/osgi/ManifestHeader.java b/src/main/java/org/apache/sling/commons/osgi/ManifestHeader.java
index 37e5376..385ccf1 100644
--- a/src/main/java/org/apache/sling/commons/osgi/ManifestHeader.java
+++ b/src/main/java/org/apache/sling/commons/osgi/ManifestHeader.java
@@ -34,17 +34,17 @@ public class ManifestHeader {
public interface Entry {
/**
- * The value of the entry.
+ * @return The value of the entry.
*/
String getValue();
/**
- * The attributes specified for this entry.
+ * @return The attributes specified for this entry.
*/
NameValuePair[] getAttributes();
/**
- * The directives for this entry.
+ * @return The directives for this entry.
*/
NameValuePair[] getDirectives();
@@ -69,7 +69,7 @@ public class ManifestHeader {
}
/**
- * Return the entries for this header.
+ * @return Return the entries for this header.
*/
public Entry[] getEntries() {
return this.entries;
@@ -107,6 +107,8 @@ public class ManifestHeader {
* Like this: path; path; dir1:=dirval1; dir2:=dirval2; attr1=attrval1; attr2=attrval2,
* path; path; dir1:=dirval1; dir2:=dirval2; attr1=attrval1; attr2=attrval2
* The returned object maintains the order of entries (paths), directives and attributes.
+ * @param header Header name
+ * @return Parsed header or null if not found
*/
public static ManifestHeader parse(String header) {
final ManifestHeader entry = new ManifestHeader();
diff --git a/src/main/java/org/apache/sling/commons/osgi/OsgiUtil.java b/src/main/java/org/apache/sling/commons/osgi/OsgiUtil.java
index 8252e8f..d77a4e9 100644
--- a/src/main/java/org/apache/sling/commons/osgi/OsgiUtil.java
+++ b/src/main/java/org/apache/sling/commons/osgi/OsgiUtil.java
@@ -43,6 +43,7 @@ public class OsgiUtil {
* object.
* @param propValue the property value or <code>null</code>
* @param defaultValue the default boolean value
+ * @return Boolean value
*/
public static boolean toBoolean(final Object propValue, final boolean defaultValue) {
return PropertiesUtil.toBoolean(propValue, defaultValue);
@@ -53,6 +54,7 @@ public class OsgiUtil {
* <code>defaultValue</code> if the parameter is <code>null</code>.
* @param propValue the property value or <code>null</code>
* @param defaultValue the default string value
+ * @return String value
*/
public static String toString(final Object propValue, final String defaultValue) {
return PropertiesUtil.toString(propValue, defaultValue);
@@ -65,6 +67,7 @@ public class OsgiUtil {
* a <code>Long</code> from the parameter's string value.
* @param propValue the property value or <code>null</code>
* @param defaultValue the default long value
+ * @return Long value
*/
public static long toLong(final Object propValue, final long defaultValue) {
return PropertiesUtil.toLong(propValue, defaultValue);
@@ -77,6 +80,7 @@ public class OsgiUtil {
* an <code>Integer</code> from the parameter's string value.
* @param propValue the property value or <code>null</code>
* @param defaultValue the default integer value
+ * @return Integer value
*/
public static int toInteger(final Object propValue, final int defaultValue) {
return PropertiesUtil.toInteger(propValue, defaultValue);
@@ -89,6 +93,7 @@ public class OsgiUtil {
* a <code>Double</code> from the parameter's string value.
* @param propValue the property value or <code>null</code>
* @param defaultValue the default double value
+ * @return Double value
*
* @deprecated since 2.0.4, use {@link #toDouble(Object, double)} instead
*/
@@ -104,6 +109,7 @@ public class OsgiUtil {
* a <code>Double</code> from the parameter's string value.
* @param propValue the property value or <code>null</code>
* @param defaultValue the default double value
+ * @return Double value
*
* @since 2.0.4
*/
@@ -119,6 +125,7 @@ public class OsgiUtil {
* <code>java.util.Collection</code>, the first collection element is returned.
* Otherwise <code>null</code> is returned.
* @param propValue the parameter to convert.
+ * @return Object value
*/
public static Object toObject(final Object propValue) {
return PropertiesUtil.toObject(propValue);
@@ -133,6 +140,7 @@ public class OsgiUtil {
* Otherwise (if the parameter is <code>null</code>) <code>null</code> is
* returned.
* @param propValue The object to convert.
+ * @return String array value
*/
public static String[] toStringArray(final Object propValue) {
return PropertiesUtil.toStringArray(propValue);
@@ -149,6 +157,7 @@ public class OsgiUtil {
* @since 2.0.4
* @param propValue The object to convert.
* @param defaultArray The default array to return.
+ * @return String array value
*/
public static String[] toStringArray(final Object propValue, final String[] defaultArray) {
return PropertiesUtil.toStringArray(propValue, defaultArray);
diff --git a/src/main/java/org/apache/sling/commons/osgi/PropertiesUtil.java b/src/main/java/org/apache/sling/commons/osgi/PropertiesUtil.java
index 9f73d96..673c9fa 100644
--- a/src/main/java/org/apache/sling/commons/osgi/PropertiesUtil.java
+++ b/src/main/java/org/apache/sling/commons/osgi/PropertiesUtil.java
@@ -40,6 +40,7 @@ public class PropertiesUtil {
* object.
* @param propValue the property value or <code>null</code>
* @param defaultValue the default boolean value
+ * @return Boolean value
*/
public static boolean toBoolean(Object propValue, boolean defaultValue) {
propValue = toObject(propValue);
@@ -57,6 +58,7 @@ public class PropertiesUtil {
* <code>defaultValue</code> if the parameter is <code>null</code>.
* @param propValue the property value or <code>null</code>
* @param defaultValue the default string value
+ * @return String value
*/
public static String toString(Object propValue, String defaultValue) {
propValue = toObject(propValue);
@@ -70,6 +72,7 @@ public class PropertiesUtil {
* a <code>Long</code> from the parameter's string value.
* @param propValue the property value or <code>null</code>
* @param defaultValue the default long value
+ * @return Long value
*/
public static long toLong(Object propValue, long defaultValue) {
propValue = toObject(propValue);
@@ -93,6 +96,7 @@ public class PropertiesUtil {
* an <code>Integer</code> from the parameter's string value.
* @param propValue the property value or <code>null</code>
* @param defaultValue the default integer value
+ * @return Integer value
*/
public static int toInteger(Object propValue, int defaultValue) {
propValue = toObject(propValue);
@@ -116,6 +120,7 @@ public class PropertiesUtil {
* a <code>Double</code> from the parameter's string value.
* @param propValue the property value or <code>null</code>
* @param defaultValue the default double value
+ * @return Double value
*/
public static double toDouble(Object propValue, double defaultValue) {
propValue = toObject(propValue);
@@ -140,6 +145,7 @@ public class PropertiesUtil {
* <code>java.util.Collection</code>, the first collection element is returned.
* Otherwise <code>null</code> is returned.
* @param propValue the parameter to convert.
+ * @return Object value
*/
public static Object toObject(Object propValue) {
if (propValue == null) {
@@ -164,6 +170,7 @@ public class PropertiesUtil {
* Otherwise (if the parameter is <code>null</code>) <code>null</code> is
* returned.
* @param propValue The object to convert.
+ * @return String array value
*/
public static String[] toStringArray(Object propValue) {
return toStringArray(propValue, null);
@@ -179,6 +186,7 @@ public class PropertiesUtil {
* returned.
* @param propValue The object to convert.
* @param defaultArray The default array to return.
+ * @return String array value
*/
public static String[] toStringArray(Object propValue, String[] defaultArray) {
if (propValue == null) {
@@ -236,6 +244,7 @@ public class PropertiesUtil {
* returned.
* @param propValue The object to convert.
* @param defaultArray The default array converted to map.
+ * @return Map value
*/
public static Map<String, String> toMap(Object propValue, String[] defaultArray) {
String[] arrayValue = toStringArray(propValue, defaultArray);
diff --git a/src/main/java/org/apache/sling/commons/osgi/RankedServices.java b/src/main/java/org/apache/sling/commons/osgi/RankedServices.java
index 7608ed0..8eecac0 100644
--- a/src/main/java/org/apache/sling/commons/osgi/RankedServices.java
+++ b/src/main/java/org/apache/sling/commons/osgi/RankedServices.java
@@ -43,10 +43,10 @@ import aQute.bnd.annotation.ProviderType;
* </pre>
* <p>2. Define bind/unbind methods that delegate to the RankedServices instance:</p>
* <pre>
- * void bindMyService(MyService service, Map<String, Object> props) {
+ * void bindMyService(MyService service, Map<String, Object> props) {
* myServices.bind(service, props);
* }
- * void unbindMyService(MyService service, Map<String, Object> props) {
+ * void unbindMyService(MyService service, Map<String, Object> props) {
* myServices.unbind(service, props);
* }
* </pre>
diff --git a/src/main/java/org/apache/sling/commons/osgi/SortingServiceTracker.java b/src/main/java/org/apache/sling/commons/osgi/SortingServiceTracker.java
index 1bac6ce..bb9640e 100644
--- a/src/main/java/org/apache/sling/commons/osgi/SortingServiceTracker.java
+++ b/src/main/java/org/apache/sling/commons/osgi/SortingServiceTracker.java
@@ -44,6 +44,8 @@ public class SortingServiceTracker<T>
/**
* Constructor
+ * @param context Bundle context
+ * @param clazz Class
*/
public SortingServiceTracker(final BundleContext context,
final String clazz) {
@@ -81,6 +83,7 @@ public class SortingServiceTracker<T>
/**
* Return a sorted list of the services.
+ * @return Service list
*/
public List<T> getSortedServices() {
List<T> result = this.sortedServiceCache;
@@ -107,6 +110,7 @@ public class SortingServiceTracker<T>
/**
* Return a sorted list of the services references.
+ * @return Service list
*/
public List<ServiceReference> getSortedServiceReferences() {
List<ServiceReference> result = this.sortedReferences;
diff --git a/src/main/java/org/apache/sling/commons/osgi/bundleversion/BundleVersionInfo.java b/src/main/java/org/apache/sling/commons/osgi/bundleversion/BundleVersionInfo.java
index 7346ed6..106191e 100644
--- a/src/main/java/org/apache/sling/commons/osgi/bundleversion/BundleVersionInfo.java
+++ b/src/main/java/org/apache/sling/commons/osgi/bundleversion/BundleVersionInfo.java
@@ -40,19 +40,19 @@ public abstract class BundleVersionInfo<T> implements Comparable<BundleVersionIn
*/
public static final long BND_LAST_MODIFIED_MISSING = -1L;
- /** Return the source of information: underlying File or Bundle */
+ /** @return Return the source of information: underlying File or Bundle */
public abstract T getSource();
- /** True if the provided data is a valid bundle */
+ /** @return True if the provided data is a valid bundle */
public abstract boolean isBundle();
- /** Return the bundle symbolic name, null if not available */
+ /** @return Return the bundle symbolic name, null if not available */
public abstract String getBundleSymbolicName();
- /** Return the bundle version, null if not available */
+ /** @return Return the bundle version, null if not available */
public abstract Version getVersion();
- /** True if the bundle version indicates a snapshot */
+ /** @return True if the bundle version indicates a snapshot */
public abstract boolean isSnapshot();
/** Return the bundle last modification time, based on the BND_LAST_MODIFIED
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-commons-osgi] 01/11: [maven-release-plugin]
prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.commons.osgi-2.3.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-osgi.git
commit 5729bbab3f6d67a54f2e3eb0b08ce6a21d4d946f
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Aug 12 06:18:51 2014 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/osgi@1617413 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index a33a338..6aa2903 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,16 +28,16 @@
</parent>
<artifactId>org.apache.sling.commons.osgi</artifactId>
- <version>2.2.2</version>
+ <version>2.2.3-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Commons OSGi support</name>
<description>Commons OSGi</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.osgi-2.2.2</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.osgi-2.2.2</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.commons.osgi-2.2.2</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/commons/osgi</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/osgi</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/commons/osgi</url>
</scm>
<properties>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-commons-osgi] 07/11: SLING-4553 - Avoid
unneeded unboxing in PropertiesUtil
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.commons.osgi-2.3.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-osgi.git
commit 08f3dd46b8b6ba0f2b55969cda079f992b472d4e
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Mar 30 09:12:20 2015 +0000
SLING-4553 - Avoid unneeded unboxing in PropertiesUtil
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/osgi@1670019 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/sling/commons/osgi/PropertiesUtil.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/sling/commons/osgi/PropertiesUtil.java b/src/main/java/org/apache/sling/commons/osgi/PropertiesUtil.java
index 5335ef5..9f73d96 100644
--- a/src/main/java/org/apache/sling/commons/osgi/PropertiesUtil.java
+++ b/src/main/java/org/apache/sling/commons/osgi/PropertiesUtil.java
@@ -46,7 +46,7 @@ public class PropertiesUtil {
if (propValue instanceof Boolean) {
return (Boolean) propValue;
} else if (propValue != null) {
- return Boolean.valueOf(String.valueOf(propValue));
+ return Boolean.parseBoolean(String.valueOf(propValue));
}
return defaultValue;
@@ -77,7 +77,7 @@ public class PropertiesUtil {
return (Long) propValue;
} else if (propValue != null) {
try {
- return Long.valueOf(String.valueOf(propValue));
+ return Long.parseLong(String.valueOf(propValue));
} catch (NumberFormatException nfe) {
// don't care, fall through to default value
}
@@ -100,7 +100,7 @@ public class PropertiesUtil {
return (Integer) propValue;
} else if (propValue != null) {
try {
- return Integer.valueOf(String.valueOf(propValue));
+ return Integer.parseInt(String.valueOf(propValue));
} catch (NumberFormatException nfe) {
// don't care, fall through to default value
}
@@ -123,7 +123,7 @@ public class PropertiesUtil {
return (Double) propValue;
} else if (propValue != null) {
try {
- return Double.valueOf(String.valueOf(propValue));
+ return Double.parseDouble(String.valueOf(propValue));
} catch (NumberFormatException nfe) {
// don't care, fall through to default value
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-commons-osgi] 06/11: fix typo and javadoc
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.commons.osgi-2.3.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-osgi.git
commit 310f714ad5259c5120ab0232388a9264441bdb00
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Mar 21 11:26:44 2015 +0000
fix typo and javadoc
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/osgi@1668238 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/sling/commons/osgi/RankedServices.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/commons/osgi/RankedServices.java b/src/main/java/org/apache/sling/commons/osgi/RankedServices.java
index ee45f2e..7608ed0 100644
--- a/src/main/java/org/apache/sling/commons/osgi/RankedServices.java
+++ b/src/main/java/org/apache/sling/commons/osgi/RankedServices.java
@@ -57,7 +57,7 @@ import aQute.bnd.annotation.ProviderType;
* }
* </pre>
* <p>Optionally you can pass in a {@link ChangeListener} instance to get notified when the list
- * of referenced services has chagned.</p>
+ * of referenced services has changed.</p>
* @param <T> Service type
* @since 2.3
*/
@@ -76,7 +76,7 @@ public final class RankedServices<T> implements Iterable<T> {
}
/**
- * Instantiate without change listener.
+ * Instantiate with change listener.
* @param changeListener Change listener
*/
public RankedServices(ChangeListener changeListener) {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-commons-osgi] 03/11: ignore deprecation
warnings in unit tests
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.commons.osgi-2.3.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-osgi.git
commit a28aeaf12f671420661fd4628781e30cd008bfb9
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu Mar 19 10:17:02 2015 +0000
ignore deprecation warnings in unit tests
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/osgi@1667690 13f79535-47bb-0310-9956-ffa450edef68
---
src/test/java/org/apache/sling/commons/osgi/OsgiUtilTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/java/org/apache/sling/commons/osgi/OsgiUtilTest.java b/src/test/java/org/apache/sling/commons/osgi/OsgiUtilTest.java
index 2d2cc3e..a33e624 100644
--- a/src/test/java/org/apache/sling/commons/osgi/OsgiUtilTest.java
+++ b/src/test/java/org/apache/sling/commons/osgi/OsgiUtilTest.java
@@ -27,9 +27,9 @@ import junit.framework.TestCase;
import org.osgi.framework.Constants;
+@SuppressWarnings("deprecation")
public class OsgiUtilTest extends TestCase {
- @SuppressWarnings("deprecation")
public void testToDouble() {
// we test getProperty which calls toDouble - so we can test both
// methods in one go
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-commons-osgi] 05/11: SLING-4521 Commons
OSGi: Add helper class for thread-safe access list of ranked service
dependencies
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.commons.osgi-2.3.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-osgi.git
commit 609eaf5fbfe7c96b02c73da4dbbcae8282623919
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu Mar 19 11:31:57 2015 +0000
SLING-4521 Commons OSGi: Add helper class for thread-safe access list of ranked service dependencies
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/osgi@1667709 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 13 ++
.../apache/sling/commons/osgi/RankedServices.java | 151 +++++++++++++++++++++
.../apache/sling/commons/osgi/package-info.java | 2 +-
.../sling/commons/osgi/RankedServicesTest.java | 81 +++++++++++
4 files changed, 246 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8f846e0..8d1035f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,6 +104,7 @@
<groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId>
</dependency>
+
<dependency>
<!-- Not used by our code, but need a non-bundle jar for unit tests -->
<groupId>javax.jcr</groupId>
@@ -118,6 +119,18 @@
<version>2.0.6</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.9.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>15.0</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/src/main/java/org/apache/sling/commons/osgi/RankedServices.java b/src/main/java/org/apache/sling/commons/osgi/RankedServices.java
new file mode 100644
index 0000000..ee45f2e
--- /dev/null
+++ b/src/main/java/org/apache/sling/commons/osgi/RankedServices.java
@@ -0,0 +1,151 @@
+/*
+ * 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.
+ */
+package org.apache.sling.commons.osgi;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+import aQute.bnd.annotation.ConsumerType;
+import aQute.bnd.annotation.ProviderType;
+
+/**
+ * Helper class that collects all services registered via OSGi bind/unbind methods.
+ * The services are ordered by service ranking and can be iterated directly using this object instance.
+ * Implementation is thread-safe.
+ * <p>Usage example:</p>
+ * <p>1. Define a dynamic reference with cardinality OPTIONAL_MULTIPLE in your service:
+ * <pre>
+ * @Reference(name = "myService", referenceInterface = MyService.class,
+ * cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC)
+ * private final RankedServices<MyService> myServices = new RankedServices<MyService>();
+ * </pre>
+ * <p>2. Define bind/unbind methods that delegate to the RankedServices instance:</p>
+ * <pre>
+ * void bindMyService(MyService service, Map<String, Object> props) {
+ * myServices.bind(service, props);
+ * }
+ * void unbindMyService(MyService service, Map<String, Object> props) {
+ * myServices.unbind(service, props);
+ * }
+ * </pre>
+ * <p>To access the list of referenced services you can access them in a thread-safe manner:</p>
+ * <pre>
+ * for (MyService service : myServices) {
+ * // your code...
+ * }
+ * </pre>
+ * <p>Optionally you can pass in a {@link ChangeListener} instance to get notified when the list
+ * of referenced services has chagned.</p>
+ * @param <T> Service type
+ * @since 2.3
+ */
+@ProviderType
+public final class RankedServices<T> implements Iterable<T> {
+
+ private final ChangeListener changeListener;
+ private final SortedMap<Comparable<Object>, T> serviceMap = new TreeMap<Comparable<Object>, T>();
+ private volatile Collection<T> sortedServices = Collections.emptyList();
+
+ /**
+ * Instantiate without change listener.
+ */
+ public RankedServices() {
+ this(null);
+ }
+
+ /**
+ * Instantiate without change listener.
+ * @param changeListener Change listener
+ */
+ public RankedServices(ChangeListener changeListener) {
+ this.changeListener = changeListener;
+ }
+
+ /**
+ * Handle bind service event.
+ * @param service Service instance
+ * @param props Service reference properties
+ */
+ public void bind(T service, Map<String, Object> props) {
+ synchronized (serviceMap) {
+ serviceMap.put(ServiceUtil.getComparableForServiceRanking(props), service);
+ updateSortedServices();
+ }
+ }
+
+ /**
+ * Handle unbind service event.
+ * @param service Service instance
+ * @param props Service reference properties
+ */
+ public void unbind(T service, Map<String, Object> props) {
+ synchronized (serviceMap) {
+ serviceMap.remove(ServiceUtil.getComparableForServiceRanking(props));
+ updateSortedServices();
+ }
+ }
+
+ /**
+ * Update list of sorted services by copying it from the array and making it unmodifiable.
+ */
+ private void updateSortedServices() {
+ List<T> copiedList = new ArrayList<T>(serviceMap.values());
+ sortedServices = Collections.unmodifiableList(copiedList);
+ if (changeListener != null) {
+ changeListener.changed();
+ }
+ }
+
+ /**
+ * Lists all services registered in OSGi, sorted by service ranking.
+ * @return Collection of service instances
+ */
+ public Collection<T> get() {
+ return sortedServices;
+ }
+
+ /**
+ * Iterates all services registered in OSGi, sorted by service ranking.
+ * @return Iterator with service instances.
+ */
+ public Iterator<T> iterator() {
+ return sortedServices.iterator();
+ }
+
+ /**
+ * Notification for changes on services list.
+ */
+ @ConsumerType
+ public interface ChangeListener {
+
+ /**
+ * Is called when the list of ranked services was changed due to bundle bindings/unbindings.
+ * This method is called within a synchronized block, so it's code should be kept as efficient as possible.
+ */
+ void changed();
+
+ }
+
+}
diff --git a/src/main/java/org/apache/sling/commons/osgi/package-info.java b/src/main/java/org/apache/sling/commons/osgi/package-info.java
index ccd9e91..243300d 100644
--- a/src/main/java/org/apache/sling/commons/osgi/package-info.java
+++ b/src/main/java/org/apache/sling/commons/osgi/package-info.java
@@ -16,5 +16,5 @@
* specific language governing permissions and limitations
* under the License.
*/
-@aQute.bnd.annotation.Version("2.2")
+@aQute.bnd.annotation.Version("2.3")
package org.apache.sling.commons.osgi;
diff --git a/src/test/java/org/apache/sling/commons/osgi/RankedServicesTest.java b/src/test/java/org/apache/sling/commons/osgi/RankedServicesTest.java
new file mode 100644
index 0000000..867e165
--- /dev/null
+++ b/src/test/java/org/apache/sling/commons/osgi/RankedServicesTest.java
@@ -0,0 +1,81 @@
+/*
+ * 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.
+ */
+package org.apache.sling.commons.osgi;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import java.util.Map;
+
+import org.apache.sling.commons.osgi.RankedServices.ChangeListener;
+import org.junit.Test;
+import org.osgi.framework.Constants;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterators;
+
+public class RankedServicesTest {
+
+ private static final String SERVICE_1 = "service1";
+ private static final Map<String, Object> SERVICE_1_PROPS = ImmutableMap.<String, Object>builder()
+ .put(Constants.SERVICE_RANKING, 50).put(Constants.SERVICE_ID, 1L).build();
+ private static final String SERVICE_2 = "service2";
+ private static final Map<String, Object> SERVICE_2_PROPS = ImmutableMap.<String, Object>builder()
+ .put(Constants.SERVICE_RANKING, 10).put(Constants.SERVICE_ID, 2L).build();
+ private static final String SERVICE_3 = "service3";
+ private static final Map<String, Object> SERVICE_3_PROPS = ImmutableMap.<String, Object>builder()
+ .put(Constants.SERVICE_RANKING, 100).put(Constants.SERVICE_ID, 3L).build();
+
+ @Test
+ public void testSortedServices() {
+ RankedServices<Comparable> underTest = new RankedServices<Comparable>();
+ assertEquals(0, underTest.get().size());
+
+ underTest.bind(SERVICE_1, SERVICE_1_PROPS);
+ assertEquals(1, underTest.get().size());
+ Comparable[] services = Iterators.toArray(underTest.get().iterator(), Comparable.class);
+ assertSame(SERVICE_1, services[0]);
+
+ underTest.bind(SERVICE_2, SERVICE_2_PROPS);
+ underTest.bind(SERVICE_3, SERVICE_3_PROPS);
+ assertEquals(3, underTest.get().size());
+ services = Iterators.toArray(underTest.get().iterator(), Comparable.class);
+ assertSame(SERVICE_2, services[0]);
+ assertSame(SERVICE_1, services[1]);
+ assertSame(SERVICE_3, services[2]);
+
+ underTest.unbind(SERVICE_2, SERVICE_2_PROPS);
+ assertEquals(2, underTest.get().size());
+ services = Iterators.toArray(underTest.get().iterator(), Comparable.class);
+ assertSame(SERVICE_1, services[0]);
+ assertSame(SERVICE_3, services[1]);
+ }
+
+ @Test
+ public void testChangeListener() {
+ ChangeListener changeListener = mock(ChangeListener.class);
+
+ RankedServices<Comparable> underTest = new RankedServices<Comparable>(changeListener);
+ underTest.bind(SERVICE_1, SERVICE_1_PROPS);
+ verify(changeListener).changed();
+ }
+
+}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-commons-osgi] 04/11: SLING-4520 Commons
OSGi: Define package versions via package-info.java this additionally
exports the package org.apache.sling.commons.osgi.bundleversion which was
not exported before, but i assume this was by accident
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.commons.osgi-2.3.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-osgi.git
commit 0b498b4f5c9a3e85215e52ffbb67481701307edf
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu Mar 19 11:12:37 2015 +0000
SLING-4520 Commons OSGi: Define package versions via package-info.java
this additionally exports the package org.apache.sling.commons.osgi.bundleversion which was not exported before, but i assume this was by accident
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/osgi@1667703 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 7 -------
.../commons/osgi/bundleversion/package-info.java | 20 ++++++++++++++++++++
.../org/apache/sling/commons/osgi/package-info.java | 20 ++++++++++++++++++++
3 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index b7db359..8f846e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,13 +50,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>
- org.apache.sling.commons.osgi;version=2.2.0
- </Export-Package>
- </instructions>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/org/apache/sling/commons/osgi/bundleversion/package-info.java b/src/main/java/org/apache/sling/commons/osgi/bundleversion/package-info.java
new file mode 100644
index 0000000..b770576
--- /dev/null
+++ b/src/main/java/org/apache/sling/commons/osgi/bundleversion/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+@aQute.bnd.annotation.Version("2.2")
+package org.apache.sling.commons.osgi.bundleversion;
diff --git a/src/main/java/org/apache/sling/commons/osgi/package-info.java b/src/main/java/org/apache/sling/commons/osgi/package-info.java
new file mode 100644
index 0000000..ccd9e91
--- /dev/null
+++ b/src/main/java/org/apache/sling/commons/osgi/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+@aQute.bnd.annotation.Version("2.2")
+package org.apache.sling.commons.osgi;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-commons-osgi] 02/11: Update to Sling Parent
POM 22 with baselining enabled
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.commons.osgi-2.3.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-osgi.git
commit fc370a0b834c00ea9fc54a44f0381b29dac4225f
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 1 06:57:44 2014 +0000
Update to Sling Parent POM 22 with baselining enabled
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/osgi@1628622 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6aa2903..b7db359 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>20</version>
+ <version>22</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-commons-osgi] 08/11: SLING-4698 - Set
parent.relativePath to empty for all modules
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.commons.osgi-2.3.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-osgi.git
commit 86d830bfb5778e8a6d47eca633d81f454e7fe788
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 7 10:14:40 2015 +0000
SLING-4698 - Set parent.relativePath to empty for all modules
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/osgi@1678154 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8d1035f..de27aa2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
<version>22</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <relativePath/>
</parent>
<artifactId>org.apache.sling.commons.osgi</artifactId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.