[Git][java-team/uimaj][master] 3 commits: Wrap and sort

Emmanuel Bourg gitlab at salsa.debian.org
Fri Nov 30 08:42:47 GMT 2018


Emmanuel Bourg pushed to branch master at Debian Java Maintainers / uimaj


Commits:
16c33866 by Emmanuel Bourg at 2018-11-30T00:10:54Z
Wrap and sort

- - - - -
b97c0948 by Emmanuel Bourg at 2018-11-30T01:17:33Z
No longer build the uimaj-adapter-soap module

- - - - -
89cc3331 by Emmanuel Bourg at 2018-11-30T08:07:23Z
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/libuima-core-java.poms
- debian/maven.ignoreRules
- debian/patches/modules.diff


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+uimaj (2.10.2-2) unstable; urgency=medium
+
+  * Team upload.
+  * No longer build the uimaj-adapter-soap module
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 30 Nov 2018 09:07:17 +0100
+
 uimaj (2.10.2-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -2,32 +2,34 @@ Source: uimaj
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Fabien Poulard <fabien.poulard at univ-nantes.fr>,
-           Damien Raude-Morvan <drazzib at debian.org>,
-           Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: debhelper (>= 11),
-               default-jdk,
-               libmaven3-core-java,
-               maven-debian-helper (>= 2.0~),
-Build-Depends-Indep: default-jdk-doc,
-                     docbook-xml,
-                     docbook-xsl,
-                     fop,
-                     junit4,
-                     libaxis-java,
-                     libbuild-helper-maven-plugin-java,
-                     libcommons-io-java,
-                     libjaxp1.3-java,
-                     liblog4j1.2-java,
-                     libmaven-install-plugin-java,
-                     libmaven-javadoc-plugin-java,
-                     libmaven-plugin-testing-java,
-                     libmaven-plugin-tools-java (>= 2.8),
-                     libplexus-build-api-java (>= 0.0.7),
-                     libsaxon-java,
-                     libxerces2-java,
-                     libxml-commons-resolver1.1-java,
-                     xsltproc
+Uploaders:
+ Fabien Poulard <fabien.poulard at univ-nantes.fr>,
+ Damien Raude-Morvan <drazzib at debian.org>,
+ Emmanuel Bourg <ebourg at apache.org>
+Build-Depends:
+ debhelper (>= 11),
+ default-jdk,
+ default-jdk-doc,
+ docbook-xml,
+ docbook-xsl,
+ fop,
+ junit4,
+ libaxis-java,
+ libbuild-helper-maven-plugin-java,
+ libcommons-io-java,
+ libjaxp1.3-java,
+ liblog4j1.2-java,
+ libmaven-install-plugin-java,
+ libmaven-javadoc-plugin-java,
+ libmaven-plugin-testing-java,
+ libmaven-plugin-tools-java (>= 2.8),
+ libmaven3-core-java,
+ libplexus-build-api-java (>= 0.0.7),
+ libsaxon-java,
+ libxerces2-java,
+ libxml-commons-resolver1.1-java,
+ maven-debian-helper (>= 2.0~),
+ xsltproc
 Standards-Version: 4.2.1
 Vcs-Git: https://salsa.debian.org/java-team/uimaj.git
 Vcs-Browser: https://salsa.debian.org/java-team/uimaj
@@ -73,9 +75,10 @@ Description: Library to handle Vinci web service protocol
 
 Package: libuima-adapter-soap-java
 Architecture: all
-Depends: libaxis-java,
-         libuima-core-java (>= ${source:Version}),
-         ${misc:Depends}
+Depends:
+ libaxis-java,
+ libuima-core-java (>= ${source:Version}),
+ ${misc:Depends}
 Description: Library to provide SOAP web services within UIMA
  Apache UIMA is an implementation of the OASIS-UIMA specifications.
  .
@@ -172,14 +175,16 @@ Description: UIMA library for the UIMA tools
 
 Package: uima-utils
 Architecture: all
-Depends: default-jre | java5-runtime,
-         libuima-core-java (>= ${source:Version}),
-         libuima-tools-java (>= ${source:Version}),
-         ${misc:Depends}
-Recommends: libuima-adapter-soap-java (>= ${source:Version}),
-            libuima-adapter-vinci-java (>= ${source:Version}),
-            libuima-cpe-java (>= ${source:Version}),
-            libuima-document-annotation-java (>= ${source:Version})
+Depends:
+ default-jre | java5-runtime,
+ libuima-core-java (>= ${source:Version}),
+ libuima-tools-java (>= ${source:Version}),
+ ${misc:Depends}
+Recommends:
+ libuima-adapter-soap-java (>= ${source:Version}),
+ libuima-adapter-vinci-java (>= ${source:Version}),
+ libuima-cpe-java (>= ${source:Version}),
+ libuima-document-annotation-java (>= ${source:Version})
 Description: UIMA tools
  Apache UIMA is an implementation of the OASIS-UIMA specifications.
  .


=====================================
debian/libuima-core-java.poms
=====================================
@@ -33,7 +33,7 @@ uimaj-core/pom.xml --has-package-version --java-lib --artifact=uimaj-core/target
 uimaj-test-util/pom.xml --has-package-version --java-lib --artifact=uimaj-test-util/target/uimaj-test-util-*.jar
 uimaj-component-test-util/pom.xml --has-package-version --java-lib --artifact=uimaj-component-test-util/target/uimaj-component-test-util-*.jar
 
-uimaj-adapter-soap/pom.xml --has-package-version --package=libuima-adapter-soap-java --java-lib --artifact=uimaj-adapter-soap/target/uima-adapter-soap.jar
+uimaj-adapter-soap/pom.xml --ignore
 
 uimaj-adapter-vinci/pom.xml --has-package-version --package=libuima-adapter-vinci-java --java-lib --artifact=uimaj-adapter-vinci/target/uima-adapter-vinci.jar
 


=====================================
debian/maven.ignoreRules
=====================================
@@ -23,3 +23,5 @@ org.apache.rat apache-rat-plugin maven-plugin * * *
 org.apache.geronimo.specs geronimo-activation_1.0.2_spec * * * *
 com.github.siom79.japicmp japicmp-maven-plugin * * * *
 xmlunit xmlunit * * * *
+
+org.apache.uima uimaj-adapter-soap * * * *


=====================================
debian/patches/modules.diff
=====================================
@@ -23,7 +23,11 @@ Forwarded: not-needed
  </project>
 --- a/aggregate-uimaj/pom.xml
 +++ b/aggregate-uimaj/pom.xml
-@@ -67,7 +67,6 @@
+@@ -63,11 +63,9 @@
+     <module>../uimaj-examples</module>
+     <module>../uimaj-tools</module>
+     <module>../uimaj-adapter-vinci</module>
+-    <module>../uimaj-adapter-soap</module>
      <module>../uimaj-test-util</module>
      <module>../uimaj-component-test-util</module>
      <module>../jVinci</module>
@@ -31,7 +35,7 @@ Forwarded: not-needed
      <module>../aggregate-uimaj-docbooks</module>
      <!--module>distr-superPom</module-->
      <module>../uimaj-document-annotation</module>
-@@ -79,4 +78,4 @@
+@@ -79,4 +77,4 @@
      <!--module>../uimaj-internal-tools</module-->
      <module>../uimaj-bootstrap</module>    
    </modules>  



View it on GitLab: https://salsa.debian.org/java-team/uimaj/compare/34a6a0952cbeb6703028842c4061b04606719fb9...89cc3331fa8da8a911c2d468172680fb43240e9f

-- 
View it on GitLab: https://salsa.debian.org/java-team/uimaj/compare/34a6a0952cbeb6703028842c4061b04606719fb9...89cc3331fa8da8a911c2d468172680fb43240e9f
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181130/64fe7d17/attachment.html>


More information about the pkg-java-commits mailing list