View | Details | Raw Unified | Return to bug 207549 | Differences between
and this patch

Collapse All | Expand All

(-)b/databases/hbase/Makefile (-11 / +6 lines)
Lines 2-11 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	hbase
4
PORTNAME=	hbase
5
PORTVERSION=	1.1.2
5
PORTVERSION=	1.2.0
6
CATEGORIES=	databases java
6
CATEGORIES=	databases java
7
MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION} \
7
MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION} \
8
		LOCAL/demon/:maven
8
		http://kev009.com/freebsd/:maven
9
DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX} FreeBSD-hbase-${PORTVERSION}-maven-repository.tar.gz:maven
9
DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX} FreeBSD-hbase-${PORTVERSION}-maven-repository.tar.gz:maven
10
DIST_SUBDIR=	hadoop
10
DIST_SUBDIR=	hadoop
11
11
Lines 23-30 RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ Link Here
23
USES=		cpe
23
USES=		cpe
24
CPE_VENDOR=	apache
24
CPE_VENDOR=	apache
25
USE_JAVA=	yes
25
USE_JAVA=	yes
26
JAVA_VERSION=	1.7
26
JAVA_VERSION=	1.8
27
MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} MAVEN_OPTS="-XX:MaxPermSize=256m"
27
MAKE_ENV+=	JAVA_HOME=${JAVA_HOME}
28
28
29
OPTIONS_DEFINE=	DOCS
29
OPTIONS_DEFINE=	DOCS
30
30
Lines 54-71 PLIST_SUB= HBASE_USER=${HBASE_USER} \ Link Here
54
54
55
.include <bsd.port.pre.mk>
55
.include <bsd.port.pre.mk>
56
56
57
.if ${JAVA_PORT_VERSION:M1.8.*}
58
EXTRA_PATCHES=	${FILESDIR}/extra-patch-hbase-annotations-pom.xml
59
MVN_JDK18=	-DcompileSource=1.8
60
.endif
61
62
post-patch:
57
post-patch:
63
	${REINPLACE_CMD} -e "s#%%ETCDIR%%#${ETCDIR}#" ${WRKSRC}/conf/hbase-env.sh ${WRKSRC}/bin/hbase
58
	${REINPLACE_CMD} -e "s#%%ETCDIR%%#${ETCDIR}#" ${WRKSRC}/conf/hbase-env.sh ${WRKSRC}/bin/hbase
64
	${RM} ${WRKSRC}/conf/hbase-env.sh.bak ${WRKSRC}/conf/hbase-env.sh.orig
59
	${RM} ${WRKSRC}/conf/hbase-env.sh.bak ${WRKSRC}/conf/hbase-env.sh.orig
65
60
66
do-build:
61
do-build:
67
	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/share/java/maven3/bin/mvn -Dmaven.repo.local=${WRKDIR}/m2 --offline clean install -Prelease,native -DskipTests ${MVN_JDK18}
62
	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/share/java/maven3/bin/mvn -Dmaven.repo.local=${WRKDIR}/m2 --offline clean install -Prelease,native,build-with-jdk8 -DskipTests -DcompileSource=1.8
68
	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/share/java/maven3/bin/mvn -Dmaven.repo.local=${WRKDIR}/m2 --offline install -DskipTests site assembly:single -Prelease,native ${MVN_JDK18}
63
	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/share/java/maven3/bin/mvn -Dmaven.repo.local=${WRKDIR}/m2 --offline install -DskipTests site assembly:single -Prelease,native,build-with-jdk8 -DcompileSource=1.8
69
64
70
post-build:
65
post-build:
71
	cd ${WRKSRC}/hbase-assembly/target && ${TAR} xf ${PORTNAME}-${PORTVERSION}-bin.tar.gz
66
	cd ${WRKSRC}/hbase-assembly/target && ${TAR} xf ${PORTNAME}-${PORTVERSION}-bin.tar.gz
