You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/10/18 23:18:52 UTC

[sling-org-apache-sling-commons-compiler] 21/36: Update to parent pom 27

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-compiler.git

commit f3eb4b8e43c6691dfea1fbc280c3c23f20d4d475
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Jul 24 10:54:18 2016 +0000

    Update to parent pom 27
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1753902 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                            | 10 ++-------
 .../sling/commons/compiler/CompilationResult.java  |  3 +++
 .../sling/commons/compiler/CompilationUnit.java    |  3 +++
 .../compiler/CompilationUnitWithSource.java        |  7 +++++--
 .../sling/commons/compiler/CompilerMessage.java    |  3 +++
 .../sling/commons/compiler/JavaCompiler.java       |  3 +++
 .../sling/commons/compiler/package-info.java       | 24 ++++++++++++++++++++++
 7 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3ffc2e3..419d875 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>26</version>
+        <version>27</version>
         <relativePath />
     </parent>
 
@@ -63,12 +63,6 @@
                             !org.eclipse.*,
                             !org.apache.tools.*,*
                         </Import-Package>
-                        <Export-Package>
-                            org.apache.sling.commons.compiler;version=2.1.0
-                        </Export-Package>
-                        <Private-Package>
-                            org.apache.sling.commons.compiler.impl
-                        </Private-Package>
                         <Embed-Dependency>
                             ecj
                         </Embed-Dependency>
@@ -90,7 +84,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
diff --git a/src/main/java/org/apache/sling/commons/compiler/CompilationResult.java b/src/main/java/org/apache/sling/commons/compiler/CompilationResult.java
index 6011cbd..447d7c6 100644
--- a/src/main/java/org/apache/sling/commons/compiler/CompilationResult.java
+++ b/src/main/java/org/apache/sling/commons/compiler/CompilationResult.java
@@ -18,12 +18,15 @@ package org.apache.sling.commons.compiler;
 
 import java.util.List;
 
+import org.osgi.annotation.versioning.ProviderType;
+
 /**
  * The compilation result allows clients of the java compiler
  * to check for error messages, warnings (if not disabled by
  * the options) and allows to access the compiled classes.
  * @since 2.0
  */
+@ProviderType
 public interface CompilationResult {
 
     /**
diff --git a/src/main/java/org/apache/sling/commons/compiler/CompilationUnit.java b/src/main/java/org/apache/sling/commons/compiler/CompilationUnit.java
index 289d791..3b5ae2c 100644
--- a/src/main/java/org/apache/sling/commons/compiler/CompilationUnit.java
+++ b/src/main/java/org/apache/sling/commons/compiler/CompilationUnit.java
@@ -19,10 +19,13 @@ package org.apache.sling.commons.compiler;
 import java.io.IOException;
 import java.io.Reader;
 
+import org.osgi.annotation.versioning.ConsumerType;
+
 /**
  * This interface describes a compilation unit - usually a java class.
  * @since 2.0
  */
+@ConsumerType
 public interface CompilationUnit {
 
     /**
diff --git a/src/main/java/org/apache/sling/commons/compiler/CompilationUnitWithSource.java b/src/main/java/org/apache/sling/commons/compiler/CompilationUnitWithSource.java
index 9a4921b..df9a6e0 100644
--- a/src/main/java/org/apache/sling/commons/compiler/CompilationUnitWithSource.java
+++ b/src/main/java/org/apache/sling/commons/compiler/CompilationUnitWithSource.java
@@ -5,9 +5,9 @@
  * 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
@@ -16,11 +16,14 @@
  */
 package org.apache.sling.commons.compiler;
 
+import org.osgi.annotation.versioning.ConsumerType;
+
 /**
  * Extension of the CompilationUnit interface which allows for the explicit
  * declaration of the source file name.
  * @since 2.1
  */
+@ConsumerType
 public interface CompilationUnitWithSource extends CompilationUnit {
 
     String getFileName();
diff --git a/src/main/java/org/apache/sling/commons/compiler/CompilerMessage.java b/src/main/java/org/apache/sling/commons/compiler/CompilerMessage.java
index fd98d7a..aa28642 100644
--- a/src/main/java/org/apache/sling/commons/compiler/CompilerMessage.java
+++ b/src/main/java/org/apache/sling/commons/compiler/CompilerMessage.java
@@ -16,6 +16,8 @@
  */
 package org.apache.sling.commons.compiler;
 
+import org.osgi.annotation.versioning.ProviderType;
+
 /**
  * This class encapsulates a message produced the compiler.
  * A message is either a warning or an error.
@@ -23,6 +25,7 @@ package org.apache.sling.commons.compiler;
  *
  * @since 2.0
  */
+@ProviderType
 public class CompilerMessage {
 
     /**
diff --git a/src/main/java/org/apache/sling/commons/compiler/JavaCompiler.java b/src/main/java/org/apache/sling/commons/compiler/JavaCompiler.java
index 8d2d629..351da45 100644
--- a/src/main/java/org/apache/sling/commons/compiler/JavaCompiler.java
+++ b/src/main/java/org/apache/sling/commons/compiler/JavaCompiler.java
@@ -16,10 +16,13 @@
  */
 package org.apache.sling.commons.compiler;
 
+import org.osgi.annotation.versioning.ProviderType;
+
 /**
  * The <code>JavaCompiler</code> provides platform independant Java
  * compilation support.
  */
+@ProviderType
 public interface JavaCompiler {
 
     /**
diff --git a/src/main/java/org/apache/sling/commons/compiler/package-info.java b/src/main/java/org/apache/sling/commons/compiler/package-info.java
new file mode 100644
index 0000000..5045562
--- /dev/null
+++ b/src/main/java/org/apache/sling/commons/compiler/package-info.java
@@ -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("2.1.1")
+package org.apache.sling.commons.compiler;
+
+import org.osgi.annotation.versioning.Version;
+

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.