[libjsonp-java] 04/06: Fixed the build failures
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Jan 15 11:12:06 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libjsonp-java.
commit d4c07de26343a63baea2c9158ce970f3459287d3
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Jan 15 12:09:06 2016 +0100
Fixed the build failures
---
debian/control | 3 +--
debian/libjsonp-java.poms | 3 +--
debian/maven.ignoreRules | 1 -
debian/patches/01-tweak-poms.patch | 14 ++++++++++
debian/patches/02-osgi-values.patch | 41 +++++++++++++++++++++++++++++
debian/patches/03-bundle-dependencies.patch | 14 ++++++++++
debian/patches/series | 3 +++
debian/rules | 3 +++
8 files changed, 77 insertions(+), 5 deletions(-)
diff --git a/debian/control b/debian/control
index fb5dec2..987a67a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5)
Build-Depends-Indep: libmaven-bundle-plugin-java,
libmaven-dependency-plugin-java,
libmaven-javadoc-plugin-java,
+ libmaven-source-plugin-java,
default-jdk-doc
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-java/libjsonp-java.git
@@ -22,8 +23,6 @@ Description: Java API for JSON Processing
JSR 353 - Java API for JSON Processing. The JSR provides portable APIs
to parse, generate, transform, and query JSON using the streaming API or
the object model API.
- .
- This package contains the javadoc documentation files.
Package: libjsonp-java-doc
Architecture: all
diff --git a/debian/libjsonp-java.poms b/debian/libjsonp-java.poms
index 25eb836..d25075e 100644
--- a/debian/libjsonp-java.poms
+++ b/debian/libjsonp-java.poms
@@ -27,9 +27,8 @@
#
pom.xml --no-parent --has-package-version
impl/pom.xml --has-package-version
-api/pom.xml --has-package-version
+api/pom.xml
jaxrs/pom.xml --ignore
-jaxrs-1x/pom.xml --ignore
tests/pom.xml --ignore
gf/pom.xml --ignore
demos/pom.xml --ignore
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 71d5835..c769a4d 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -6,7 +6,6 @@ org.glassfish jsonp-tests jar * * *
org.glassfish.jsonp demos pom * * *
org.glassfish.jsonp providers pom * * *
org.apache.maven.plugins maven-release-plugin * * * *
-org.apache.maven.plugins maven-source-plugin * * * *
org.codehaus.mojo findbugs-maven-plugin * * * *
org.glassfish.build spec-version-maven-plugin * * * *
org.glassfish.copyright glassfish-copyright-maven-plugin * * * *
diff --git a/debian/patches/01-tweak-poms.patch b/debian/patches/01-tweak-poms.patch
new file mode 100644
index 0000000..959e9c7
--- /dev/null
+++ b/debian/patches/01-tweak-poms.patch
@@ -0,0 +1,14 @@
+Description: Fix the version of the parent pom in api/pom.xml
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/api/pom.xml
++++ b/api/pom.xml
+@@ -47,7 +47,7 @@
+ <parent>
+ <groupId>org.glassfish</groupId>
+ <artifactId>json</artifactId>
+- <version>1.0.2</version>
++ <version>1.0.4</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
diff --git a/debian/patches/02-osgi-values.patch b/debian/patches/02-osgi-values.patch
new file mode 100644
index 0000000..48a1c91
--- /dev/null
+++ b/debian/patches/02-osgi-values.patch
@@ -0,0 +1,41 @@
+Description: Set the values usually set by the ignored spec-version-maven-plugin
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/api/pom.xml
++++ b/api/pom.xml
+@@ -130,11 +130,11 @@
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+- <Bundle-Version>${spec.bundle.version}</Bundle-Version>
+- <Bundle-SymbolicName>${spec.bundle.symbolic-name}</Bundle-SymbolicName>
+- <Extension-Name>${spec.extension.name}</Extension-Name>
+- <Implementation-Version>${spec.implementation.version}</Implementation-Version>
+- <Specification-Version>${spec.specification.version}</Specification-Version>
++ <Bundle-Version>${project.version}</Bundle-Version>
++ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
++ <Extension-Name>javax.json</Extension-Name>
++ <Implementation-Version>${project.version}</Implementation-Version>
++ <Specification-Version>${project.version}</Specification-Version>
+ <Export-Package>${packages.export}</Export-Package>
+ </instructions>
+ </configuration>
+--- a/impl/pom.xml
++++ b/impl/pom.xml
+@@ -182,11 +182,11 @@
+ <!-- TODO: is it spec plugin bug ? the spec.bundle.version returns 1.0 ?
+ <Bundle-Version>${spec.bundle.version}</Bundle-Version>
+ -->
+- <Bundle-Version>${spec.implementation.version}</Bundle-Version>
+- <Bundle-SymbolicName>${spec.bundle.symbolic-name}</Bundle-SymbolicName>
+- <Extension-Name>${spec.extension.name}</Extension-Name>
+- <Implementation-Version>${spec.implementation.version}</Implementation-Version>
+- <Specification-Version>${spec.specification.version}</Specification-Version>
++ <Bundle-Version>${project.version}</Bundle-Version>
++ <Bundle-SymbolicName>org.glassfish.javax.json</Bundle-SymbolicName>
++ <Extension-Name>javax.json</Extension-Name>
++ <Implementation-Version>${project.version}</Implementation-Version>
++ <Specification-Version>1.0</Specification-Version>
+ <Export-Package>${packages.export}</Export-Package>
+ <Private-Package>${packages.private}</Private-Package>
+ </instructions>
diff --git a/debian/patches/03-bundle-dependencies.patch b/debian/patches/03-bundle-dependencies.patch
new file mode 100644
index 0000000..de0f13b
--- /dev/null
+++ b/debian/patches/03-bundle-dependencies.patch
@@ -0,0 +1,14 @@
+Description: Set the version and the type of the json-api dependency in impl/pom.xml
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/impl/pom.xml
++++ b/impl/pom.xml
+@@ -198,6 +198,8 @@
+ <dependency>
+ <groupId>javax.json</groupId>
+ <artifactId>javax.json-api</artifactId>
++ <version>1.0</version>
++ <type>bundle</type>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..21c6950
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01-tweak-poms.patch
+02-osgi-values.patch
+03-bundle-dependencies.patch
diff --git a/debian/rules b/debian/rules
index 9867785..541590c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,5 +5,8 @@ export JAVA_HOME = /usr/lib/jvm/default-java
%:
dh $@ --buildsystem=maven
+override_dh_auto_build:
+ dh_auto_build -- install javadoc:jar javadoc:aggregate
+
get-orig-source:
uscan --download-current-version --force-download --no-symlink
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjsonp-java.git
More information about the pkg-java-commits
mailing list