Author: cziegeler
Date: Mon Aug 19 07:39:06 2013
New Revision: 1515300
URL: http://svn.apache.org/r1515300
Log:
Clean up maven pom - remove unused dependencies, wrong plugin instructions etc.
Added:
sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/impl/
sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/impl/HealthCheckMBeanTest.java
- copied, changed from r1515292,
sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/HealthCheckMBeanTest.java
Removed:
sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/HealthCheckMBeanTest.java
Modified:
sling/trunk/contrib/extensions/healthcheck/jmx/pom.xml
Modified: sling/trunk/contrib/extensions/healthcheck/jmx/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/jmx/pom.xml?rev=1515300&r1=1515299&r2=1515300&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/jmx/pom.xml (original)
+++ sling/trunk/contrib/extensions/healthcheck/jmx/pom.xml Mon Aug 19 07:39:06
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 @@
JMX access to 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.jmx.*
- </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,16 +46,10 @@
<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.slf4j</groupId>
@@ -92,6 +63,10 @@
</dependency>
<!-- Test dependencies -->
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.hc.healthchecks</artifactId>
<version>0.0.2-SNAPSHOT</version>
@@ -101,9 +76,5 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
</dependencies>
</project>
Copied:
sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/impl/HealthCheckMBeanTest.java
(from r1515292,
sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/HealthCheckMBeanTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/impl/HealthCheckMBeanTest.java?p2=sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/impl/HealthCheckMBeanTest.java&p1=sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/HealthCheckMBeanTest.java&r1=1515292&r2=1515300&rev=1515300&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/HealthCheckMBeanTest.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/jmx/src/test/java/org/apache/sling/hc/jmx/impl/HealthCheckMBeanTest.java
Mon Aug 19 07:39:06 2013
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.hc.jmx;
+package org.apache.sling.hc.jmx.impl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
