Fix duplicate Bundle-SymbolicName in OSGi manifests
This commit is contained in:
parent
8e252c4b96
commit
7ade5b0ad9
@ -1,7 +1,7 @@
|
|||||||
Name: maven-resolver
|
Name: maven-resolver
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 1.0.3
|
Version: 1.0.3
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
Summary: Apache Maven Artifact Resolver library
|
Summary: Apache Maven Artifact Resolver library
|
||||||
URL: http://maven.apache.org/resolver/
|
URL: http://maven.apache.org/resolver/
|
||||||
@ -132,10 +132,11 @@ rm -r maven-resolver-transport-http/src/test
|
|||||||
|
|
||||||
# generate OSGi manifests
|
# generate OSGi manifests
|
||||||
for pom in $(find -mindepth 2 -name pom.xml) ; do
|
for pom in $(find -mindepth 2 -name pom.xml) ; do
|
||||||
%pom_add_plugin "org.apache.felix:maven-bundle-plugin" pom.xml \
|
%pom_add_plugin "org.apache.felix:maven-bundle-plugin" $pom \
|
||||||
"<configuration>
|
"<configuration>
|
||||||
<instructions>
|
<instructions>
|
||||||
<Bundle-SymbolicName>\${project.groupId}$(sed 's:./maven-resolver::;s:/pom.xml::;s:-:.:g' <<< $pom)</Bundle-SymbolicName>
|
<Bundle-SymbolicName>\${project.groupId}$(sed 's:./maven-resolver::;s:/pom.xml::;s:-:.:g' <<< $pom)</Bundle-SymbolicName>
|
||||||
|
<_nouses>true</_nouses>
|
||||||
</instructions>
|
</instructions>
|
||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
@ -183,6 +184,9 @@ done
|
|||||||
%license LICENSE NOTICE
|
%license LICENSE NOTICE
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 23 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.0.3-4
|
||||||
|
- Fix duplicate Bundle-SymbolicName in OSGi manifests
|
||||||
|
|
||||||
* Mon May 15 2017 Mat Booth <mat.booth@redhat.com> - 1:1.0.3-3
|
* Mon May 15 2017 Mat Booth <mat.booth@redhat.com> - 1:1.0.3-3
|
||||||
- Restore OSGi metadata that was lost in the switch from "aether" to
|
- Restore OSGi metadata that was lost in the switch from "aether" to
|
||||||
"maven-resolver"
|
"maven-resolver"
|
||||||
|
Loading…
Reference in New Issue
Block a user