- Update to 7.0 RC1

  Release notes: http://netbeans.org/community/releases/70/relnotes.html

3 files changed, 63 insertions, 64 deletions

diff --git a/java/netbeans-devel/Makefile b/java/netbeans-devel/Makefile
index 1ba8ee908916..de704cf19983 100644
--- a/java/netbeans-devel/Makefile
+++ b/java/netbeans-devel/Makefile
@@ -5,11 +5,11 @@
 # $FreeBSD$
 
 PORTNAME=	netbeans
-DISTVERSION=	7.0beta2
+DISTVERSION=	7.0rc1
 CATEGORIES=	java devel
-MASTER_SITES=	http://dlc.sun.com.edgesuite.net/netbeans/7.0/beta2/zip/
+MASTER_SITES=	http://dlc.sun.com.edgesuite.net/netbeans/7.0/rc1/zip/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	netbeans-${DISTVERSION}-201102140001-ml
+DISTNAME=	netbeans-${DISTVERSION}-201103280000-ml
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A full-featured integrated environment for Java
@@ -22,6 +22,8 @@ NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/netbeans
 PREFIXDIR=	${PREFIX}/netbeans70
 
+PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+
 #IGNORE=		No development version available right now. Please use java/netbeans instead.
 
 do-patch:
@@ -32,6 +34,6 @@ do-install:
 	@${MKDIR} ${PREFIXDIR}
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${PREFIXDIR})
 	@${CHMOD} ${BINMODE} ${PREFIXDIR}/bin/netbeans
-	@${LN} -sf ${PREFIXDIR}/bin/netbeans ${PREFIX}/bin/netbeans70
+	@${LN} -sf ${PREFIXDIR}/bin/netbeans ${PREFIX}/bin/netbeans-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/java/netbeans-devel/distinfo b/java/netbeans-devel/distinfo
index 6c8bd4e31c13..a3b829e08654 100644
--- a/java/netbeans-devel/distinfo
+++ b/java/netbeans-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (netbeans-7.0beta2-201102140001-ml.zip) = 6b13a8513babbc5e3b9db4227f6f5bdda63a18c28b3d242b831d70d56add3ac6
-SIZE (netbeans-7.0beta2-201102140001-ml.zip) = 254339301
+SHA256 (netbeans-7.0rc1-201103280000-ml.zip) = f2db8ff5f71f53b1f221412f110cad4bada9565ffa13fd62cb45c52ed3cabdc7
+SIZE (netbeans-7.0rc1-201103280000-ml.zip) = 254001812
diff --git a/java/netbeans-devel/pkg-plist b/java/netbeans-devel/pkg-plist
index 73f3e583c480..586ddcde37a3 100644
--- a/java/netbeans-devel/pkg-plist
+++ b/java/netbeans-devel/pkg-plist
@@ -1,9 +1,10 @@
-bin/netbeans70
+bin/netbeans-%%PORTVERSION%%
 netbeans70/CREDITS.html
 netbeans70/DISTRIBUTION.txt
 netbeans70/LEGALNOTICE.txt
 netbeans70/LICENSE.txt
 netbeans70/README.html
+netbeans70/THIRDPARTYLICENSE-generated.txt
 netbeans70/THIRDPARTYLICENSE.txt
 netbeans70/apisupport/.lastModified
 netbeans70/apisupport/VERSION.txt
@@ -90,21 +91,27 @@ netbeans70/bin/netbeans.exe
 netbeans70/cnd/.lastModified
 netbeans70/cnd/VERSION.txt
 netbeans70/cnd/bin/GdbKillProc.exe
+netbeans70/cnd/bin/Linux-x86/libBuildTrace.so
 netbeans70/cnd/bin/Linux-x86/rfs_controller
 netbeans70/cnd/bin/Linux-x86/rfs_preload.so
 netbeans70/cnd/bin/Linux-x86/rfs_test_env
