[uimaj] 01/05: Fixed the build failure with Java 9 (Closes: #873249)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository uimaj.

commit 750ab151a9bf65339ecaa5e14fa0f00ee33144be
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Mar 9 14:23:46 2018 +0100

    Fixed the build failure with Java 9 (Closes: #873249)
---
 debian/changelog                  | 7 +++++++
 debian/patches/disable_ecore.diff | 7 ++++---
 debian/rules                      | 3 ++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 45d2f88..4ce44d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+uimaj (2.10.1-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Java 9 (Closes: #873249)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 09 Mar 2018 13:27:27 +0100
+
 uimaj (2.10.1-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/disable_ecore.diff b/debian/patches/disable_ecore.diff
index d1c676d..4faca03 100644
--- a/debian/patches/disable_ecore.diff
+++ b/debian/patches/disable_ecore.diff
@@ -23,7 +23,7 @@ Forwared: not-needed
  	</dependencies>
  	<build>
  		<finalName>uima-examples</finalName>
-@@ -122,7 +124,18 @@
+@@ -122,8 +124,17 @@
                </configuration>
              </execution>
            </executions>
@@ -33,8 +33,6 @@ Forwared: not-needed
 +            <groupId>org.apache.maven.plugins</groupId>
 +            <artifactId>maven-compiler-plugin</artifactId>
 +            <configuration>
-+               <source>1.5</source>
-+               <target>1.5</target>
 +               <excludes>
 +                       <exclude>**/org/apache/uima/examples/xmi/**.java</exclude>
 +               </excludes>
@@ -43,3 +41,6 @@ Forwared: not-needed
        </plugins>
      </pluginManagement>
  	</build>	
+-</project>
+\ No newline at end of file
++</project>
diff --git a/debian/rules b/debian/rules
index 9f14b5f..67f05cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,8 @@
 	dh $@
 
 override_dh_auto_build:
-	dh_auto_build -- install javadoc:aggregate
+	dh_auto_build -- install
+	dh_auto_build -- javadoc:aggregate --projects !uimaj-examples
 
 	for PAGE in annotationViewer documentAnalyzer cpeGui jcasgen runAE runPearInstaller runPearInstaller runPearMerger runPearPackager validateDescriptor; do \
 	    xsltproc -''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl debian/manpages/$$PAGE.xml; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/uimaj.git