Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 1 Sep 2015 16:34:27 +0000 (UTC)
From:      Dmitry Sivachenko <demon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r395781 - head/devel/oozie
Message-ID:  <201509011634.t81GYRin090707@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: demon
Date: Tue Sep  1 16:34:26 2015
New Revision: 395781
URL: https://svnweb.freebsd.org/changeset/ports/395781

Log:
  Update to version 4.2.0.

Modified:
  head/devel/oozie/Makefile
  head/devel/oozie/distinfo
  head/devel/oozie/pkg-plist

Modified: head/devel/oozie/Makefile
==============================================================================
--- head/devel/oozie/Makefile	Tue Sep  1 16:34:04 2015	(r395780)
+++ head/devel/oozie/Makefile	Tue Sep  1 16:34:26 2015	(r395781)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	oozie
-PORTVERSION=	4.1.0
-PORTREVISION=	1
+PORTVERSION=	4.2.0
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION} \
 		LOCAL/demon/:maven \
@@ -28,7 +27,7 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bas
 USES=		shebangfix
 USE_JAVA=	yes
 JAVA_VERSION=	1.7+
-TOMCAT_VERSION=	6.0.41
+TOMCAT_VERSION=	6.0.43
 HADOOP_VERSION=	2.7.1		# Matches devel/hadoop2
 SHEBANG_FILES=	client/src/main/bin/oozie distro/src/main/bin/addtowar.sh distro/src/main/bin/oozied.sh distro/src/main/bin/oozie-setup.sh distro/src/main/bin/oozie-sys.sh tools/src/main/bin/ooziedb.sh core/src/main/conf/oozie-env.sh
 
@@ -43,6 +42,7 @@ SUB_FILES=	pkg-message
 PLIST_SUB=	OOZIE_USER=${OOZIE_USER} \
 		OOZIE_RUNDIR=${OOZIE_RUNDIR} \
 		OOZIE_LOGDIR=${OOZIE_LOGDIR} \
+		OOZIE_VERSION=${PORTVERSION} \
 		HADOOP_VERSION=${HADOOP_VERSION}
 SUB_LIST=	OOZIE_USER=${OOZIE_USER} \
 		OOZIE_RUNDIR=${OOZIE_RUNDIR}
@@ -50,21 +50,16 @@ SUB_LIST=	OOZIE_USER=${OOZIE_USER} \
 do-build:
 	${MKDIR} ${WRKSRC}/distro/downloads
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/apache-tomcat-${TOMCAT_VERSION}.tar.gz ${WRKSRC}/distro/downloads/tomcat-${TOMCAT_VERSION}.tar.gz
-	${REINPLACE_CMD} -e s#hadoop-conf#${LOCALBASE}/etc/hadoop# ${WRKSRC}/core/src/main/conf/oozie-site.xml
 	${REINPLACE_CMD} -e s#%%OOZIE_LOGDIR%%#${OOZIE_LOGDIR}# -e s#%%OOZIE_RUNDIR%%#${OOZIE_RUNDIR}# ${WRKSRC}/core/src/main/conf/oozie-env.sh
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/share/java/maven3/bin/mvn -Dmaven.repo.local=${WRKDIR}/m2 --offline clean package -DskipTests -Phadoop-2 -Dassembly.ignorePermissions assembly:single
-
-post-build:
-	${RM} ${WRKSRC}/distro/target/oozie-${PORTVERSION}-distro/oozie-${PORTVERSION}/lib/hadoop-auth-2.3.0.jar
-	${INSTALL_DATA} ${PREFIX}/share/hadoop/common/lib/hadoop-auth-${HADOOP_VERSION}.jar ${WRKSRC}//distro/target/oozie-${PORTVERSION}-distro/oozie-${PORTVERSION}/lib/
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/share/java/maven3/bin/mvn -Dmaven.repo.local=${WRKDIR}/m2 --offline clean package -DskipTests -Phadoop-2 -Dhadoop.version=${HADOOP_VERSION} -Dassembly.ignorePermissions assembly:single
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/oozie ${STAGEDIR}${PREFIX}/oozie/libext ${STAGEDIR}${PREFIX}/oozie/bin ${STAGEDIR}${PREFIX}/oozie/conf ${STAGEDIR}${PREFIX}/oozie/conf/action-conf
 	cd ${WRKSRC}/distro/target/oozie-${PORTVERSION}-distro/oozie-${PORTVERSION}/bin && ${INSTALL_SCRIPT} addtowar.sh oozie oozie-setup.sh oozie-sys.sh oozied.sh ooziedb.sh ${STAGEDIR}${PREFIX}/oozie/bin/