+netbeans70/cnd/bin/Linux-x86_64/libBuildTrace.so
 netbeans70/cnd/bin/Linux-x86_64/rfs_controller
 netbeans70/cnd/bin/Linux-x86_64/rfs_preload.so
 netbeans70/cnd/bin/Linux-x86_64/rfs_test_env
+netbeans70/cnd/bin/SunOS-sparc/libBuildTrace.so
 netbeans70/cnd/bin/SunOS-sparc/rfs_controller
 netbeans70/cnd/bin/SunOS-sparc/rfs_preload.so
 netbeans70/cnd/bin/SunOS-sparc/rfs_test_env
+netbeans70/cnd/bin/SunOS-sparc_64/libBuildTrace.so
 netbeans70/cnd/bin/SunOS-sparc_64/rfs_controller
 netbeans70/cnd/bin/SunOS-sparc_64/rfs_preload.so
 netbeans70/cnd/bin/SunOS-sparc_64/rfs_test_env
+netbeans70/cnd/bin/SunOS-x86/libBuildTrace.so
 netbeans70/cnd/bin/SunOS-x86/rfs_controller
 netbeans70/cnd/bin/SunOS-x86/rfs_preload.so
 netbeans70/cnd/bin/SunOS-x86/rfs_test_env
+netbeans70/cnd/bin/SunOS-x86_64/libBuildTrace.so
 netbeans70/cnd/bin/SunOS-x86_64/rfs_controller
 netbeans70/cnd/bin/SunOS-x86_64/rfs_preload.so
 netbeans70/cnd/bin/SunOS-x86_64/rfs_test_env
@@ -460,6 +467,7 @@ netbeans70/dlight/config/Modules/org-netbeans-modules-dlight-msa-support.xml
 netbeans70/dlight/config/Modules/org-netbeans-modules-dlight-msa.xml
 netbeans70/dlight/config/Modules/org-netbeans-modules-dlight-perfan.xml
 netbeans70/dlight/config/Modules/org-netbeans-modules-dlight-procfs.xml
+netbeans70/dlight/config/Modules/org-netbeans-modules-dlight-remote-impl.xml
 netbeans70/dlight/config/Modules/org-netbeans-modules-dlight-remote.xml
 netbeans70/dlight/config/Modules/org-netbeans-modules-dlight-spi.xml
 netbeans70/dlight/config/Modules/org-netbeans-modules-dlight-sync.xml
@@ -524,6 +532,10 @@ netbeans70/dlight/modules/locale/org-netbeans-modules-dlight-kit_ja.jar
 netbeans70/dlight/modules/locale/org-netbeans-modules-dlight-kit_pt_BR.jar
 netbeans70/dlight/modules/locale/org-netbeans-modules-dlight-kit_ru.jar
 netbeans70/dlight/modules/locale/org-netbeans-modules-dlight-kit_zh_CN.jar
+netbeans70/dlight/modules/locale/org-netbeans-modules-dlight-libs-common_ja.jar
+netbeans70/dlight/modules/locale/org-netbeans-modules-dlight-libs-common_pt_BR.jar
+netbeans70/dlight/modules/locale/org-netbeans-modules-dlight-libs-common_ru.jar
+netbeans70/dlight/modules/locale/org-netbeans-modules-dlight-libs-common_zh_CN.jar
 netbeans70/dlight/modules/locale/org-netbeans-modules-dlight-libs-h2_ja.jar
 netbeans70/dlight/modules/locale/org-netbeans-modules-dlight-libs-h2_pt_BR.jar
 netbeans70/dlight/modules/locale/org-netbeans-modules-dlight-libs-h2_ru.jar
@@ -556,6 +568,10 @@ netbeans70/dlight/modules/locale/org-netbeans-modules-dlight-procfs_ja.jar
 netbeans70/dlight/modules/locale/org-netbeans-modules-dlight-procfs_pt_BR.jar
 netbeans70/dlight/modules/locale/org-netbeans-modules-dlight-procfs_ru.jar
 netbeans70/dlight/modules/locale/org-netbeans-modules-dlight-procfs_zh_CN.jar
