Author: nickboldt Date: 2010-07-07 23:41:29 -0400 (Wed, 07 Jul 2010) New Revision: 23300 Added: trunk/build/util/checkPOMvsManifest.sh Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF trunk/esb/plugins/org.jboss.tools.esb.validator/pom.xml trunk/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/ trunk/maven/features/org.jboss.tools.maven.cdi.feature/feature.xml trunk/maven/features/org.jboss.tools.maven.hibernate.feature/feature.xml trunk/maven/features/org.jboss.tools.maven.jsf.feature/feature.xml trunk/maven/features/org.jboss.tools.maven.portlet.feature/feature.xml trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml Log: fix manifest/pom versions Added: trunk/build/util/checkPOMvsManifest.sh =================================================================== --- trunk/build/util/checkPOMvsManifest.sh (rev 0) +++ trunk/build/util/checkPOMvsManifest.sh 2010-07-08 03:41:29 UTC (rev 23300) @@ -0,0 +1,44 @@ +#!/bin/bash + +if [[ $1 ]] && [[ -d $1 ]]; then + basedir=$1 +else + basedir=. +fi + +files=$(find . -maxdepth 5 -type f -name MANIFEST.MF | egrep -v "target|sdk")" "$(find . -maxdepth 4 -type f -name "feature.xml" | egrep -v "target|sdk") +for f in $files; do + d=${f/META-INF\/MANIFEST.MF/}; #assume plugin + if [[ $d == $f ]]; then #else feature + d=${f/feature.xml/} + artVersionLine=$(cat $f | egrep "version=\"[0-9]\.[0-9]\.[0-9]\.qualifier" | egrep "[0-9]\.[0-9]\.[0-9]") + artVersion=${artVersionLine##*version=\"} + artVersion=${artVersion%%.qualifier*} + artVersionLine=" "$(cat $f | egrep "version=\"[0-9]\.[0-9]\.[0-9]\.qualifier" | egrep "[0-9]\.[0-9]\.[0-9]") + else + artVersionLine=$(cat $f | egrep "Bundle-Version: " | egrep "[0-9]\.[0-9]\.[0-9]") + artVersion=${artVersionLine##*: } + artVersion=${artVersion%%.qualifier} + artVersionLine=" "$artVersionLine + fi + if [[ -f $d/pom.xml ]]; then + pomVersionLine=$(cat $d/pom.xml | sed "s/\t//" | egrep ".0-SNAPSHOT" | egrep "[0-9]\.[0-9]\.[0-9]") + pomVersion=${pomVersionLine#*<version>} + pomVersion=${pomVersion%-SNAPSHOT*} + pomVersionLine=" "$pomVersionLine + + if [[ $artVersion != $pomVersion ]]; then + echo "[ERROR] $d" + echo "[ERROR] Artifact version [$artVersion] != pom version [$pomVersion]" | egrep "[0-9]\.[0-9]\.[0-9]"; + echo "[ERROR] $artVersionLine" + echo "[ERROR] $pomVersionLine" + echo "" + else + #echo "[INFO] [$artVersion] = [$pomVersion] $d " + true + fi + else + echo "[WARNING] $d contains no pom.xml" + fi +done + Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF 2010-07-08 03:28:42 UTC (rev 23299) +++ trunk/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF 2010-07-08 03:41:29 UTC (rev 23300) @@ -16,5 +16,5 @@ org.jboss.tools.esb.project.core, org.eclipse.wst.validation, org.eclipse.jdt.ui -Bundle-Version: 2.0.0 +Bundle-Version: 2.0.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/pom.xml =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.validator/pom.xml 2010-07-08 03:28:42 UTC (rev 23299) +++ trunk/esb/plugins/org.jboss.tools.esb.validator/pom.xml 2010-07-08 03:41:29 UTC (rev 23300) @@ -9,6 +9,6 @@ </parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.esb.validator</artifactId> - <version>2.0.0</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF 2010-07-08 03:28:42 UTC (rev 23299) +++ trunk/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF 2010-07-08 03:41:29 UTC (rev 23300) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Contexts and Dependency Injection Test Bundle-SymbolicName: org.jboss.tools.esb.validator.test -Bundle-Version: 1.0.0 +Bundle-Version: 1.0.0.qualifier Bundle-Vendor: JBoss by Red Hat Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.jboss.tools.esb.core, Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml 2010-07-08 03:28:42 UTC (rev 23299) +++ trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml 2010-07-08 03:41:29 UTC (rev 23300) @@ -9,6 +9,6 @@ </parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.esb.validator.test</artifactId> - <version>1.0.0</version> + <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project> Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test ___________________________________________________________________ Name: svn:ignore - bin target build d + bin target build d *test.jar Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test ___________________________________________________________________ Name: svn:ignore - bin target build d + bin target build d *test.jar Modified: trunk/maven/features/org.jboss.tools.maven.cdi.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.cdi.feature/feature.xml 2010-07-08 03:28:42 UTC (rev 23299) +++ trunk/maven/features/org.jboss.tools.maven.cdi.feature/feature.xml 2010-07-08 03:41:29 UTC (rev 23300) @@ -1,33 +1,33 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.maven.cdi.feature" - label="%featureName" - version="1.0.0.qualifier" - provider-name="%providerName" - plugin="org.jboss.tools.maven.cdi"> - - <description> - %description - </description> - - <copyright> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <requires> - <import feature="org.maven.ide.eclipse.feature" version="0.10.0" match="greaterOrEqual"/> - <import feature="org.maven.ide.eclipse.wtp.feature" version="0.10.0" match="greaterOrEqual"/> - </requires> - - <plugin - id="org.jboss.tools.maven.cdi" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.maven.cdi.feature" + label="%featureName" + version="1.0.0.qualifier" + provider-name="%providerName" + plugin="org.jboss.tools.maven.cdi"> + + <description> + %description + </description> + + <copyright> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <requires> + <import feature="org.maven.ide.eclipse.feature" version="0.10.0" match="greaterOrEqual"/> + <import feature="org.maven.ide.eclipse.wtp.feature" version="0.10.0" match="greaterOrEqual"/> + </requires> + + <plugin + id="org.jboss.tools.maven.cdi" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> Modified: trunk/maven/features/org.jboss.tools.maven.hibernate.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.hibernate.feature/feature.xml 2010-07-08 03:28:42 UTC (rev 23299) +++ trunk/maven/features/org.jboss.tools.maven.hibernate.feature/feature.xml 2010-07-08 03:41:29 UTC (rev 23300) @@ -1,33 +1,33 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.maven.hibernate.feature" - label="%featureName" - version="1.0.0.qualifier" - provider-name="%providerName" - plugin="org.jboss.tools.maven.hibernate"> - - <description> - %description - </description> - - <copyright> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <requires> - <import feature="org.maven.ide.eclipse.feature" version="0.10.0" match="greaterOrEqual"/> - <import feature="org.maven.ide.eclipse.wtp.feature" version="0.10.0" match="greaterOrEqual"/> - </requires> - - <plugin - id="org.jboss.tools.maven.hibernate" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.maven.hibernate.feature" + label="%featureName" + version="1.0.0.qualifier" + provider-name="%providerName" + plugin="org.jboss.tools.maven.hibernate"> + + <description> + %description + </description> + + <copyright> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <requires> + <import feature="org.maven.ide.eclipse.feature" version="0.10.0" match="greaterOrEqual"/> + <import feature="org.maven.ide.eclipse.wtp.feature" version="0.10.0" match="greaterOrEqual"/> + </requires> + + <plugin + id="org.jboss.tools.maven.hibernate" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> Modified: trunk/maven/features/org.jboss.tools.maven.jsf.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.jsf.feature/feature.xml 2010-07-08 03:28:42 UTC (rev 23299) +++ trunk/maven/features/org.jboss.tools.maven.jsf.feature/feature.xml 2010-07-08 03:41:29 UTC (rev 23300) @@ -1,33 +1,33 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.maven.jsf.feature" - label="%featureName" - version="1.0.0.qualifier" - provider-name="%providerName" - plugin="org.jboss.tools.maven.jsf"> - - <description> - %description - </description> - - <copyright> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <requires> - <import feature="org.maven.ide.eclipse.feature" version="0.10.0" match="greaterOrEqual"/> - <import feature="org.maven.ide.eclipse.wtp.feature" version="0.10.0" match="greaterOrEqual"/> - </requires> - - <plugin - id="org.jboss.tools.maven.jsf" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.maven.jsf.feature" + label="%featureName" + version="1.0.0.qualifier" + provider-name="%providerName" + plugin="org.jboss.tools.maven.jsf"> + + <description> + %description + </description> + + <copyright> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <requires> + <import feature="org.maven.ide.eclipse.feature" version="0.10.0" match="greaterOrEqual"/> + <import feature="org.maven.ide.eclipse.wtp.feature" version="0.10.0" match="greaterOrEqual"/> + </requires> + + <plugin + id="org.jboss.tools.maven.jsf" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> Modified: trunk/maven/features/org.jboss.tools.maven.portlet.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.portlet.feature/feature.xml 2010-07-08 03:28:42 UTC (rev 23299) +++ trunk/maven/features/org.jboss.tools.maven.portlet.feature/feature.xml 2010-07-08 03:41:29 UTC (rev 23300) @@ -1,33 +1,33 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.maven.portlet.feature" - label="%featureName" - version="1.0.0.qualifier" - provider-name="%providerName" - plugin="org.jboss.tools.maven.portlet"> - - <description> - %description - </description> - - <copyright> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <requires> - <import feature="org.maven.ide.eclipse.feature" version="0.10.0" match="greaterOrEqual"/> - <import feature="org.maven.ide.eclipse.wtp.feature" version="0.10.0" match="greaterOrEqual"/> - </requires> - - <plugin - id="org.jboss.tools.maven.portlet" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.maven.portlet.feature" + label="%featureName" + version="1.0.0.qualifier" + provider-name="%providerName" + plugin="org.jboss.tools.maven.portlet"> + + <description> + %description + </description> + + <copyright> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <requires> + <import feature="org.maven.ide.eclipse.feature" version="0.10.0" match="greaterOrEqual"/> + <import feature="org.maven.ide.eclipse.wtp.feature" version="0.10.0" match="greaterOrEqual"/> + </requires> + + <plugin + id="org.jboss.tools.maven.portlet" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF 2010-07-08 03:28:42 UTC (rev 23299) +++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF 2010-07-08 03:41:29 UTC (rev 23300) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.ws.creation.core.test -Bundle-Version: 1.0.0 +Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.jboss.tools.ws.creation.core.test.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml 2010-07-08 03:28:42 UTC (rev 23299) +++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml 2010-07-08 03:41:29 UTC (rev 23300) @@ -9,7 +9,7 @@ </parent> <groupId>org.jboss.tools.ws.tests</groupId> <artifactId>org.jboss.tools.ws.creation.core.test</artifactId> - <version>1.0.0</version> + <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties>