CVS commit: pkgsrc/devel/snappy-java10

["Yuji Yamano" <yyamano%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   yyamano
Date:           Wed Jul  1 05:03:40 UTC 2020

Modified Files:
        pkgsrc/devel/snappy-java10: Makefile distinfo
        pkgsrc/devel/snappy-java10/patches: patch-pom.xml

Log Message:
Specify java source and target version as maven option to make this build with JDK 11.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/snappy-java10/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/snappy-java10/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/snappy-java10/patches/patch-pom.xml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/snappy-java10/Makefile
diff -u pkgsrc/devel/snappy-java10/Makefile:1.9 pkgsrc/devel/snappy-java10/Makefile:1.10
--- pkgsrc/devel/snappy-java10/Makefile:1.9     Sun Nov  3 10:39:30 2019
+++ pkgsrc/devel/snappy-java10/Makefile Wed Jul  1 05:03:39 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/11/03 10:39:30 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2020/07/01 05:03:39 yyamano Exp $
 
 DISTNAME=      snappy-java-${SNAPVER}${SNAPJVER}
 CATEGORIES=    devel
@@ -28,9 +28,19 @@ USE_TOOLS+=  gmake
 USE_JAVA=      yes
 USE_JAVA2=     6
 
+.include "../../mk/java-vm.mk"
+
 MAVEN_FLAGS+=  -Duser.home=${FAKEHOMEDIR}
 MAVEN_FLAGS+=  -Dmaven.repo.local=${WRKDIR}/deps
 MAVEN_FLAGS+=  --offline
+# Java 11 doesn't support Java 1.5 compatibility.
+.if ${PKG_JVM} == "sun-jdk7" || ${PKG_JVM} == "oracle-jdk8" || ${PKG_JVM} == "openjdk8"
+MAVEN_FLAGS+=  -Dmaven.compiler.source=1.5
+MAVEN_FLAGS+=  -Dmaven.compiler.target=1.5
+.else
+MAVEN_FLAGS+=  -Dmaven.compiler.source=1.6
+MAVEN_FLAGS+=  -Dmaven.compiler.target=1.6
+.endif
 
 MAKE_FLAGS+=   JAVA_HOME=${PKG_JAVA_HOME}
 MAKE_FLAGS+=   MVN="mvn ${MAVEN_FLAGS}"
@@ -47,5 +57,4 @@ do-install:
                ${DESTDIR}${PREFIX}/lib/java/snappy-java/snappy-java.jar
 
 .include "../../mk/java-env.mk"
-.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/snappy-java10/distinfo
diff -u pkgsrc/devel/snappy-java10/distinfo:1.8 pkgsrc/devel/snappy-java10/distinfo:1.9
--- pkgsrc/devel/snappy-java10/distinfo:1.8     Sat Jun  9 11:36:45 2018
+++ pkgsrc/devel/snappy-java10/distinfo Wed Jul  1 05:03:39 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2018/06/09 11:36:45 fhajny Exp $
+$NetBSD: distinfo,v 1.9 2020/07/01 05:03:39 yyamano Exp $
 
 SHA1 (snappy-java/snappy-1.0.5.tar.gz) = 3a3df859cf33f78f8e945c3f67f28685f0f38bb1
 RMD160 (snappy-java/snappy-1.0.5.tar.gz) = c9dec9a8a2faac7bf85b79bcf82f8080713103aa
@@ -14,4 +14,4 @@ SHA512 (snappy-java/snappy-java-deps-1.0
 Size (snappy-java/snappy-java-deps-1.0.5.4.tar.gz) = 13148358 bytes
 SHA1 (patch-Makefile) = cb15c6016dab4670fce0ace6f1dd21e7c7bb1097
 SHA1 (patch-Makefile.common) = 83eeaf91c7dbd6ac3c4b3405d53acec9caa260aa
-SHA1 (patch-pom.xml) = 2dbf15f680aa570e8479fa81640d53d6fac12b15
+SHA1 (patch-pom.xml) = 833e19ef0b58d539b2ca2d6cd89361e9845b17cf

Index: pkgsrc/devel/snappy-java10/patches/patch-pom.xml
diff -u pkgsrc/devel/snappy-java10/patches/patch-pom.xml:1.1 pkgsrc/devel/snappy-java10/patches/patch-pom.xml:1.2
--- pkgsrc/devel/snappy-java10/patches/patch-pom.xml:1.1        Sat Jun  9 11:36:45 2018
+++ pkgsrc/devel/snappy-java10/patches/patch-pom.xml    Wed Jul  1 05:03:39 2020
@@ -1,10 +1,22 @@
-$NetBSD: patch-pom.xml,v 1.1 2018/06/09 11:36:45 fhajny Exp $
+$NetBSD: patch-pom.xml,v 1.2 2020/07/01 05:03:39 yyamano Exp $
 
+Specify java source and target version as maven option to make this build with JDK 11.
 Remove pre-built binaries for other platforms.
 
 --- pom.xml.orig       2014-07-04 05:20:00.000000000 +0000
 +++ pom.xml
-@@ -182,13 +182,6 @@
+@@ -102,10 +102,6 @@
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-compiler-plugin</artifactId>
+                 <version>2.0.2</version>
+-                <configuration>
+-                    <source>1.5</source>
+-                    <target>1.5</target>
+-                </configuration>
+             </plugin>
+ 
+             <plugin>
+@@ -182,13 +178,6 @@
                          <Import-Package>org.osgi.framework;version="[1.5,2)"</Import-Package>
                          <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
                          <Bundle-NativeCode>