Skip to content

Commit

Permalink
Upgrade pom to latest luna version
Browse files Browse the repository at this point in the history
* The pom should reference the jbosstools parent pom of 4.2.0.x which
  is consistent with the latest release of the luna target platform

* Rather than using the downloaded TP that may not be up-to-date, reference
  the JBT-IS target platform directly. This explicity disables the TP
  definition outlined in the parent pom since we don't need it.

* Adds in an ant-run plugin for echoing salient properties used in the
  build for easier understanding of what TP is being built against
  • Loading branch information
Paul Richardson authored and blafond committed Oct 24, 2014
1 parent 6a8ef11 commit f31f236
Showing 1 changed file with 48 additions and 5 deletions.
53 changes: 48 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
<version>4.2.0.CR1-SNAPSHOT</version>
<version>4.2.0.Final-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>teiid</artifactId>
Expand All @@ -16,6 +16,9 @@
<properties>
<jboss-tycho-version>${tychoVersion}</jboss-tycho-version>
<tycho.scmUrl>scm:git:https://github.com/Teiid-Designer/teiid-designer.git</tycho.scmUrl>

<!-- Specify our own TP using the JBT-IS rather than using the definition in the parent pom -->
<no-target-platform>true</no-target-platform>
</properties>

<modules>
Expand All @@ -30,6 +33,44 @@
<build>
<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<echo>basedir: ${basedir}</echo>
<echo>project.basedir: ${project.basedir}</echo>
<echo>project.baseUri: ${project.baseUri}</echo>
<echo>project.version: ${project.version}</echo>
<echo>project.groupId: ${project.groupId}</echo>
<echo>project.artifactId: ${project.artifactId}</echo>
<echo>project.name: ${project.name}</echo>
<echo>project.build.sourceDirectory: ${project.build.sourceDirectory}</echo>
<echo>project.build.scriptSourceDirectory: ${project.build.scriptSourceDirectory}</echo>
<echo>project.build.testSourceDirectory: ${project.build.testSourceDirectory}</echo>
<echo>project.build.outputDirectory: ${project.build.outputDirectory}</echo>
<echo>project.build.testOutputDirectory: ${project.build.testOutputDirectory}</echo>
<echo>project.build.directory: ${project.build.directory}</echo>
<echo>eclipse.tycho.version: ${tychoVersion}</echo>
<echo>eclipse.target.version: ${targetEclipseVersion}</echo>
<echo>eclipse.target.platform.groupId: ${tpc.groupId}</echo>
<echo>eclipse.target.platform.group: ${tpc.group}</echo>
<echo>eclipse.target.platform.version: ${tpc.version}</echo>
<echo>eclipse.target.platform.kind: ${tpc.targetKind}</echo>
<echo>NOT.using.target.platform: ${no-target-platform}</echo>
</target>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
Expand All @@ -39,14 +80,16 @@
<ignoreTychoRepositories>true</ignoreTychoRepositories>
<target>
<artifact>
<groupId>org.jboss.tools.target-platforms</groupId>
<artifactId>teiid.designer</artifactId>
<version>0.1.0-SNAPSHOT</version>
<classifier>teiid-designer</classifier>
<groupId>org.jboss.tools.integration-stack</groupId>
<artifactId>target-platform</artifactId>
<version>4.2.0.beta1a</version>
<type>target</type>
<classifier>base</classifier>
</artifact>
</target>
</configuration>
</plugin>

</plugins>
</build>

Expand Down

0 comments on commit f31f236

Please sign in to comment.