-	cd ${WRKSRC}/distro/target/oozie-${PORTVERSION}-distro/oozie-${PORTVERSION}/conf && ${INSTALL_DATA} oozie-default.xml oozie-env.sh oozie-log4j.properties ${STAGEDIR}${PREFIX}/oozie/conf/
+	cd ${WRKSRC}/distro/target/oozie-${PORTVERSION}-distro/oozie-${PORTVERSION}/conf && ${INSTALL_DATA} oozie-default.xml.reference oozie-env.sh oozie-log4j.properties ${STAGEDIR}${PREFIX}/oozie/conf/
 	${INSTALL_DATA} ${WRKSRC}/distro/target/oozie-${PORTVERSION}-distro/oozie-${PORTVERSION}/conf/action-conf/hive.xml ${STAGEDIR}${PREFIX}/oozie/conf/action-conf/
 	${INSTALL_DATA} ${WRKSRC}/distro/target/oozie-${PORTVERSION}-distro/oozie-${PORTVERSION}/conf/oozie-site.xml ${STAGEDIR}${PREFIX}/oozie/conf/oozie-site.xml.sample
-	cd ${WRKSRC}/distro/target/oozie-${PORTVERSION}-distro/oozie-${PORTVERSION} && ${COPYTREE_SHARE} "lib libtools oozie-client-${PORTVERSION}.tar.gz oozie-core oozie-examples.tar.gz oozie-server oozie-sharelib-${PORTVERSION}.tar.gz oozie.war" ${STAGEDIR}${PREFIX}/oozie/
+	cd ${WRKSRC}/distro/target/oozie-${PORTVERSION}-distro/oozie-${PORTVERSION} && ${COPYTREE_SHARE} "libtools oozie-client-${PORTVERSION}.tar.gz oozie-core oozie-examples.tar.gz oozie-server oozie-sharelib-${PORTVERSION}.tar.gz oozie.war" ${STAGEDIR}${PREFIX}/oozie/
 	${CHMOD} 755 ${STAGEDIR}${PREFIX}/oozie/oozie-server/bin/catalina.sh ${STAGEDIR}${PREFIX}/oozie/oozie-server/bin/setclasspath.sh
 	${FIND} ${STAGEDIR}${PREFIX}/oozie/oozie-server/conf -name '*.xml' -or -name '*.properties' | ${XARGS} ${CHMOD} 644
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/ext-2.2.zip ${STAGEDIR}${PREFIX}/oozie/libext/

Modified: head/devel/oozie/distinfo
==============================================================================
--- head/devel/oozie/distinfo	Tue Sep  1 16:34:04 2015	(r395780)
+++ head/devel/oozie/distinfo	Tue Sep  1 16:34:26 2015	(r395781)
@@ -1,9 +1,9 @@
-SHA256 (hadoop/oozie-4.1.0.tar.gz) = dbbb047fa1674d842d4913510b6148822d0e933cf4bca1756887e917531dd62a
-SIZE (hadoop/oozie-4.1.0.tar.gz) = 1822296
-SHA256 (hadoop/FreeBSD-oozie-4.1.0-maven-repository.tar.gz) = 9b5ca64be011f2ff939cdc75c7be050897ab67259c7fa53abb18b0be65871018
-SIZE (hadoop/FreeBSD-oozie-4.1.0-maven-repository.tar.gz) = 195443668
-SHA256 (hadoop/apache-tomcat-6.0.41.tar.gz) = 2eb2812b42f3559690542fcb9ea0c1f43dd0b0b7dca19787640c2b7755b0f953
-SIZE (hadoop/apache-tomcat-6.0.41.tar.gz) = 7176167
+SHA256 (hadoop/oozie-4.2.0.tar.gz) = fb67da2af5ada4439de4b4745e9af26e5d9966525fd027701f1926994e718293
+SIZE (hadoop/oozie-4.2.0.tar.gz) = 1912402
+SHA256 (hadoop/FreeBSD-oozie-4.2.0-maven-repository.tar.gz) = ce44fc60fb8ba4d049f20e1221d6d388ff0517d84321c3baabd195430a1bbc06
+SIZE (hadoop/FreeBSD-oozie-4.2.0-maven-repository.tar.gz) = 218633705
+SHA256 (hadoop/apache-tomcat-6.0.43.tar.gz) = 8952239e20856714fd3ae0ae88aa57e69f50c196091c39ec033906109f67b068
+SIZE (hadoop/apache-tomcat-6.0.43.tar.gz) = 7185524
 SHA256 (hadoop/ext-2.2.zip) = c463e298c7cc6fe3c5c863424a688b53a452bfe8f136bf20002e15b2bd201369
 SIZE (hadoop/ext-2.2.zip) = 6800612
 SHA256 (hadoop/hadoop-client-2.7.1.jar) = 7eef4e1162da1129bfdf59dd390bcb90c33332db4aeaeec37efc701413361051

