You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2013/08/19 09:46:59 UTC
svn commit: r1515302 - in
/sling/trunk/contrib/extensions/healthcheck/healthchecks: pom.xml
src/main/java/org/apache/sling/hc/healthchecks/util/package-info.java
Author: cziegeler
Date: Mon Aug 19 07:46:59 2013
New Revision: 1515302
URL: http://svn.apache.org/r1515302
Log:
Clean up maven pom - remove unused dependencies, wrong plugin instructions etc.
Added:
sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/util/package-info.java (with props)
Modified:
sling/trunk/contrib/extensions/healthcheck/healthchecks/pom.xml
Modified: sling/trunk/contrib/extensions/healthcheck/healthchecks/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/healthchecks/pom.xml?rev=1515302&r1=1515301&r2=1515302&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/healthchecks/pom.xml (original)
+++ sling/trunk/contrib/extensions/healthcheck/healthchecks/pom.xml Mon Aug 19 07:46:59 2013
@@ -9,8 +9,8 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>16</version>
- <relativePath>16</relativePath>
+ <version>17</version>
+ <relativePath/>
</parent>
<groupId>org.apache.sling</groupId>
@@ -25,6 +25,9 @@
Default Sling Health Check Services
</description>
+ <properties>
+ <sling.java.version>6</sling.java.version>
+ </properties>
<build>
<plugins>
<plugin>
@@ -35,32 +38,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <configuration>
- <instructions>
- <Private-Package>
- org.apache.sling.hc.healthchecks.*
- </Private-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java16</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
</plugin>
</plugins>
</build>
@@ -69,21 +46,15 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.hc.api</artifactId>
- <version>${project.version}</version>
+ <version>0.0.2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -114,29 +85,23 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.2</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.6.2</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
Added: sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/util/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/util/package-info.java?rev=1515302&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/util/package-info.java (added)
+++ sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/util/package-info.java Mon Aug 19 07:46:59 2013
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+@Version("1.0.0")
+package org.apache.sling.hc.healthchecks.util;
+
+import aQute.bnd.annotation.Version;
+
Propchange: sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/util/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/util/package-info.java
------------------------------------------------------------------------------
svn:keywords = author date id revision rev url
Propchange: sling/trunk/contrib/extensions/healthcheck/healthchecks/src/main/java/org/apache/sling/hc/healthchecks/util/package-info.java
------------------------------------------------------------------------------
svn:mime-type = text/plain