You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ju...@apache.org on 2014/11/29 16:50:16 UTC
svn commit: r7278 - /release/sling/
Author: justin
Date: Sat Nov 29 15:50:16 2014
New Revision: 7278
Log:
adding resource merger 1.2.0 release
Added:
release/sling/org.apache.sling.resourcemerger-1.2.0-javadoc.jar (with props)
release/sling/org.apache.sling.resourcemerger-1.2.0-javadoc.jar.asc
release/sling/org.apache.sling.resourcemerger-1.2.0-javadoc.jar.md5
release/sling/org.apache.sling.resourcemerger-1.2.0-javadoc.jar.sha1
release/sling/org.apache.sling.resourcemerger-1.2.0-source-release.zip (with props)
release/sling/org.apache.sling.resourcemerger-1.2.0-source-release.zip.asc
release/sling/org.apache.sling.resourcemerger-1.2.0-source-release.zip.md5
release/sling/org.apache.sling.resourcemerger-1.2.0-source-release.zip.sha1
release/sling/org.apache.sling.resourcemerger-1.2.0-sources.jar (with props)
release/sling/org.apache.sling.resourcemerger-1.2.0-sources.jar.asc
release/sling/org.apache.sling.resourcemerger-1.2.0-sources.jar.md5
release/sling/org.apache.sling.resourcemerger-1.2.0-sources.jar.sha1
release/sling/org.apache.sling.resourcemerger-1.2.0.jar (with props)
release/sling/org.apache.sling.resourcemerger-1.2.0.jar.asc
release/sling/org.apache.sling.resourcemerger-1.2.0.jar.md5
release/sling/org.apache.sling.resourcemerger-1.2.0.jar.sha1
release/sling/org.apache.sling.resourcemerger-1.2.0.pom
release/sling/org.apache.sling.resourcemerger-1.2.0.pom.asc
release/sling/org.apache.sling.resourcemerger-1.2.0.pom.md5
release/sling/org.apache.sling.resourcemerger-1.2.0.pom.sha1
Removed:
release/sling/org.apache.sling.resourcemerger-1.1.2-javadoc.jar
release/sling/org.apache.sling.resourcemerger-1.1.2-javadoc.jar.asc
release/sling/org.apache.sling.resourcemerger-1.1.2-javadoc.jar.md5
release/sling/org.apache.sling.resourcemerger-1.1.2-javadoc.jar.sha1
release/sling/org.apache.sling.resourcemerger-1.1.2-source-release.zip
release/sling/org.apache.sling.resourcemerger-1.1.2-source-release.zip.asc
release/sling/org.apache.sling.resourcemerger-1.1.2-source-release.zip.md5
release/sling/org.apache.sling.resourcemerger-1.1.2-source-release.zip.sha1
release/sling/org.apache.sling.resourcemerger-1.1.2-sources.jar
release/sling/org.apache.sling.resourcemerger-1.1.2-sources.jar.asc
release/sling/org.apache.sling.resourcemerger-1.1.2-sources.jar.md5
release/sling/org.apache.sling.resourcemerger-1.1.2-sources.jar.sha1
release/sling/org.apache.sling.resourcemerger-1.1.2.jar
release/sling/org.apache.sling.resourcemerger-1.1.2.jar.asc
release/sling/org.apache.sling.resourcemerger-1.1.2.jar.md5
release/sling/org.apache.sling.resourcemerger-1.1.2.jar.sha1
release/sling/org.apache.sling.resourcemerger-1.1.2.pom
release/sling/org.apache.sling.resourcemerger-1.1.2.pom.asc
release/sling/org.apache.sling.resourcemerger-1.1.2.pom.md5
release/sling/org.apache.sling.resourcemerger-1.1.2.pom.sha1
Added: release/sling/org.apache.sling.resourcemerger-1.2.0-javadoc.jar
==============================================================================
Binary file - no diff available.
Propchange: release/sling/org.apache.sling.resourcemerger-1.2.0-javadoc.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: release/sling/org.apache.sling.resourcemerger-1.2.0-javadoc.jar.asc
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.2.0-javadoc.jar.asc (added)
+++ release/sling/org.apache.sling.resourcemerger-1.2.0-javadoc.jar.asc Sat Nov 29 15:50:16 2014
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEABECAAYFAlRzrucACgkQh9vwWhNLFFxdBgCgudpk0uxHjXZuYkHjTs5zDhf0
+eTIAoIRF5pLY1va9IGJ5y7F4tMt5okUJ
+=BWTc
+-----END PGP SIGNATURE-----
Added: release/sling/org.apache.sling.resourcemerger-1.2.0-javadoc.jar.md5
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.2.0-javadoc.jar.md5 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.2.0-javadoc.jar.md5 Sat Nov 29 15:50:16 2014
@@ -0,0 +1 @@
+74ba33d337a60fdfbbe368aab5f280b6
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.2.0-javadoc.jar.sha1
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.2.0-javadoc.jar.sha1 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.2.0-javadoc.jar.sha1 Sat Nov 29 15:50:16 2014
@@ -0,0 +1 @@
+c4e0d06786a787b4da319f64f185fdb36d096009
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.2.0-source-release.zip
==============================================================================
Binary file - no diff available.
Propchange: release/sling/org.apache.sling.resourcemerger-1.2.0-source-release.zip
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: release/sling/org.apache.sling.resourcemerger-1.2.0-source-release.zip.asc
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.2.0-source-release.zip.asc (added)
+++ release/sling/org.apache.sling.resourcemerger-1.2.0-source-release.zip.asc Sat Nov 29 15:50:16 2014
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEABECAAYFAlRzrucACgkQh9vwWhNLFFxHKQCeJuLaf6fU2T2YBk1Fji2g/Dzy
+0BYAnA4Kao2p3Qagshvd0LzC6HmPHQlS
+=rbCS
+-----END PGP SIGNATURE-----
Added: release/sling/org.apache.sling.resourcemerger-1.2.0-source-release.zip.md5
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.2.0-source-release.zip.md5 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.2.0-source-release.zip.md5 Sat Nov 29 15:50:16 2014
@@ -0,0 +1 @@
+09d42740d2df286bec1b355ffb53f037
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.2.0-source-release.zip.sha1
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.2.0-source-release.zip.sha1 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.2.0-source-release.zip.sha1 Sat Nov 29 15:50:16 2014
@@ -0,0 +1 @@
+29c42940afebb588520dcbe725caafc3210acdad
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.2.0-sources.jar
==============================================================================
Binary file - no diff available.
Propchange: release/sling/org.apache.sling.resourcemerger-1.2.0-sources.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: release/sling/org.apache.sling.resourcemerger-1.2.0-sources.jar.asc
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.2.0-sources.jar.asc (added)
+++ release/sling/org.apache.sling.resourcemerger-1.2.0-sources.jar.asc Sat Nov 29 15:50:16 2014
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEABECAAYFAlRzrucACgkQh9vwWhNLFFxLpACeKix3wNrQp2Gyc1XIrlmxbJ7w
+vq0AoKeFtoQAc8RqOrGw5Wnhhb+8SE0V
+=fHSy
+-----END PGP SIGNATURE-----
Added: release/sling/org.apache.sling.resourcemerger-1.2.0-sources.jar.md5
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.2.0-sources.jar.md5 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.2.0-sources.jar.md5 Sat Nov 29 15:50:16 2014
@@ -0,0 +1 @@
+4b772ce5eb567cc0c0226785856ff679
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.2.0-sources.jar.sha1
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.2.0-sources.jar.sha1 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.2.0-sources.jar.sha1 Sat Nov 29 15:50:16 2014
@@ -0,0 +1 @@
+e9d306f41f500f2f630381a0710d235b7822c52b
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.2.0.jar
==============================================================================
Binary file - no diff available.
Propchange: release/sling/org.apache.sling.resourcemerger-1.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: release/sling/org.apache.sling.resourcemerger-1.2.0.jar.asc
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.2.0.jar.asc (added)
+++ release/sling/org.apache.sling.resourcemerger-1.2.0.jar.asc Sat Nov 29 15:50:16 2014
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEABECAAYFAlRzrucACgkQh9vwWhNLFFx/YgCfbVymK/Jl2zHJT41EAuB6vcmW
+kycAn12DVp/Eqii4uU0FBqFtSpUp9FST
+=t0L1
+-----END PGP SIGNATURE-----
Added: release/sling/org.apache.sling.resourcemerger-1.2.0.jar.md5
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.2.0.jar.md5 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.2.0.jar.md5 Sat Nov 29 15:50:16 2014
@@ -0,0 +1 @@
+e779f67ffc818e8c8f101563add5708f
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.2.0.jar.sha1
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.2.0.jar.sha1 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.2.0.jar.sha1 Sat Nov 29 15:50:16 2014
@@ -0,0 +1 @@
+bdb7ded49e487fccecdf16dd62e334edd6c96fa3
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.2.0.pom
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.2.0.pom (added)
+++ release/sling/org.apache.sling.resourcemerger-1.2.0.pom Sat Nov 29 15:50:16 2014
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
+<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>22</version>
+ <relativePath />
+ </parent>
+
+ <artifactId>org.apache.sling.resourcemerger</artifactId>
+ <packaging>bundle</packaging>
+ <version>1.2.0</version>
+
+ <name>Apache Sling Resource Merger</name>
+ <description>
+ This bundle provides services to merge resources.
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resourcemerger-1.2.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resourcemerger-1.2.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.resourcemerger-1.2.0</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>maven-sling-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>2.7.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.osgi</artifactId>
+ <version>2.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.testing.resourceresolver-mock</artifactId>
+ <version>0.2.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: release/sling/org.apache.sling.resourcemerger-1.2.0.pom.asc
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.2.0.pom.asc (added)
+++ release/sling/org.apache.sling.resourcemerger-1.2.0.pom.asc Sat Nov 29 15:50:16 2014
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEABECAAYFAlRzrucACgkQh9vwWhNLFFz9vACeJ4Q8+9zcDOjTcwKyvzlnMyLZ
+1/oAnRJ6xyOZTMV79ucoZFxiCwGhAMKV
+=Mo4L
+-----END PGP SIGNATURE-----
Added: release/sling/org.apache.sling.resourcemerger-1.2.0.pom.md5
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.2.0.pom.md5 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.2.0.pom.md5 Sat Nov 29 15:50:16 2014
@@ -0,0 +1 @@
+fbbd9c458c89ed7b8938d7107293027b
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.2.0.pom.sha1
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.2.0.pom.sha1 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.2.0.pom.sha1 Sat Nov 29 15:50:16 2014
@@ -0,0 +1 @@
+7b8b20308f34929cee200eee189a08fcf7520eb7
\ No newline at end of file