+netbeans70/dlight/modules/locale/org-netbeans-modules-dlight-remote-impl_ja.jar
+netbeans70/dlight/modules/locale/org-netbeans-modules-dlight-remote-impl_pt_BR.jar
+netbeans70/dlight/modules/locale/org-netbeans-modules-dlight-remote-impl_ru.jar
+netbeans70/dlight/modules/locale/org-netbeans-modules-dlight-remote-impl_zh_CN.jar
 netbeans70/dlight/modules/locale/org-netbeans-modules-dlight-remote_ja.jar
 netbeans70/dlight/modules/locale/org-netbeans-modules-dlight-remote_pt_BR.jar
 netbeans70/dlight/modules/locale/org-netbeans-modules-dlight-remote_ru.jar
@@ -617,6 +633,7 @@ netbeans70/dlight/modules/org-netbeans-modules-dlight-msa-support.jar
 netbeans70/dlight/modules/org-netbeans-modules-dlight-msa.jar
 netbeans70/dlight/modules/org-netbeans-modules-dlight-perfan.jar
 netbeans70/dlight/modules/org-netbeans-modules-dlight-procfs.jar
+netbeans70/dlight/modules/org-netbeans-modules-dlight-remote-impl.jar
 netbeans70/dlight/modules/org-netbeans-modules-dlight-remote.jar
 netbeans70/dlight/modules/org-netbeans-modules-dlight-spi.jar
 netbeans70/dlight/modules/org-netbeans-modules-dlight-sync.jar
@@ -654,6 +671,7 @@ netbeans70/dlight/update_tracking/org-netbeans-modules-dlight-msa-support.xml
 netbeans70/dlight/update_tracking/org-netbeans-modules-dlight-msa.xml
 netbeans70/dlight/update_tracking/org-netbeans-modules-dlight-perfan.xml
 netbeans70/dlight/update_tracking/org-netbeans-modules-dlight-procfs.xml
+netbeans70/dlight/update_tracking/org-netbeans-modules-dlight-remote-impl.xml
 netbeans70/dlight/update_tracking/org-netbeans-modules-dlight-remote.xml
 netbeans70/dlight/update_tracking/org-netbeans-modules-dlight-spi.xml
 netbeans70/dlight/update_tracking/org-netbeans-modules-dlight-sync.xml
@@ -839,7 +857,7 @@ netbeans70/enterprise/modules/ext/metro/webservices-extra.jar
 netbeans70/enterprise/modules/ext/metro/webservices-rt.jar
 netbeans70/enterprise/modules/ext/metro/webservices-tools.jar
 netbeans70/enterprise/modules/ext/org-netbeans-modules-web-httpmonitor.jar
-netbeans70/enterprise/modules/ext/primefaces/primefaces-2.1.jar
+netbeans70/enterprise/modules/ext/primefaces/primefaces-2.2.1.jar
 netbeans70/enterprise/modules/ext/rest/asm-3.1.jar
 netbeans70/enterprise/modules/ext/rest/jackson-core-asl-1.1.1.jar
 netbeans70/enterprise/modules/ext/rest/jersey-client-1.3.jar
@@ -1136,6 +1154,10 @@ netbeans70/enterprise/modules/locale/org-netbeans-modules-web-jsf_ja.jar
 netbeans70/enterprise/modules/locale/org-netbeans-modules-web-jsf_pt_BR.jar
 netbeans70/enterprise/modules/locale/org-netbeans-modules-web-jsf_ru.jar
 netbeans70/enterprise/modules/locale/org-netbeans-modules-web-jsf_zh_CN.jar
