You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2016/11/24 00:40:36 UTC
incubator-tamaya git commit: TAMAYA-202: Applied C. Schneider's Path:
Use bnd-maven-plugin. Minimize required config.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master 4ae00e176 -> 4bce88abf
TAMAYA-202: Applied C. Schneider's Path: Use bnd-maven-plugin. Minimize required config.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/4bce88ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/4bce88ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/4bce88ab
Branch: refs/heads/master
Commit: 4bce88abf59702702d7c3055ef5860c04428b92c
Parents: 4ae00e1
Author: anatole <an...@apache.org>
Authored: Thu Nov 24 01:40:23 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Thu Nov 24 01:40:23 2016 +0100
----------------------------------------------------------------------
code/api/bnd.bnd | 3 +++
code/api/pom.xml | 34 ++++-----------------------------
code/core/bnd.bnd | 5 +++++
code/core/pom.xml | 32 -------------------------------
pom.xml | 52 +++++++++++++++++++++-----------------------------
5 files changed, 34 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4bce88ab/code/api/bnd.bnd
----------------------------------------------------------------------
diff --git a/code/api/bnd.bnd b/code/api/bnd.bnd
new file mode 100644
index 0000000..fcbaaa7
--- /dev/null
+++ b/code/api/bnd.bnd
@@ -0,0 +1,3 @@
+Export-Package: \
+ org.apache.tamaya,\
+ org.apache.tamaya.spi
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4bce88ab/code/api/pom.xml
----------------------------------------------------------------------
diff --git a/code/api/pom.xml b/code/api/pom.xml
index 074aeb8..e9f2ad9 100644
--- a/code/api/pom.xml
+++ b/code/api/pom.xml
@@ -27,12 +27,14 @@ under the License.
<artifactId>tamaya-api</artifactId>
<name>Apache Tamaya API</name>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<description>
The API for accessing configuration data.
</description>
-
+
+ <url>http://tamaya.incubator.apache.org</url>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -47,34 +49,6 @@ under the License.
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
-
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>
- org.apache.tamaya,
- org.apache.tamaya.spi
- </Export-Package>
- <!--<Require-Capability>-->
- <!--osgi.extender;-->
- <!--filter:="(osgi.extender=osgi.serviceloader.processor)",-->
- <!--osgi.serviceloader;-->
- <!--filter:="(org.apache.tamaya.spi.ServiceContext)";-->
- <!--cardinality:=multiple;-->
- <!--filter:="(org.apache.tamaya.spi.ConfigurationProviderSpi)";-->
- <!--cardinality:=multiple-->
- <!--</Require-Capability>-->
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4bce88ab/code/core/bnd.bnd
----------------------------------------------------------------------
diff --git a/code/core/bnd.bnd b/code/core/bnd.bnd
new file mode 100644
index 0000000..a8eb68b
--- /dev/null
+++ b/code/core/bnd.bnd
@@ -0,0 +1,5 @@
+Export-Package: \
+ org.apache.tamaya.core,\
+ org.apache.tamaya.core.propertysource,\
+ org.apache.tamaya.core.provider
+Bundle-Activator: org.apache.tamaya.core.internal.OSGIActivator
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4bce88ab/code/core/pom.xml
----------------------------------------------------------------------
diff --git a/code/core/pom.xml b/code/core/pom.xml
index a002a3a..18e1986 100644
--- a/code/core/pom.xml
+++ b/code/core/pom.xml
@@ -67,36 +67,4 @@ under the License.
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Import-Package>
- org.apache.tamaya,
- org.apache.tamaya.spi,
- javax.annotation,
- *
- </Import-Package>
- <Private-Package>
- org.apache.tamaya.core.internal,
- org.apache.tamaya.core.internal.converters
- </Private-Package>
- <Export-Package>
- org.apache.tamaya.core,
- org.apache.tamaya.core.propertysource,
- org.apache.tamaya.core.provider
- </Export-Package>
- <Bundle-Activator>
- org.apache.tamaya.core.internal.OSGIActivator
- </Bundle-Activator>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4bce88ab/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 266c132..e0765db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -458,36 +458,6 @@ under the License.
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.2.0</version>
- <inherited>true</inherited>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-DocURL>http://tamaya.incubator.apache.org</Bundle-DocURL>
- <Bundle-SymbolicName>
- ${project.groupId}.${project.artifactId}
- </Bundle-SymbolicName>
- <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>cleanVersions</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>cleanVersions</goal>
- </goals>
- <configuration>
- <versions>
- <karaf.osgi.version>${osgi.version}</karaf.osgi.version>
- </versions>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<version>1.1</version>
@@ -713,6 +683,28 @@ under the License.
<preparationGoals>clean install</preparationGoals>
</configuration>
</plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <version>3.3.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</build>