You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2014/07/30 21:51:04 UTC
svn commit: r1614748 - in /sling/trunk/bundles/extensions/healthcheck: ./
annotations/ annotations/src/ annotations/src/main/
annotations/src/main/java/ annotations/src/main/java/org/
annotations/src/main/java/org/apache/ annotations/src/main/java/org/...
Author: bdelacretaz
Date: Wed Jul 30 19:51:03 2014
New Revision: 1614748
URL: http://svn.apache.org/r1614748
Log:
SLING-3624 - move SlingHealthCheck annotation to a new annotations jar
Added:
sling/trunk/bundles/extensions/healthcheck/annotations/ (with props)
sling/trunk/bundles/extensions/healthcheck/annotations/pom.xml
sling/trunk/bundles/extensions/healthcheck/annotations/src/
sling/trunk/bundles/extensions/healthcheck/annotations/src/main/
sling/trunk/bundles/extensions/healthcheck/annotations/src/main/java/
sling/trunk/bundles/extensions/healthcheck/annotations/src/main/java/org/
sling/trunk/bundles/extensions/healthcheck/annotations/src/main/java/org/apache/
sling/trunk/bundles/extensions/healthcheck/annotations/src/main/java/org/apache/sling/
sling/trunk/bundles/extensions/healthcheck/annotations/src/main/java/org/apache/sling/hc/
sling/trunk/bundles/extensions/healthcheck/annotations/src/main/java/org/apache/sling/hc/annotations/
- copied from r1614743, sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/annotations/
sling/trunk/bundles/extensions/healthcheck/annotations/src/main/resources/
- copied from r1614743, sling/trunk/bundles/extensions/healthcheck/core/src/main/resources/
Removed:
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/annotations/
sling/trunk/bundles/extensions/healthcheck/core/src/main/resources/
Modified:
sling/trunk/bundles/extensions/healthcheck/core/pom.xml
sling/trunk/bundles/extensions/healthcheck/pom.xml
sling/trunk/bundles/extensions/healthcheck/samples/pom.xml
Propchange: sling/trunk/bundles/extensions/healthcheck/annotations/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jul 30 19:51:03 2014
@@ -0,0 +1,14 @@
+target
+bin
+*.iml
+*.ipr
+*.iws
+.settings
+.project
+.classpath
+.externalToolBuilders
+maven-eclipse.xml
+
+
+
+
Added: sling/trunk/bundles/extensions/healthcheck/annotations/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/annotations/pom.xml?rev=1614748&view=auto
==============================================================================
--- sling/trunk/bundles/extensions/healthcheck/annotations/pom.xml (added)
+++ sling/trunk/bundles/extensions/healthcheck/annotations/pom.xml Wed Jul 30 19:51:03 2014
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>19</version>
+ <relativePath>../../../../parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.hc.annotations</artifactId>
+ <packaging>jar</packaging>
+ <version>0.9.9-SNAPSHOT</version>
+
+ <name>Apache Sling Health Check Annotations</name>
+ <inceptionYear>2013</inceptionYear>
+
+ <description>
+ Sling Health Check Annotations
+ </description>
+
+ <properties>
+ <sling.java.version>6</sling.java.version>
+ </properties>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/annotations</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/healthcheck/annotations</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/annotations</url>
+ </scm>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.generator</artifactId>
+ <version>1.10.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.hc.core</artifactId>
+ <version>1.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
Modified: sling/trunk/bundles/extensions/healthcheck/core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/pom.xml?rev=1614748&r1=1614747&r2=1614748&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/healthcheck/core/pom.xml (original)
+++ sling/trunk/bundles/extensions/healthcheck/core/pom.xml Wed Jul 30 19:51:03 2014
@@ -42,17 +42,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <configuration>
- <instructions>
- <Import-Package>
- !org.apache.felix.scr.annotations,
- !org.apache.felix.scrplugin.*,
- *
- </Import-Package>
- <Sling-Initial-Content>SLING-CONTENT/apps/hc/demo;path:=/apps/hc/demo;overwrite:=true</Sling-Initial-Content>
- <Sling-Test-Regexp>.*Test</Sling-Test-Regexp>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
@@ -69,12 +58,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.generator</artifactId>
- <version>1.10.0</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: sling/trunk/bundles/extensions/healthcheck/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/pom.xml?rev=1614748&r1=1614747&r2=1614748&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/healthcheck/pom.xml (original)
+++ sling/trunk/bundles/extensions/healthcheck/pom.xml Wed Jul 30 19:51:03 2014
@@ -34,6 +34,7 @@
<module>support</module>
<module>webconsole</module>
<module>junit-bridge</module>
+ <module>annotations</module>
<module>it</module>
</modules>
</project>
Modified: sling/trunk/bundles/extensions/healthcheck/samples/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/samples/pom.xml?rev=1614748&r1=1614747&r2=1614748&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/healthcheck/samples/pom.xml (original)
+++ sling/trunk/bundles/extensions/healthcheck/samples/pom.xml Wed Jul 30 19:51:03 2014
@@ -90,6 +90,12 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.hc.annotations</artifactId>
+ <version>0.9.9-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.junit.core</artifactId>
<version>1.0.8</version>
<scope>provided</scope>