Author: nickboldt Date: 2011-09-29 02:10:43 -0400 (Thu, 29 Sep 2011) New Revision: 35148 Modified: trunk/build/parent/pom.xml Log: JBIDE-8838 add maven-osgi-source-plugin to parent pom, and tweak formatting of file (comments, tabs, line breaks) Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2011-09-29 06:10:28 UTC (rev 35147) +++ trunk/build/parent/pom.xml 2011-09-29 06:10:43 UTC (rev 35148) @@ -12,9 +12,8 @@ </modules> <properties> - <!-- to build w/ latest 0.13.0-SNAPSHOT, run `mvn install -DtychoVersion=0.13.0-SNAPSHOT`, or uncomment this property: - <tychoVersion>0.13.0-SNAPSHOT</tychoVersion> - --> + <!-- to build w/ latest 0.13.0-SNAPSHOT, run `mvn install -DtychoVersion=0.13.0-SNAPSHOT`, + or uncomment this property: <tychoVersion>0.13.0-SNAPSHOT</tychoVersion> --> <tychoVersion>0.12.0</tychoVersion> <scmBranch>trunk</scmBranch> <JBT_VERSION>3.3.0</JBT_VERSION> @@ -39,7 +38,8 @@ <!-- 1b. or use -Plocal.site -Dlocal.site=file:///home/$user/trunk/build/target-platform/REPO/ --> <local.site>file:///home/hudson/static_build_env/jbds/target-platform_3.3.indigo/e370-wtp330.target/</local.site> - <!-- 2a. URL of latest JBT nightly staging composite site (all the components in once place) --> + <!-- 2a. URL of latest JBT nightly staging composite site (all the components + in once place) --> <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo --> <jbosstools-nightly-staging-composite>http://download.jboss.org/jbossto... @@ -53,7 +53,8 @@ <!-- 3b., or use -Plocal.requirements -Dlocal.requirements=file:///path/to/mirror/of/composite/requirements/site --> <local.requirements>file:///qa/services/http/binaries/RHDS/updates/indigo/</local.requirements> - <!-- 4. published aggregate update site goes here, for consumption by QE and downstream JBDS builds --> + <!-- 4. published aggregate update site goes here, for consumption by QE + and downstream JBDS builds --> <jbosstools-nightly>http://download.jboss.org/jbosstools/updates/nightl... <!-- 5. extra requirements (for 3rd party "Extras" site) --> @@ -195,34 +196,33 @@ <version>${tychoVersion}</version> <configuration> <encoding>UTF-8</encoding> - <!-- not strictly needed but this suppresses warnings when compiling that the default value (1.5) is being overwritten by the value in the MANIFEST.MF. You can use this in your plugins or their aggregator pom.xml files to set this for your plugins --> - <!-- <source>1.6</source> --> <!-- <target>1.6</target> --> </configuration> </plugin> - <!-- these two plugins copied in from Chris Aniszczyk's Minerva parent - pom; also need org.eclipse.tycho:tycho-compiler-plugin, above --> - <!-- TODO remove workaround when https://issues.sonatype.org/browse/TYCHO-473 - is fixed --> - <!--plugin> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-source-plugin</artifactId> + <version>${tychoVersion}</version> + </plugin> + <!-- enable source bundle generation --> + <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-source-plugin</artifactId> <version>${tychoVersion}</version> <executions> <execution> - <id>attach-source</id> - <phase>process-classes</phase> + <id>plugin-source</id> <goals> <goal>plugin-source</goal> </goals> </execution> </executions> - </plugin--> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> @@ -250,14 +250,15 @@ <profiles> - <!-- Latest JBT work-in-progress component builds (CI builds), not yet pushed to the above nightly update site --> + <!-- Latest JBT work-in-progress component builds (CI builds), not yet + pushed to the above nightly update site --> <!-- disabled by default because it causes local compilation problems --> <profile> <id>jbosstools-nightly-staging-composite</id> <activation> <property> - <name>swtbot.test.skip</name> - <value>false</value> + <name>swtbot.test.skip</name> + <value>false</value> </property> </activation> <repositories> @@ -275,7 +276,8 @@ </repositories> </profile> - <!-- same contents as jboss-requirements-composite-mirror, but locally available (to improve network lag) --> + <!-- same contents as jboss-requirements-composite-mirror, but locally + available (to improve network lag) --> <profile> <id>local.requirements</id> <activation> @@ -296,7 +298,8 @@ </repositories> </profile> - <!-- same contents as jbosstools-nightly-staging-composite, but locally available (to improve network lag) --> + <!-- same contents as jbosstools-nightly-staging-composite, but locally + available (to improve network lag) --> <profile> <id>local.composite</id> <activation> @@ -318,27 +321,32 @@ </profile> <!-- Contains all the Eclipse.org deps, mirrored onto download.jboss.org. - This is the superset of sites from which the TP is created. Should be - disabled closer to GA so we're only using the TP contents exclusively. --> - <!-- deactivated by default, because target platform should be enough to compile everything --> + This is the superset of sites from which the TP is created. Should be disabled + closer to GA so we're only using the TP contents exclusively. --> + <!-- deactivated by default, because target platform should be enough to + compile everything --> <profile> <id>jboss-requirements-composite-mirror</id> <activation> <activeByDefault>false</activeByDefault> </activation> <repositories> - <repository> - <id>jboss-requirements-composite-mirror</id> - <url>${jboss-requirements-composite-mirror}</url> - <layout>p2</layout> - <snapshots> <enabled>true</enabled> </snapshots> - <releases> <enabled>true</enabled> </releases> + <repository> + <id>jboss-requirements-composite-mirror</id> + <url>${jboss-requirements-composite-mirror}</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> </repository> </repositories> </profile> - <!-- Contains all the Third Party Extras deps. This is the superset of sites - from which the JBDS Extras site is created. --> + <!-- Contains all the Third Party Extras deps. This is the superset of + sites from which the JBDS Extras site is created. --> <profile> <id>jboss-requirements-composite-extras-mirror</id> <activation> @@ -684,7 +692,8 @@ <repositories> - <!-- Single repo containing contents of unified.target, but without using the target file --> + <!-- Single repo containing contents of unified.target, but without using + the target file --> <repository> <id>jbosstools-target-site</id> <url>${jbosstools-target-site}</url> @@ -697,22 +706,13 @@ </releases> </repository> <!-- do not needed because parent pom is not required anymore --> - <!-- repository> - <id>jboss-public-repository-group</id> - <name>JBoss Public Repository Group</name> - <url>http://repository.jboss.org/nexus/content/groups/public/</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </repository --> + <!-- repository> <id>jboss-public-repository-group</id> <name>JBoss Public + Repository Group</name> <url>http://repository.jboss.org/nexus/content/groups/public/</url> + <layout>default</layout> <releases> <enabled>true</enabled> <updatePolicy>never</updatePolicy> + </releases> <snapshots> <enabled>true</enabled> <updatePolicy>never</updatePolicy> + </snapshots> </repository --> </repositories> - + <!-- Additional m2 repos to resolve things like org.eclipse.tycho:tycho-maven-plugin:0.13.0-SNAPSHOT --> <pluginRepositories> <pluginRepository> @@ -728,19 +728,10 @@ </pluginRepositories> <!-- commented to check if it is added by default on hudson but with https:// --> - <!-- pluginRepositories> - <pluginRepository> - <id>jboss-public-repository-group</id> - <name>JBoss Public Repository Group</name> - <url>http://repository.jboss.org/nexus/content/groups/public/</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories --> + <!-- pluginRepositories> <pluginRepository> <id>jboss-public-repository-group</id> + <name>JBoss Public Repository Group</name> <url>http://repository.jboss.org/nexus/content/groups/public/</url> + <releases> <enabled>true</enabled> </releases> <snapshots> <enabled>true</enabled> + </snapshots> </pluginRepository> </pluginRepositories --> <distributionManagement> <repository>