Modified: head/devel/oozie/pkg-plist
==============================================================================
--- head/devel/oozie/pkg-plist	Tue Sep  1 16:34:04 2015	(r395780)
+++ head/devel/oozie/pkg-plist	Tue Sep  1 16:34:26 2015	(r395781)
@@ -5,30 +5,10 @@ oozie/bin/oozie-sys.sh
 oozie/bin/oozied.sh
 oozie/bin/ooziedb.sh
 oozie/conf/action-conf/hive.xml
-oozie/conf/oozie-default.xml
+oozie/conf/oozie-default.xml.reference
 oozie/conf/oozie-env.sh
 oozie/conf/oozie-log4j.properties
 oozie/conf/oozie-site.xml.sample
-oozie/lib/activemq-client-5.8.0.jar
-oozie/lib/commons-cli-1.2.jar
-oozie/lib/commons-codec-1.4.jar
-oozie/lib/commons-logging-1.1.jar
-oozie/lib/geronimo-j2ee-management_1.1_spec-1.0.1.jar
-oozie/lib/geronimo-jms_1.1_spec-1.1.1.jar
-oozie/lib/guava-11.0.2.jar
-oozie/lib/hadoop-auth-%%HADOOP_VERSION%%.jar
-oozie/lib/hawtbuf-1.9.jar
-oozie/lib/httpclient-4.2.5.jar
-oozie/lib/httpcore-4.2.4.jar
-oozie/lib/jackson-core-asl-1.8.8.jar
-oozie/lib/jackson-mapper-asl-1.8.8.jar
-oozie/lib/json-simple-1.1.jar
-oozie/lib/jsr305-1.3.9.jar
-oozie/lib/oozie-client-4.1.0.jar
-oozie/lib/slf4j-api-1.6.6.jar
-oozie/lib/slf4j-simple-1.6.6.jar
-oozie/lib/xercesImpl-2.10.0.jar
-oozie/lib/xml-apis-1.4.01.jar
 oozie/libext/activation-1.1.jar
 oozie/libext/avro-1.7.4.jar
 oozie/libext/commons-beanutils-1.7.0.jar
@@ -80,74 +60,10 @@ oozie/libext/stax-api-1.0-2.jar
 oozie/libext/xmlenc-0.52.jar
 oozie/libext/xz-1.0.jar
 oozie/libext/zookeeper-3.4.6.jar
