You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2018/01/21 12:56:42 UTC
[sling-org-apache-sling-commons-metrics] branch master updated
(29cab2c -> 0c76e6c)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-metrics.git.
from 29cab2c [maven-release-plugin] prepare for next development iteration
new 3b3b1ea SLING-7353 Update to Sling Parent 33
new 0c76e6c SLING-7418 Use bnd Maven plugins
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
bnd.bnd | 28 ++++++++++++++++++++++++++++
pom.xml | 64 ++++++++++++++++++++--------------------------------------------
2 files changed, 48 insertions(+), 44 deletions(-)
create mode 100644 bnd.bnd
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-commons-metrics] 02/02: SLING-7418 Use bnd
Maven plugins
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-metrics.git
commit 0c76e6ca7cc030823b9baac81aa2bef38a9082a8
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Jan 21 13:56:32 2018 +0100
SLING-7418 Use bnd Maven plugins
---
bnd.bnd | 28 ++++++++++++++++++++++++++++
pom.xml | 42 +++++++-----------------------------------
2 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..296043e
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,28 @@
+Bundle-Category: sling
+
+Bundle-Description: ${project.description}
+
+Bundle-DocURL: https://sling.apache.org/documentation/bundles/metrics.html
+
+Bundle-License: Apache License, Version 2.0
+
+Bundle-Vendor: The Apache Software Foundation
+
+DynamicImport-Package:\
+ javax.servlet,\
+ javax.servlet.http;version="[2.3,3)",\
+ org.apache.commons.io.output;version="[2.4.0,3)",\
+ org.apache.felix.inventory;version="[1.0.0,2)"
+
+-baseline: *
+
+-exportcontents: ${packages;VERSIONED}
+
+-includeresource:\
+ @org.apache.felix.utils-*.jar!/org/apache/felix/utils/json/JSONWriter**
+
+-removeheaders:\
+ Embed-Dependency,\
+ Embed-Transitive,\
+ Include-Resource,\
+ Private-Package
diff --git a/pom.xml b/pom.xml
index b7d1872..614adee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,6 @@
</parent>
<artifactId>org.apache.sling.commons.metrics</artifactId>
- <packaging>bundle</packaging>
<version>1.2.5-SNAPSHOT</version>
<name>Apache Sling Metrics</name>
@@ -52,39 +51,12 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-DocURL>
- https://sling.apache.org/documentation/bundles/metrics.html
- </Bundle-DocURL>
- <DynamicImport-Package>
- javax.servlet,
- javax.servlet.http;version="[2.3,3)",
- org.apache.commons.io.output;version="[2.4.0,3)",
- org.apache.felix.inventory;version="[1.0.0,2)"
- </DynamicImport-Package>
- <Embed-Dependency>
- org.apache.felix.utils;inline=org/apache/felix/utils/json/JSONWriter**
- </Embed-Dependency>
- </instructions>
- <!-- Export SCR metadata to classpath to have them available in unit tests -->
- <exportScr>true</exportScr>
- </configuration>
- <executions>
- <!-- Configure extra execution of 'manifest' in process-classes phase to make sure SCR metadata is generated before unit test runs -->
- <execution>
- <id>scr-metadata</id>
- <goals>
- <goal>manifest</goal>
- </goals>
- <configuration>
- <supportIncrementalBuild>true</supportIncrementalBuild>
- </configuration>
- </execution>
- </executions>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-baseline-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -164,7 +136,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.utils</artifactId>
<version>1.9.0</version>
- <optional>true</optional>
+ <scope>provided</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-commons-metrics] 01/02: SLING-7353 Update
to Sling Parent 33
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-metrics.git
commit 3b3b1ea113c59222f235691f8f2394e99e29de0c
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Jan 21 13:54:09 2018 +0100
SLING-7353 Update to Sling Parent 33
---
pom.xml | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8c1c9db..b7d1872 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,8 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>30</version>
+ <version>33</version>
+ <relativePath/>
</parent>
<artifactId>org.apache.sling.commons.metrics</artifactId>
@@ -109,13 +110,6 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>generate-depends-file</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
@@ -124,11 +118,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>3.2.3</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -138,22 +134,30 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.inventory</artifactId>
<version>1.0.2</version>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.2</version>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.