Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2015-08-19 16:24:42 -0400
committerAlexander Kurtakov2015-08-19 16:24:42 -0400
commit6eef1897321cfe779aa47a489d4f424d7e92a291 (patch)
treea6bec84843af1acd89675a3ac7b4f12a6fb2a02e
parentbc35baf15821d47d8c51a5035f621c9505b1edad (diff)
downloadeclipse.platform.swt-6eef1897321cfe779aa47a489d4f424d7e92a291.tar.gz
eclipse.platform.swt-6eef1897321cfe779aa47a489d4f424d7e92a291.tar.xz
eclipse.platform.swt-6eef1897321cfe779aa47a489d4f424d7e92a291.zip
Bug 471835 - Build succeeds, even when "old" parent pom is referred to
Fix: Non-parseable POM /home/akurtakov/git/eclipse.platform.swt/pom.xml: Duplicated tag: 'profiles' (position: START_TAG seen ...ile \n defined that is combined with this one. --> \n <profiles>... @58:13) @ line 58, column 13 -> Change-Id: I48314921979b98842bb45767bcc1bd820ecce6d1 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--pom.xml38
1 files changed, 16 insertions, 22 deletions
diff --git a/pom.xml b/pom.xml
index cb70b3bdca..dde3b3fe7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,28 +28,6 @@
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/platform/eclipse.platform.swt.git</tycho.scmUrl>
</properties>
- <profiles>
- <profile>
- <id>build-individual-bundles</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho.version}</version>
- <configuration>
- <dependency-resolution>
- <profileProperties>
- <org.eclipse.swt.buildtime>true</org.eclipse.swt.buildtime>
- </profileProperties>
- </dependency-resolution>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<!--
To build individual bundles, we specify a repository where to find parent pom,
in case it is not in local maven cache already
@@ -70,6 +48,22 @@
<url>https://repo.eclipse.org/content/repositories/eclipse/</url>
</repository>
</repositories>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <dependency-resolution>
+ <profileProperties>
+ <org.eclipse.swt.buildtime>true</org.eclipse.swt.buildtime>
+ </profileProperties>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>

Back to the top