osgi-compendium-6.0.0-2: rebuild

2 files changed, 120 insertions, 3 deletions

diff --git a/pcr/osgi-compendium/PKGBUILD b/pcr/osgi-compendium/PKGBUILD
index 7b5c1911f..d5c92fa7d 100644
--- a/pcr/osgi-compendium/PKGBUILD
+++ b/pcr/osgi-compendium/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgname=osgi.cmpn
 pkgname=osgi-compendium
 pkgver=6.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Java OSGi API - Compendium module"
 arch=('any')
 url='https://www.osgi.org/developer/specifications/'
@@ -11,13 +11,16 @@ license=('APACHE')
 depends=('java-runtime')
 makedepends=('java-geronimo-jpa' 'java-environment' 'jh' 'osgi-annotation' 'osgi-core' 'osgi-foundation-ee' 'tomcat8')
 source=("https://repo1.maven.org/maven2/org/osgi/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}-sources.jar"
-        "https://repo1.maven.org/maven2/org/osgi/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}.pom")
+        "https://repo1.maven.org/maven2/org/osgi/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}.pom"
+        'osgi-compendium-lookupreference.patch')
 sha1sums=('cf4d979984a597753bf7e7df18369ec60f09a7fc'
-          '400a960b790469c070650ff36090200b7e0f8c16')
+          '400a960b790469c070650ff36090200b7e0f8c16'
+          '8955d96f70bcf16fe75654f652ca0eb803241f06')
 
 prepare() {
   cd ${srcdir}
   mkdir -p build/classes
+  patch -Np1 -i "${srcdir}/osgi-compendium-lookupreference.patch"
 }
 
 build() {
diff --git a/pcr/osgi-compendium/osgi-compendium-lookupreference.patch b/pcr/osgi-compendium/osgi-compendium-lookupreference.patch
new file mode 100644
index 000000000..22f846bda
--- /dev/null
+++ b/pcr/osgi-compendium/osgi-compendium-lookupreference.patch
@@ -0,0 +1,114 @@
+--- osgi.cmpn-6.0.0.orig/org/osgi/service/component/annotations/LookupReference.java	1969-12-31 19:00:00.000000000 -0500
++++ osgi.cmpn-6.0.0/org/osgi/service/component/annotations/LookupReference.java	2016-06-25 09:02:46.433897000 -0500
+@@ -0,0 +1,111 @@
++/*
++ * Copyright (c) OSGi Alliance (2013). All Rights Reserved.
++ *
++ * Licensed 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.osgi.service.component.annotations;
++
++import java.lang.annotation.Retention;
++import java.lang.annotation.RetentionPolicy;
++import java.lang.annotation.Target;
++
++/**
++ * Define a lookup strategy reference for a {@link Component}.
++ * 
++ * <p>
++ * The referenced service can be accessed using one of the {@code locateService}
++ * methods of {@code ComponentContext}.
++ * 
++ * <p>
++ * This annotation is not processed at runtime by a Service Component Runtime
++ * implementation. It must be processed by tools and used to add a Component
++ * Description to the bundle.
++ * 
++ * <p>
++ * In the generated Component Description for a component, the references must
++ * be ordered in ascending lexicographical order (using {@code String.compareTo}
++ * ) of the reference {@link #name() name}s.
++ * 
++ * @see "The reference element of a Component Description."
++ * @author $Id: 39a18d2d533af21bee40e41d09b8d5a8405e100b $
++ * @since 1.3
++ */
++@Retention(RetentionPolicy.CLASS)
++@Target({})
++public @interface LookupReference {
++	/**
++	 * The name of this reference.
++	 * 
++	 * @see "The name attribute of the reference element of a Component Description."
++	 */
++	String name();
++
++	/**
++	 * The type of the service to bind to this reference.
++	 * 
++	 * @see "The interface attribute of the reference element of a Component Description."
++	 */
++	Class<?> service();
++
++	/**
++	 * The cardinality of the reference.
++	 * 
++	 * <p>
++	 * If not specified, the reference has a
++	 * {@link ReferenceCardinality#MANDATORY 1..1} cardinality.
++	 * 
++	 * @see "The cardinality attribute of the reference element of a Component Description."
++	 */
++	ReferenceCardinality cardinality() default ReferenceCardinality.MANDATORY;
++
++	/**
++	 * The policy for the reference.
++	 * 
++	 * <p>
++	 * If not specified, the {@link ReferencePolicy#STATIC STATIC} reference
++	 * policy is used.
++	 * 
++	 * @see "The policy attribute of the reference element of a Component Description."
++	 */
++	ReferencePolicy policy() default ReferencePolicy.STATIC;
++
++	/**
++	 * The target filter for the reference.
++	 * 
++	 * @see "The target attribute of the reference element of a Component Description."
++	 */
++	String target() default "";
++
++	/**
++	 * The policy option for the reference.
++	 * 
++	 * <p>
++	 * If not specified, the {@link ReferencePolicyOption#RELUCTANT RELUCTANT}
++	 * reference policy option is used.
++	 * 
++	 * @see "The policy-option attribute of the reference element of a Component Description."
++	 */
++	ReferencePolicyOption policyOption() default ReferencePolicyOption.RELUCTANT;
++
++	/**
++	 * The requested service scope for this Reference.
++	 * 
++	 * <p>
++	 * If not specified, the {@link ReferenceScope#BUNDLE bundle} service scope
++	 * is requested.
++	 * 
++	 * @see "The scope attribute of the reference element of a Component Description."
++	 */
++	ReferenceScope scope() default ReferenceScope.BUNDLE;
++}