(-)b/databases/hbase/distinfo (-4 / +4 lines)
Lines 1-4 Link Here
1
SHA256 (hadoop/hbase-1.1.2-src.tar.gz) = f107753b41786bdfa255d9fb2ba0ca2a3dc57c390a615b6677c8fcee644ddfd7
1
SHA256 (hadoop/hbase-1.2.0-src.tar.gz) = 35e4169308bb1ec42f182180f48e1ecabd0066f01577e2a9c1256536620d3857
2
SIZE (hadoop/hbase-1.1.2-src.tar.gz) = 15625945
2
SIZE (hadoop/hbase-1.2.0-src.tar.gz) = 15953631
3
SHA256 (hadoop/FreeBSD-hbase-1.1.2-maven-repository.tar.gz) = 47a8560697a6716d5551a4facb4d4ad2ca814a5b86d5fdbfdd67cc17cdd25d63
3
SHA256 (hadoop/FreeBSD-hbase-1.2.0-maven-repository.tar.gz) = a8511134c3b7c39e418b0ae9296f6be5cc6aa54588051e041f510d1c6d1383a2
4
SIZE (hadoop/FreeBSD-hbase-1.1.2-maven-repository.tar.gz) = 276578582
4
SIZE (hadoop/FreeBSD-hbase-1.2.0-maven-repository.tar.gz) = 272188760
(-)a/databases/hbase/files/extra-patch-hbase-annotations-pom.xml (-11 lines)
Removed Link Here
1
--- hbase-annotations/pom.xml.orig	2015-11-19 17:45:45.996448000 +0300
2
+++ hbase-annotations/pom.xml	2015-11-19 17:45:58.778797000 +0300
3
@@ -35,7 +35,7 @@
4
     <dependency>
5
       <groupId>jdk.tools</groupId>
6
       <artifactId>jdk.tools</artifactId>
7
-      <version>1.7</version>
8
+      <version>1.8</version>
9
       <scope>system</scope>
10
       <systemPath>${java.home}/../lib/tools.jar</systemPath>
11
     </dependency>
