[savara-commits] savara SVN: r498 - trunk/tools.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Nov 22 06:39:31 EST 2010
Author: objectiser
Date: 2010-11-22 06:39:30 -0500 (Mon, 22 Nov 2010)
New Revision: 498
Removed:
trunk/tools/pomOrig.xml
Modified:
trunk/tools/pom.xml
Log:
Restore previous version of the pom, linked to jbosstools parent pom, but overriding the target-platform-configuration plugin to add the 'consider pom dependencies' option.
Modified: trunk/tools/pom.xml
===================================================================
--- trunk/tools/pom.xml 2010-11-21 00:58:50 UTC (rev 497)
+++ trunk/tools/pom.xml 2010-11-22 11:39:30 UTC (rev 498)
@@ -8,6 +8,24 @@
<version>1.2.0-SNAPSHOT</version>
<name>Savara::Tools</name>
+ <!-- use JBoss Tools' trunk/build/parent/pom.xml - must be built locally first!
+ Then, build like this to suck in latest pi4soa + target-platform:
+ mvn3 clean install -U -B -e -fae -P jbosstools-nightly-trunk,helios-remote-target,\!helios
+ -->
+ <parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+
+ <!-- Don't use Savara's own local parent-pom.xml. ~nickb
+ <parent>
+ <relativePath>parent-pom.xml</relativePath>
+ <groupId>org.savara.tools</groupId>
+ <artifactId>org.savara.tools.parent.pom</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent> -->
+
<properties>
<jaxb.version>2.1</jaxb.version>
<tycho-version>0.10.0</tycho-version>
@@ -24,69 +42,8 @@
<build>
<plugins>
- <!--
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho-version}</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <resolver>p2</resolver>
- <pomDependencies>consider</pomDependencies>
- </configuration>
- </plugin>
--->
<plugin>
<groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-packaging-plugin</artifactId>
- <version>${tychoVersion}</version>
- <configuration>
- <format>'v'yyyyMMdd-HHmm'-${BUILD_ALIAS}'</format>
- <archiveSite>true</archiveSite>
- <environments>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>carbon</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- <version>${tychoVersion}</version>
- <extensions>true</extensions>
- </plugin>
-
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tychoVersion}</version>
<configuration>
@@ -125,6 +82,22 @@
</plugins>
</build>
+
+<!-- No need for distribution details as there are no artifacts to publish
+ <distributionManagement>
+ <repository>
+ <id>jboss-releases-repository</id>
+ <name>JBoss Releases Repository</name>
+ <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url>
+ </repository>
+ <snapshotRepository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </snapshotRepository>
+ </distributionManagement>
+-->
+
<repositories>
<repository>
<id>jboss-developer-repository-group</id>
Deleted: trunk/tools/pomOrig.xml
===================================================================
--- trunk/tools/pomOrig.xml 2010-11-21 00:58:50 UTC (rev 497)
+++ trunk/tools/pomOrig.xml 2010-11-22 11:39:30 UTC (rev 498)
@@ -1,95 +0,0 @@
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.savara</groupId>
- <artifactId>tools</artifactId>
- <packaging>pom</packaging>
- <version>1.2.0-SNAPSHOT</version>
- <name>Savara::Tools</name>
-
- <!-- use JBoss Tools' trunk/build/parent/pom.xml - must be built locally first!
- Then, build like this to suck in latest pi4soa + target-platform:
- mvn3 clean install -U -B -e -fae -P jbosstools-nightly-trunk,helios-remote-target,\!helios
- -->
- <parent>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
- <!-- Don't use Savara's own local parent-pom.xml. ~nickb
- <parent>
- <relativePath>parent-pom.xml</relativePath>
- <groupId>org.savara.tools</groupId>
- <artifactId>org.savara.tools.parent.pom</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent> -->
-
- <properties>
- <jaxb.version>2.1</jaxb.version>
- </properties>
-
- <modules>
- <module>plugins</module>
- <module>features</module>
- <module>tests</module>
- <module>site</module>
- </modules>
-
-
-<!-- No need for distribution details as there are no artifacts to publish
- <distributionManagement>
- <repository>
- <id>jboss-releases-repository</id>
- <name>JBoss Releases Repository</name>
- <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url>
- </repository>
- <snapshotRepository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </snapshotRepository>
- </distributionManagement>
--->
-
- <repositories>
- <repository>
- <id>jboss-developer-repository-group</id>
- <name>JBoss Developer Maven Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/developer/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- <repository>
- <id>pi4soa</id>
- <url>http://download.jboss.org/jbosstools/builds/staging/pi4soa/all/repo/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>eclipse-helios</id>
- <url>http://download.eclipse.org/releases/helios</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
-
-</project>
-
More information about the savara-commits
mailing list