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 2017/02/27 12:07:48 UTC
svn commit: r1784537 - in /sling/trunk/contrib/commons/mom: ./ api/
api/src/main/java/org/apache/sling/mom/ jms/
jms/src/main/java/org/apache/sling/jms/ jobs/core/
jobs/core/src/main/java/org/apache/sling/jobs/ jobs/it-services/
Author: cziegeler
Date: Mon Feb 27 12:07:48 2017
New Revision: 1784537
URL: http://svn.apache.org/viewvc?rev=1784537&view=rev
Log:
Add svn:ignore, use OSGi version annotation, update to latest parent pom
Modified:
sling/trunk/contrib/commons/mom/api/ (props changed)
sling/trunk/contrib/commons/mom/api/pom.xml
sling/trunk/contrib/commons/mom/api/src/main/java/org/apache/sling/mom/package-info.java
sling/trunk/contrib/commons/mom/jms/ (props changed)
sling/trunk/contrib/commons/mom/jms/pom.xml
sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/package-info.java
sling/trunk/contrib/commons/mom/jobs/core/ (props changed)
sling/trunk/contrib/commons/mom/jobs/core/pom.xml
sling/trunk/contrib/commons/mom/jobs/core/src/main/java/org/apache/sling/jobs/package-info.java
sling/trunk/contrib/commons/mom/jobs/it-services/ (props changed)
sling/trunk/contrib/commons/mom/jobs/it-services/pom.xml
sling/trunk/contrib/commons/mom/pom.xml
Propchange: sling/trunk/contrib/commons/mom/api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb 27 12:07:48 2017
@@ -0,0 +1,4 @@
+.classpath
+.settings
+.project
+target
Modified: sling/trunk/contrib/commons/mom/api/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/api/pom.xml?rev=1784537&r1=1784536&r2=1784537&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/api/pom.xml (original)
+++ sling/trunk/contrib/commons/mom/api/pom.xml Mon Feb 27 12:07:48 2017
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>29</version>
<relativePath />
</parent>
@@ -80,16 +80,6 @@
</reporting>
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.annotation</artifactId>
- <version>6.0.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>2.0.1</version>
Modified: sling/trunk/contrib/commons/mom/api/src/main/java/org/apache/sling/mom/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/api/src/main/java/org/apache/sling/mom/package-info.java?rev=1784537&r1=1784536&r2=1784537&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/api/src/main/java/org/apache/sling/mom/package-info.java (original)
+++ sling/trunk/contrib/commons/mom/api/src/main/java/org/apache/sling/mom/package-info.java Mon Feb 27 12:07:48 2017
@@ -20,7 +20,5 @@
/**
*/
-@Version("1.0.0")
+@org.osgi.annotation.versioning.Version("1.0.0")
package org.apache.sling.mom;
-
-import aQute.bnd.annotation.Version;
\ No newline at end of file
Propchange: sling/trunk/contrib/commons/mom/jms/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb 27 12:07:48 2017
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+.settings
+activemq-data
Modified: sling/trunk/contrib/commons/mom/jms/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/jms/pom.xml?rev=1784537&r1=1784536&r2=1784537&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/jms/pom.xml (original)
+++ sling/trunk/contrib/commons/mom/jms/pom.xml Mon Feb 27 12:07:48 2017
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>29</version>
<relativePath />
</parent>
@@ -135,6 +135,11 @@
</reporting>
<dependencies>
<dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.mom</artifactId>
<version>1.0.1-SNAPSHOT</version>
@@ -198,10 +203,6 @@
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
Modified: sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/package-info.java?rev=1784537&r1=1784536&r2=1784537&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/package-info.java (original)
+++ sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/package-info.java Mon Feb 27 12:07:48 2017
@@ -23,4 +23,4 @@
@Version("1.0.0")
package org.apache.sling.jms;
-import aQute.bnd.annotation.Version;
\ No newline at end of file
+import org.osgi.annotation.versioning.Version;
\ No newline at end of file
Propchange: sling/trunk/contrib/commons/mom/jobs/core/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb 27 12:07:48 2017
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Modified: sling/trunk/contrib/commons/mom/jobs/core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/jobs/core/pom.xml?rev=1784537&r1=1784536&r2=1784537&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/jobs/core/pom.xml (original)
+++ sling/trunk/contrib/commons/mom/jobs/core/pom.xml Mon Feb 27 12:07:48 2017
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>29</version>
<relativePath />
</parent>
@@ -86,10 +86,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
@@ -100,12 +96,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.annotation</artifactId>
- <version>6.0.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>2.0.1</version>
Modified: sling/trunk/contrib/commons/mom/jobs/core/src/main/java/org/apache/sling/jobs/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/jobs/core/src/main/java/org/apache/sling/jobs/package-info.java?rev=1784537&r1=1784536&r2=1784537&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/jobs/core/src/main/java/org/apache/sling/jobs/package-info.java (original)
+++ sling/trunk/contrib/commons/mom/jobs/core/src/main/java/org/apache/sling/jobs/package-info.java Mon Feb 27 12:07:48 2017
@@ -19,5 +19,5 @@
@Version("1.0.0")
package org.apache.sling.jobs;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
Propchange: sling/trunk/contrib/commons/mom/jobs/it-services/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb 27 12:07:48 2017
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Modified: sling/trunk/contrib/commons/mom/jobs/it-services/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/jobs/it-services/pom.xml?rev=1784537&r1=1784536&r2=1784537&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/jobs/it-services/pom.xml (original)
+++ sling/trunk/contrib/commons/mom/jobs/it-services/pom.xml Mon Feb 27 12:07:48 2017
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>29</version>
<relativePath />
</parent>
@@ -90,10 +90,6 @@
<version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
Modified: sling/trunk/contrib/commons/mom/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/pom.xml?rev=1784537&r1=1784536&r2=1784537&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/pom.xml (original)
+++ sling/trunk/contrib/commons/mom/pom.xml Mon Feb 27 12:07:48 2017
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>22</version>
+ <version>29</version>
</parent>
<groupId>org.apache.sling</groupId>