+netbeans70/enterprise/modules/locale/org-netbeans-modules-web-jsfapi_ja.jar
+netbeans70/enterprise/modules/locale/org-netbeans-modules-web-jsfapi_pt_BR.jar
+netbeans70/enterprise/modules/locale/org-netbeans-modules-web-jsfapi_ru.jar
+netbeans70/enterprise/modules/locale/org-netbeans-modules-web-jsfapi_zh_CN.jar
 netbeans70/enterprise/modules/locale/org-netbeans-modules-web-jspparser_ja.jar
 netbeans70/enterprise/modules/locale/org-netbeans-modules-web-jspparser_pt_BR.jar
 netbeans70/enterprise/modules/locale/org-netbeans-modules-web-jspparser_ru.jar
@@ -1470,7 +1492,6 @@ netbeans70/enterprise/update_tracking/org-netbeans-modules-websvc-wsstack-jaxws.
 netbeans70/enterprise/update_tracking/org-netbeans-modules-websvc-wsstackapi.xml
 netbeans70/ergonomics/.lastModified
 netbeans70/ergonomics/config/Modules/org-apache-tools-ant-module.xml
-netbeans70/ergonomics/config/Modules/org-jruby-distro.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-api-mobility.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-libs-aguiswinglayout.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-libs-ppawtlayout.xml
@@ -1654,33 +1675,10 @@ netbeans70/ergonomics/config/Modules/org-netbeans-modules-php-zend.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-modules-profiler.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-modules-projectimport-eclipse-core.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-modules-refactoring-java.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-ruby-help.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-ruby-samples-depot.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-modules-spring-beans.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-modules-spring-webmvc.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-modules-swingapp.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-modules-tomcat5.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-visualweb-api-designer.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-visualweb-api-j2ee.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-visualweb-api-portlet-dd.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-visualweb-complib-api.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-visualweb-dataprovider-designtime.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-visualweb-designer-cssengine.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-visualweb-designer-markup.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-visualweb-designtime-idebridge.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-visualweb-designtime.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-visualweb-designtimeext.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-visualweb-errorhandler-client.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-visualweb-extension-openide-loaders.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-visualweb-palette.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-visualweb-propertyeditors-api.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-visualweb-propertyeditors-resolver.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-visualweb-ravehelp-rave_nbpack.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-visualweb-runtime-kit.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-visualweb-samples-bundled.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-visualweb-web-ui-appbase.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-visualweb-webui-jsf-defaulttheme.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-visualweb-webui-themes.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-modules-vmd-analyzer.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-modules-vmd-codegen.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-modules-vmd-components-midp-pda.xml
@@ -1703,10 +1701,6 @@ netbeans70/ergonomics/config/Modules/org-netbeans-modules-vmd-properties.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-modules-vmd-screen.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-modules-vmd-structure.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-modules-web-beans.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-web-client-tools-common.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-web-client-tools-firefox-extension.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-web-client-tools-firefox.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-web-client-tools-internetexplorer.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-modules-web-core-syntax.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-modules-web-core.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-modules-web-debug.xml
@@ -1767,15 +1761,8 @@ netbeans70/ergonomics/config/Modules/org-netbeans-modules-websvc-websvcapi.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-modules-websvc-wsitconf.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-modules-websvc-wsstack-jaxws.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-modules-websvc-wsstackapi.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-xml-catalogsupport.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-modules-xml-jaxb.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-xml-misc.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-xml-search.xml
 netbeans70/ergonomics/config/Modules/org-netbeans-modules-xml-tools-java.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-xml-wsdl-bindingsupport-api.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-xml-wsdl-bindingsupport.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-xml-wsdl-extensions.xml
-netbeans70/ergonomics/config/Modules/org-netbeans-modules-xml-xam-ui.xml
 netbeans70/ergonomics/modules/locale/org-netbeans-modules-ide-ergonomics_ja.jar
 netbeans70/ergonomics/modules/locale/org-netbeans-modules-ide-ergonomics_pt_BR.jar
 netbeans70/ergonomics/modules/locale/org-netbeans-modules-ide-ergonomics_ru.jar