-oozie/libtools/JavaEWAH-0.7.9.jar
-oozie/libtools/activemq-client-5.8.0.jar
-oozie/libtools/apache-log4j-extras-1.1.jar
-oozie/libtools/asm-3.2.jar
-oozie/libtools/c3p0-0.9.1.1.jar
-oozie/libtools/collections-generic-4.01.jar
-oozie/libtools/commons-cli-1.2.jar
-oozie/libtools/commons-collections-3.2.1.jar
-oozie/libtools/commons-dbcp-1.4.jar
-oozie/libtools/commons-lang-2.4.jar
-oozie/libtools/commons-logging-1.1.jar
-oozie/libtools/commons-pool-1.5.4.jar
-oozie/libtools/curator-client-2.5.0.jar
-oozie/libtools/curator-framework-2.5.0.jar
-oozie/libtools/curator-recipes-2.5.0.jar
-oozie/libtools/curator-x-discovery-2.5.0.jar
-oozie/libtools/derby-10.10.1.1.jar
-oozie/libtools/ehcache-core-2.6.3.jar
-oozie/libtools/geronimo-j2ee-management_1.1_spec-1.0.1.jar
-oozie/libtools/geronimo-jms_1.1_spec-1.1.1.jar
-oozie/libtools/geronimo-jpa_2.0_spec-1.1.jar
-oozie/libtools/geronimo-jta_1.1_spec-1.1.1.jar
-oozie/libtools/guava-11.0.2.jar
-oozie/libtools/hawtbuf-1.9.jar
-oozie/libtools/hsqldb-1.8.0.10.jar
-oozie/libtools/jackson-annotations-2.2.2.jar
-oozie/libtools/jackson-core-2.2.2.jar
-oozie/libtools/jackson-core-asl-1.8.8.jar
-oozie/libtools/jackson-databind-2.2.2.jar
-oozie/libtools/jackson-mapper-asl-1.8.8.jar
-oozie/libtools/jdom-1.1.jar
-oozie/libtools/jline-0.9.94.jar
-oozie/libtools/jsch-0.1.50.jar
-oozie/libtools/json-simple-1.1.jar
-oozie/libtools/jsr305-1.3.9.jar
-oozie/libtools/jung-algorithms-2.0.1.jar
-oozie/libtools/jung-api-2.0.1.jar
-oozie/libtools/jung-graph-impl-2.0.1.jar
-oozie/libtools/jung-visualization-2.0.1.jar
-oozie/libtools/log4j-1.2.16.jar
-oozie/libtools/metrics-core-3.0.2.jar
-oozie/libtools/metrics-json-3.0.2.jar
-oozie/libtools/metrics-jvm-3.0.2.jar
-oozie/libtools/netty-3.7.0.Final.jar
-oozie/libtools/oozie-client-4.1.0.jar
-oozie/libtools/oozie-core-4.1.0.jar
-oozie/libtools/oozie-hadoop-utils-2.3.0.oozie-4.1.0.jar
-oozie/libtools/oozie-sharelib-hcatalog-4.1.0.jar
-oozie/libtools/oozie-sharelib-oozie-4.1.0.jar
-oozie/libtools/oozie-tools-4.1.0.jar
-oozie/libtools/openjpa-jdbc-2.2.2.jar
-oozie/libtools/openjpa-kernel-2.2.2.jar
-oozie/libtools/openjpa-lib-2.2.2.jar
-oozie/libtools/openjpa-persistence-2.2.2.jar
-oozie/libtools/openjpa-persistence-jdbc-2.2.2.jar
-oozie/libtools/org.eclipse.jgit-3.3.1.201403241930-r.jar
-oozie/libtools/postgresql-9.0-801.jdbc4.jar
-oozie/libtools/quartz-2.1.7.jar
-oozie/libtools/serp-1.14.1.jar
-oozie/libtools/slf4j-api-1.6.6.jar
-oozie/libtools/slf4j-log4j12-1.6.6.jar
-oozie/libtools/slf4j-simple-1.6.6.jar
-oozie/libtools/xercesImpl-2.10.0.jar
-oozie/libtools/xml-apis-1.4.01.jar
-oozie/libtools/zookeeper-3.4.6.jar
-oozie/oozie-client-4.1.0.tar.gz
-oozie/oozie-core/oozie-core-4.1.0-tests.jar
-oozie/oozie-core/oozie-core-4.1.0.jar
+oozie/libtools/oozie-tools-%%OOZIE_VERSION%%.jar
+oozie/oozie-client-%%OOZIE_VERSION%%.tar.gz
+oozie/oozie-core/oozie-core-%%OOZIE_VERSION%%-tests.jar
+oozie/oozie-core/oozie-core-%%OOZIE_VERSION%%.jar
 oozie/oozie-examples.tar.gz
 oozie/oozie-server/LICENSE
 oozie/oozie-server/NOTICE
@@ -206,7 +122,7 @@ oozie/oozie-server/webapps/ROOT/WEB-INF/
 oozie/oozie-server/webapps/ROOT/favicon.ico
 oozie/oozie-server/webapps/ROOT/index.html
 oozie/oozie-server/webapps/oozie.war
-oozie/oozie-sharelib-4.1.0.tar.gz
+oozie/oozie-sharelib-%%OOZIE_VERSION%%.tar.gz
 oozie/oozie.war
 @dir(oozie,oozie,0755) %%OOZIE_RUNDIR%%
 @dir(oozie,oozie,0755) %%OOZIE_LOGDIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509011634.t81GYRin090707>