Skip to content

Commit

Permalink
Modify build to use teiid-designer.target
Browse files Browse the repository at this point in the history
* build.sh
 * Use the multiple target platform profile rather than the aggregate. This
   provides the basis for the TP used for building. However, pom will
   enhance this by attaching teiid-designer.target

* pom.xml
 * Supplies the target-platform to the build
 * Remove redundent repositories already outlined in parent
 * Sets the target platform configuration to be the teiid-designer target
  • Loading branch information
Paul Richardson committed Jan 2, 2013
1 parent 0413133 commit 1f2f470
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 32 deletions.
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,15 @@ MVN="mvn clean install"
# Turn on dedugging if required
#
if [ "${DEBUG}" == "1" ]; then
MVN_FLAGS="-e -X"
MVN_FLAGS="-e -X -U"
fi

#
# Maven options
# -P <profiles> : The profiles to be used for downloading jbosstools artifacts
# -D maven.repo.local : Assign the $LOCAL_REPO as the target repository
#
MVN_FLAGS="${MVN_FLAGS} -P default,jbosstools-staging-aggregate -Dmaven.repo.local=${LOCAL_REPO}"
MVN_FLAGS="${MVN_FLAGS} -P target-platform,multiple.target -Dmaven.repo.local=${LOCAL_REPO} -Dno.jbosstools.site -Dtycho.localArtifacts=ignore"

echo "==============="

Expand Down
56 changes: 26 additions & 30 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,39 +13,35 @@
<version>0.0.4-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<!-- parent pom must be built before the rest of the reactor can proceed.
Get it here: http://anonsvn.jboss.org/repos/jbosstools/trunk/build/parent/pom.xml
<module>../build/parent</module> -->
<module>target-platform</module>
<module>plugins</module>
<module>features</module>
<module>tests</module>
<module>site</module>
</modules>
<properties>
<jbosstools-nightly-tests>http://download.jboss.org/jbosstools/updates/nightly/coretests/trunk/</jbosstools-nightly-tests>
</properties>
<repositories>
<!-- To resolve parent artifact -->
<repository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Repository Group</name>
<url>http://repository.jboss.org/nexus/content/groups/public/</url>
</repository>
<repository>
<id>jboss-snapshots-repository</id>
<name>JBoss Snapshots Repository</name>
<url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>jbosstools-nightly-tests</id>
<url>${jbosstools-nightly-tests}</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>

<build>
<plugins>

<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tychoVersion}</version>
<configuration>
<resolver>p2</resolver>
<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>
</artifact>
</target>
</configuration>
</plugin>
</plugins>
</build>

</project>

0 comments on commit 1f2f470

Please sign in to comment.