@@ -2427,6 +2414,10 @@ netbeans70/ide/modules/locale/org-netbeans-libs-svnClientAdapter-javahl_ja.jar
 netbeans70/ide/modules/locale/org-netbeans-libs-svnClientAdapter-javahl_pt_BR.jar
 netbeans70/ide/modules/locale/org-netbeans-libs-svnClientAdapter-javahl_ru.jar
 netbeans70/ide/modules/locale/org-netbeans-libs-svnClientAdapter-javahl_zh_CN.jar
+netbeans70/ide/modules/locale/org-netbeans-libs-svnClientAdapter-svnkit_ja.jar
+netbeans70/ide/modules/locale/org-netbeans-libs-svnClientAdapter-svnkit_pt_BR.jar
+netbeans70/ide/modules/locale/org-netbeans-libs-svnClientAdapter-svnkit_ru.jar
+netbeans70/ide/modules/locale/org-netbeans-libs-svnClientAdapter-svnkit_zh_CN.jar
 netbeans70/ide/modules/locale/org-netbeans-libs-svnClientAdapter_ja.jar
 netbeans70/ide/modules/locale/org-netbeans-libs-svnClientAdapter_pt_BR.jar
 netbeans70/ide/modules/locale/org-netbeans-libs-svnClientAdapter_ru.jar
@@ -3568,32 +3559,33 @@ netbeans70/java/maven/bin/mvnDebug.bat
 netbeans70/java/maven/bin/mvnyjp
 netbeans70/java/maven/boot/plexus-classworlds-2.4.jar
 netbeans70/java/maven/conf/settings.xml
-netbeans70/java/maven/lib/aether-api-1.9.jar
-netbeans70/java/maven/lib/aether-connector-wagon-1.9.jar
-netbeans70/java/maven/lib/aether-impl-1.9.jar
-netbeans70/java/maven/lib/aether-spi-1.9.jar
-netbeans70/java/maven/lib/aether-util-1.9.jar
+netbeans70/java/maven/lib/aether-api-1.11.jar
+netbeans70/java/maven/lib/aether-connector-wagon-1.11.jar
+netbeans70/java/maven/lib/aether-impl-1.11.jar
+netbeans70/java/maven/lib/aether-spi-1.11.jar
+netbeans70/java/maven/lib/aether-util-1.11.jar
 netbeans70/java/maven/lib/commons-cli-1.2.jar
-netbeans70/java/maven/lib/maven-aether-provider-3.0.2.jar
-netbeans70/java/maven/lib/maven-artifact-3.0.2.jar
-netbeans70/java/maven/lib/maven-compat-3.0.2.jar
-netbeans70/java/maven/lib/maven-core-3.0.2.jar
-netbeans70/java/maven/lib/maven-embedder-3.0.2.jar
-netbeans70/java/maven/lib/maven-model-3.0.2.jar
-netbeans70/java/maven/lib/maven-model-builder-3.0.2.jar
-netbeans70/java/maven/lib/maven-plugin-api-3.0.2.jar
-netbeans70/java/maven/lib/maven-repository-metadata-3.0.2.jar
-netbeans70/java/maven/lib/maven-settings-3.0.2.jar
-netbeans70/java/maven/lib/maven-settings-builder-3.0.2.jar
+netbeans70/java/maven/lib/ext/README.txt
+netbeans70/java/maven/lib/maven-aether-provider-3.0.3.jar
+netbeans70/java/maven/lib/maven-artifact-3.0.3.jar
+netbeans70/java/maven/lib/maven-compat-3.0.3.jar
+netbeans70/java/maven/lib/maven-core-3.0.3.jar
+netbeans70/java/maven/lib/maven-embedder-3.0.3.jar
+netbeans70/java/maven/lib/maven-model-3.0.3.jar
+netbeans70/java/maven/lib/maven-model-builder-3.0.3.jar
+netbeans70/java/maven/lib/maven-plugin-api-3.0.3.jar
+netbeans70/java/maven/lib/maven-repository-metadata-3.0.3.jar
+netbeans70/java/maven/lib/maven-settings-3.0.3.jar
+netbeans70/java/maven/lib/maven-settings-builder-3.0.3.jar
 netbeans70/java/maven/lib/nekohtml-1.9.6.2.jar
 netbeans70/java/maven/lib/plexus-cipher-1.4.jar
 netbeans70/java/maven/lib/plexus-component-annotations-1.5.5.jar
 netbeans70/java/maven/lib/plexus-interpolation-1.14.jar
 netbeans70/java/maven/lib/plexus-sec-dispatcher-1.3.jar
