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 2016/11/08 16:06:00 UTC
svn commit: r1768718 - in /sling/trunk/bundles/extensions/repoinit: ./ it/
parser/ parser/src/main/java/org/apache/sling/repoinit/parser/
parser/src/main/java/org/apache/sling/repoinit/parser/impl/
parser/src/main/java/org/apache/sling/repoinit/parser/...
Author: cziegeler
Date: Tue Nov 8 16:06:00 2016
New Revision: 1768718
URL: http://svn.apache.org/viewvc?rev=1768718&view=rev
Log:
Update to parent pom 29
Modified:
sling/trunk/bundles/extensions/repoinit/it/pom.xml
sling/trunk/bundles/extensions/repoinit/parser/pom.xml
sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/RepoInitParser.java
sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java
sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/package-info.java
sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/package-info.java
sling/trunk/bundles/extensions/repoinit/pom.xml
Modified: sling/trunk/bundles/extensions/repoinit/it/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/repoinit/it/pom.xml?rev=1768718&r1=1768717&r2=1768718&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/repoinit/it/pom.xml (original)
+++ sling/trunk/bundles/extensions/repoinit/it/pom.xml Tue Nov 8 16:06:00 2016
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>29</version>
<relativePath/>
</parent>
@@ -111,7 +111,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>slingstart-maven-plugin</artifactId>
- <version>1.4.2</version>
+ <version>1.4.4</version>
<extensions>true</extensions>
<executions>
<execution>
@@ -140,7 +140,7 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -186,7 +186,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
@@ -197,7 +196,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.junit.teleporter</artifactId>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.8</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: sling/trunk/bundles/extensions/repoinit/parser/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/repoinit/parser/pom.xml?rev=1768718&r1=1768717&r2=1768718&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/repoinit/parser/pom.xml (original)
+++ sling/trunk/bundles/extensions/repoinit/parser/pom.xml Tue Nov 8 16:06:00 2016
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>29</version>
<relativePath />
</parent>
@@ -43,10 +43,6 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
</plugin>
@@ -87,6 +83,7 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
Modified: sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/RepoInitParser.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/RepoInitParser.java?rev=1768718&r1=1768717&r2=1768718&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/RepoInitParser.java (original)
+++ sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/RepoInitParser.java Tue Nov 8 16:06:00 2016
@@ -22,10 +22,12 @@ import java.io.Reader;
import java.util.List;
import org.apache.sling.repoinit.parser.operations.Operation;
+import org.osgi.annotation.versioning.ProviderType;
/**
* repoinit parser service interface
*/
+@ProviderType
public interface RepoInitParser {
/**
Modified: sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java?rev=1768718&r1=1768717&r2=1768718&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java (original)
+++ sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java Tue Nov 8 16:06:00 2016
@@ -22,15 +22,13 @@ import java.io.IOException;
import java.io.Reader;
import java.util.List;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
import org.apache.sling.repoinit.parser.RepoInitParser;
import org.apache.sling.repoinit.parser.RepoInitParsingException;
import org.apache.sling.repoinit.parser.operations.Operation;
+import org.osgi.service.component.annotations.Component;
/** ACL definitions parser service */
-@Component
-@Service(value=RepoInitParser.class)
+@Component(service=RepoInitParser.class)
public class RepoInitParserService implements RepoInitParser {
@Override
Modified: sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/package-info.java?rev=1768718&r1=1768717&r2=1768718&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/package-info.java (original)
+++ sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/package-info.java Tue Nov 8 16:06:00 2016
@@ -15,7 +15,6 @@
* limitations under the License.
******************************************************************************/
-@Version("3.0.0")
+@org.osgi.annotation.versioning.Version("3.0.0")
package org.apache.sling.repoinit.parser.operations;
-import aQute.bnd.annotation.Version;
Modified: sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/package-info.java?rev=1768718&r1=1768717&r2=1768718&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/package-info.java (original)
+++ sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/package-info.java Tue Nov 8 16:06:00 2016
@@ -15,7 +15,6 @@
* limitations under the License.
******************************************************************************/
-@Version("1.0.0")
+@org.osgi.annotation.versioning.Version("1.0.2")
package org.apache.sling.repoinit.parser;
-import aQute.bnd.annotation.Version;
Modified: sling/trunk/bundles/extensions/repoinit/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/repoinit/pom.xml?rev=1768718&r1=1768717&r2=1768718&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/repoinit/pom.xml (original)
+++ sling/trunk/bundles/extensions/repoinit/pom.xml Tue Nov 8 16:06:00 2016
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>29</version>
<relativePath/>
</parent>