(-)b/databases/hbase/pkg-plist (-7 / +26 lines)
Lines 47-52 hbase/hbase-webapps/static/jumping-orca_rotated_12percent.png Link Here
47
hbase/hbase-webapps/thrift/WEB-INF/web.xml
47
hbase/hbase-webapps/thrift/WEB-INF/web.xml
48
hbase/hbase-webapps/thrift/index.html
48
hbase/hbase-webapps/thrift/index.html
49
hbase/lib/activation-1.1.jar
49
hbase/lib/activation-1.1.jar
50
hbase/lib/antisamy-1.4.3.jar
50
hbase/lib/aopalliance-1.0.jar
51
hbase/lib/aopalliance-1.0.jar
51
hbase/lib/apacheds-i18n-2.0.0-M15.jar
52
hbase/lib/apacheds-i18n-2.0.0-M15.jar
52
hbase/lib/apacheds-kerberos-codec-2.0.0-M15.jar
53
hbase/lib/apacheds-kerberos-codec-2.0.0-M15.jar
Lines 54-69 hbase/lib/api-asn1-api-1.0.0-M20.jar Link Here
54
hbase/lib/api-util-1.0.0-M20.jar
55
hbase/lib/api-util-1.0.0-M20.jar
55
hbase/lib/asm-3.1.jar
56
hbase/lib/asm-3.1.jar
56
hbase/lib/avro-1.7.4.jar
57
hbase/lib/avro-1.7.4.jar
58
hbase/lib/batik-css-1.7.jar
59
hbase/lib/batik-ext-1.7.jar
60
hbase/lib/batik-util-1.7.jar
61
hbase/lib/bsh-core-2.0b4.jar
57
hbase/lib/commons-beanutils-1.7.0.jar
62
hbase/lib/commons-beanutils-1.7.0.jar
58
hbase/lib/commons-beanutils-core-1.8.0.jar
63
hbase/lib/commons-beanutils-core-1.7.0.jar
59
hbase/lib/commons-cli-1.2.jar
64
hbase/lib/commons-cli-1.2.jar
60
hbase/lib/commons-codec-1.9.jar
65
hbase/lib/commons-codec-1.9.jar
61
hbase/lib/commons-collections-3.2.1.jar
66
hbase/lib/commons-collections-3.2.2.jar
62
hbase/lib/commons-compress-1.4.1.jar
67
hbase/lib/commons-compress-1.4.1.jar
63
hbase/lib/commons-configuration-1.6.jar
68
hbase/lib/commons-configuration-1.6.jar
64
hbase/lib/commons-daemon-1.0.13.jar
69
hbase/lib/commons-daemon-1.0.13.jar
65
hbase/lib/commons-digester-1.8.jar
70
hbase/lib/commons-digester-1.8.jar
66
hbase/lib/commons-el-1.0.jar
71
hbase/lib/commons-el-1.0.jar
72
hbase/lib/commons-fileupload-1.2.jar
67
hbase/lib/commons-httpclient-3.1.jar
73
hbase/lib/commons-httpclient-3.1.jar
68
hbase/lib/commons-io-2.4.jar
74
hbase/lib/commons-io-2.4.jar
69
hbase/lib/commons-lang-2.6.jar
75
hbase/lib/commons-lang-2.6.jar
Lines 72-77 hbase/lib/commons-math-2.2.jar Link Here
72
hbase/lib/commons-math3-3.1.1.jar
78
hbase/lib/commons-math3-3.1.1.jar
73
hbase/lib/commons-net-3.1.jar
79
hbase/lib/commons-net-3.1.jar
74
hbase/lib/disruptor-3.3.0.jar
80
hbase/lib/disruptor-3.3.0.jar
81
hbase/lib/esapi-2.1.0.jar
75
hbase/lib/findbugs-annotations-1.3.9-1.jar
82
hbase/lib/findbugs-annotations-1.3.9-1.jar
76
hbase/lib/guava-12.0.1.jar
83
hbase/lib/guava-12.0.1.jar
77
hbase/lib/guice-3.0.jar
84
hbase/lib/guice-3.0.jar
Lines 82-87 hbase/lib/hbase-client-%%PORTVERSION%%.jar Link Here
82
hbase/lib/hbase-common-%%PORTVERSION%%-tests.jar
89
hbase/lib/hbase-common-%%PORTVERSION%%-tests.jar
83
hbase/lib/hbase-common-%%PORTVERSION%%.jar
90
hbase/lib/hbase-common-%%PORTVERSION%%.jar
84
hbase/lib/hbase-examples-%%PORTVERSION%%.jar
91
hbase/lib/hbase-examples-%%PORTVERSION%%.jar
92
hbase/lib/hbase-external-blockcache-%%PORTVERSION%%.jar
85
hbase/lib/hbase-hadoop-compat-%%PORTVERSION%%.jar
93
hbase/lib/hbase-hadoop-compat-%%PORTVERSION%%.jar
86
hbase/lib/hbase-hadoop2-compat-%%PORTVERSION%%.jar
94
hbase/lib/hbase-hadoop2-compat-%%PORTVERSION%%.jar
87
hbase/lib/hbase-it-%%PORTVERSION%%-tests.jar
95
hbase/lib/hbase-it-%%PORTVERSION%%-tests.jar
Lines 97-108 hbase/lib/hbase-shell-%%PORTVERSION%%.jar Link Here
97
hbase/lib/hbase-thrift-%%PORTVERSION%%.jar
105
hbase/lib/hbase-thrift-%%PORTVERSION%%.jar
98
hbase/lib/htrace-core-3.1.0-incubating.jar
106
hbase/lib/htrace-core-3.1.0-incubating.jar
99
hbase/lib/httpclient-4.2.5.jar
107
hbase/lib/httpclient-4.2.5.jar
100
hbase/lib/httpcore-4.1.3.jar
108
hbase/lib/httpcore-4.4.1.jar
101
hbase/lib/jackson-core-asl-1.9.13.jar
109
hbase/lib/jackson-core-asl-1.9.13.jar
102
hbase/lib/jackson-jaxrs-1.9.13.jar
110
hbase/lib/jackson-jaxrs-1.9.13.jar
103
hbase/lib/jackson-mapper-asl-1.9.13.jar
111
hbase/lib/jackson-mapper-asl-1.9.13.jar
104
hbase/lib/jackson-xc-1.9.13.jar
112
hbase/lib/jackson-xc-1.9.13.jar
105
hbase/lib/jamon-runtime-2.3.1.jar
113
hbase/lib/jamon-runtime-2.4.1.jar
106
hbase/lib/jasper-compiler-5.5.23.jar
114
hbase/lib/jasper-compiler-5.5.23.jar
107
hbase/lib/jasper-runtime-5.5.23.jar
115
hbase/lib/jasper-runtime-5.5.23.jar
108
hbase/lib/javax.inject-1.jar
116
hbase/lib/javax.inject-1.jar
Lines 126-138 hbase/lib/jsch-0.1.42.jar Link Here
126
hbase/lib/jsp-2.1-6.1.14.jar
134
hbase/lib/jsp-2.1-6.1.14.jar
127
hbase/lib/jsp-api-2.1-6.1.14.jar
135
hbase/lib/jsp-api-2.1-6.1.14.jar
128
hbase/lib/jsr305-1.3.9.jar
136
hbase/lib/jsr305-1.3.9.jar
129
hbase/lib/junit-4.11.jar
137
hbase/lib/junit-4.12.jar
130
hbase/lib/leveldbjni-all-1.8.jar
138
hbase/lib/leveldbjni-all-1.8.jar
131
hbase/lib/libthrift-0.9.0.jar
139
hbase/lib/libthrift-0.9.3.jar
132
hbase/lib/log4j-1.2.17.jar
140
hbase/lib/log4j-1.2.17.jar
133
hbase/lib/metrics-core-2.2.0.jar
141
hbase/lib/metrics-core-2.2.0.jar
134
hbase/lib/native/libmlockall_agent.so
142
hbase/lib/native/libmlockall_agent.so
135
hbase/lib/netty-3.2.4.Final.jar
143
hbase/lib/nekohtml-1.9.12.jar
136
hbase/lib/netty-all-4.0.23.Final.jar
144
hbase/lib/netty-all-4.0.23.Final.jar
137
hbase/lib/paranamer-2.3.jar
145
hbase/lib/paranamer-2.3.jar
138
hbase/lib/protobuf-java-2.5.0.jar
146
hbase/lib/protobuf-java-2.5.0.jar
Lines 147-152 hbase/lib/ruby/hbase/visibility_labels.rb Link Here
147
hbase/lib/ruby/irb/hirb.rb
155
hbase/lib/ruby/irb/hirb.rb
148
hbase/lib/ruby/shell.rb
156
hbase/lib/ruby/shell.rb
149
hbase/lib/ruby/shell/commands.rb
157
hbase/lib/ruby/shell/commands.rb
158
hbase/lib/ruby/shell/commands/abort_procedure.rb
150
hbase/lib/ruby/shell/commands/add_labels.rb
159
hbase/lib/ruby/shell/commands/add_labels.rb
151
hbase/lib/ruby/shell/commands/add_peer.rb
160
hbase/lib/ruby/shell/commands/add_peer.rb
152
hbase/lib/ruby/shell/commands/alter.rb
161
hbase/lib/ruby/shell/commands/alter.rb
Lines 203-214 hbase/lib/ruby/shell/commands/list_labels.rb Link Here
203
hbase/lib/ruby/shell/commands/list_namespace.rb
212
hbase/lib/ruby/shell/commands/list_namespace.rb
204
hbase/lib/ruby/shell/commands/list_namespace_tables.rb
213
hbase/lib/ruby/shell/commands/list_namespace_tables.rb
205
hbase/lib/ruby/shell/commands/list_peers.rb
214
hbase/lib/ruby/shell/commands/list_peers.rb
215
hbase/lib/ruby/shell/commands/list_procedures.rb
206
hbase/lib/ruby/shell/commands/list_quotas.rb
216
hbase/lib/ruby/shell/commands/list_quotas.rb
207
hbase/lib/ruby/shell/commands/list_replicated_tables.rb
217
hbase/lib/ruby/shell/commands/list_replicated_tables.rb
218
hbase/lib/ruby/shell/commands/list_security_capabilities.rb
208
hbase/lib/ruby/shell/commands/list_snapshots.rb
219
hbase/lib/ruby/shell/commands/list_snapshots.rb
220
hbase/lib/ruby/shell/commands/locate_region.rb
209
hbase/lib/ruby/shell/commands/major_compact.rb
221
hbase/lib/ruby/shell/commands/major_compact.rb
210
hbase/lib/ruby/shell/commands/merge_region.rb
222
hbase/lib/ruby/shell/commands/merge_region.rb
211
hbase/lib/ruby/shell/commands/move.rb
223
hbase/lib/ruby/shell/commands/move.rb
224
hbase/lib/ruby/shell/commands/normalize.rb
225
hbase/lib/ruby/shell/commands/normalizer_enabled.rb
226
hbase/lib/ruby/shell/commands/normalizer_switch.rb
212
hbase/lib/ruby/shell/commands/put.rb
227
hbase/lib/ruby/shell/commands/put.rb
213
hbase/lib/ruby/shell/commands/remove_peer.rb
228
hbase/lib/ruby/shell/commands/remove_peer.rb
214
hbase/lib/ruby/shell/commands/remove_peer_tableCFs.rb
229
hbase/lib/ruby/shell/commands/remove_peer_tableCFs.rb
Lines 243-249 hbase/lib/slf4j-api-1.7.7.jar Link Here
243
hbase/lib/slf4j-log4j12-1.7.5.jar
258
hbase/lib/slf4j-log4j12-1.7.5.jar
244
hbase/lib/snappy-java-1.0.4.1.jar
259
hbase/lib/snappy-java-1.0.4.1.jar
245
hbase/lib/spymemcached-2.11.6.jar
260
hbase/lib/spymemcached-2.11.6.jar
261
hbase/lib/xalan-2.7.0.jar
246
hbase/lib/xmlenc-0.52.jar
262
hbase/lib/xmlenc-0.52.jar
263
hbase/lib/xml-apis-1.3.03.jar
264
hbase/lib/xml-apis-ext-1.3.04.jar
265
hbase/lib/xom-1.2.5.jar
247
hbase/lib/xz-1.0.jar
266
hbase/lib/xz-1.0.jar
248
hbase/lib/zookeeper-3.4.6.jar
267
hbase/lib/zookeeper-3.4.6.jar
249
@dir(%%HBASE_USER%%,%%HBASE_GROUP%%,) %%HBASE_RUNDIR%%
268
@dir(%%HBASE_USER%%,%%HBASE_GROUP%%,) %%HBASE_RUNDIR%%

Return to bug 207549