-netbeans70/java/maven/lib/plexus-utils-2.0.4.jar
-netbeans70/java/maven/lib/sisu-guice-2.9.1-noaop.jar
-netbeans70/java/maven/lib/sisu-inject-bean-1.4.3.1.jar
-netbeans70/java/maven/lib/sisu-inject-plexus-1.4.3.1.jar
+netbeans70/java/maven/lib/plexus-utils-2.0.6.jar
+netbeans70/java/maven/lib/sisu-guice-2.9.4-no_aop.jar
+netbeans70/java/maven/lib/sisu-inject-bean-2.1.1.jar
+netbeans70/java/maven/lib/sisu-inject-plexus-2.1.1.jar
 netbeans70/java/maven/lib/wagon-file-1.0-beta-7.jar
 netbeans70/java/maven/lib/wagon-http-lightweight-1.0-beta-7.jar
 netbeans70/java/maven/lib/wagon-http-shared-1.0-beta-7.jar
@@ -3644,7 +3636,7 @@ netbeans70/java/modules/ext/jaxws22/streambuffer.jar
 netbeans70/java/modules/ext/jaxws22/woodstox.jar
 netbeans70/java/modules/ext/maven/fallback_pom.xml
 netbeans70/java/modules/ext/maven/indexer-artifact-4.0.0.jar
-netbeans70/java/modules/ext/maven/indexer-core-4.0.0.jar
+netbeans70/java/modules/ext/maven/indexer-core-4.0.0.MINDEXER-12+MINDEXER-13.jar
 netbeans70/java/modules/ext/maven/jdom-1.0.jar
 netbeans70/java/modules/ext/maven/maven-dependency-tree-1.2.jar
 netbeans70/java/modules/ext/maven/rootpackage/default-report.xml
@@ -5702,6 +5694,10 @@ netbeans70/php/modules/locale/org-netbeans-modules-php-kit_ja.jar
 netbeans70/php/modules/locale/org-netbeans-modules-php-kit_pt_BR.jar
 netbeans70/php/modules/locale/org-netbeans-modules-php-kit_ru.jar
 netbeans70/php/modules/locale/org-netbeans-modules-php-kit_zh_CN.jar
+netbeans70/php/modules/locale/org-netbeans-modules-php-phpdoc-documentation_ja.jar
+netbeans70/php/modules/locale/org-netbeans-modules-php-phpdoc-documentation_pt_BR.jar
+netbeans70/php/modules/locale/org-netbeans-modules-php-phpdoc-documentation_ru.jar
+netbeans70/php/modules/locale/org-netbeans-modules-php-phpdoc-documentation_zh_CN.jar
 netbeans70/php/modules/locale/org-netbeans-modules-php-phpdoc_ja.jar
 netbeans70/php/modules/locale/org-netbeans-modules-php-phpdoc_pt_BR.jar
 netbeans70/php/modules/locale/org-netbeans-modules-php-phpdoc_ru.jar
@@ -6945,6 +6941,7 @@ netbeans70/websvccommon/update_tracking/org-netbeans-modules-websvc-saas-ui.xml
 @dirrm netbeans70/java/modules/ext
 @dirrm netbeans70/java/modules/docs
 @dirrm netbeans70/java/modules
+@dirrm netbeans70/java/maven/lib/ext
 @dirrm netbeans70/java/maven/lib
 @dirrm netbeans70/java/maven/conf
 @dirrm netbeans70/java/maven/boot