Author: kwin
Date: Sun Jan 24 16:04:24 2016
New Revision: 1726505
URL: http://svn.apache.org/viewvc?rev=1726505&view=rev
Log:
SLING-5451 revert changes from commit r1726248 as consumer/providers are
annotated on class level and this was already done in SLING-5013.
Modified:
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/annotations/injectorspecific/package-info.java
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/annotations/package-info.java
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/package-info.java
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/spi/injectorspecific/package-info.java
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/spi/package-info.java
Modified:
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/annotations/injectorspecific/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/annotations/injectorspecific/package-info.java?rev=1726505&r1=1726504&r2=1726505&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/annotations/injectorspecific/package-info.java
(original)
+++
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/annotations/injectorspecific/package-info.java
Sun Jan 24 16:04:24 2016
@@ -15,8 +15,6 @@
* limitations under the License.
*/
@Version("1.1.0")
-@ConsumerType
package org.apache.sling.models.annotations.injectorspecific;
-import aQute.bnd.annotation.ConsumerType;
import aQute.bnd.annotation.Version;
Modified:
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/annotations/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/annotations/package-info.java?rev=1726505&r1=1726504&r2=1726505&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/annotations/package-info.java
(original)
+++
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/annotations/package-info.java
Sun Jan 24 16:04:24 2016
@@ -15,8 +15,6 @@
* limitations under the License.
*/
@Version("1.2.0")
-@ConsumerType
package org.apache.sling.models.annotations;
-import aQute.bnd.annotation.ConsumerType;
import aQute.bnd.annotation.Version;
\ No newline at end of file
Modified:
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/package-info.java?rev=1726505&r1=1726504&r2=1726505&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/package-info.java
(original)
+++
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/package-info.java
Sun Jan 24 16:04:24 2016
@@ -15,8 +15,6 @@
* limitations under the License.
*/
@Version("1.1.0")
-@ConsumerType
package org.apache.sling.models.factory;
-import aQute.bnd.annotation.ConsumerType;
import aQute.bnd.annotation.Version;
\ No newline at end of file
Modified:
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/spi/injectorspecific/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/spi/injectorspecific/package-info.java?rev=1726505&r1=1726504&r2=1726505&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/spi/injectorspecific/package-info.java
(original)
+++
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/spi/injectorspecific/package-info.java
Sun Jan 24 16:04:24 2016
@@ -15,8 +15,6 @@
* limitations under the License.
*/
@Version("1.1.1")
-@ProviderType
package org.apache.sling.models.spi.injectorspecific;
-import aQute.bnd.annotation.ProviderType;
import aQute.bnd.annotation.Version;
Modified:
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/spi/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/spi/package-info.java?rev=1726505&r1=1726504&r2=1726505&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/spi/package-info.java
(original)
+++
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/spi/package-info.java
Sun Jan 24 16:04:24 2016
@@ -15,7 +15,6 @@
* limitations under the License.
*/
@Version("1.1.1")
-@ProviderType
package org.apache.sling.models.spi;
import aQute.bnd.annotation.ProviderType;