Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorUwe Stieber2012-12-27 11:34:50 +0000
committerUwe Stieber2012-12-27 11:34:50 +0000
commitd9fc2f18c89c9e14c486f4c2dc254d36b3ce0729 (patch)
tree17535df37bc0468206d1673686446fe4fb0c7f65 /admin
parentfb9a0711f43affb2d2699119add66549261ea347 (diff)
downloadorg.eclipse.tcf-d9fc2f18c89c9e14c486f4c2dc254d36b3ce0729.tar.gz
org.eclipse.tcf-d9fc2f18c89c9e14c486f4c2dc254d36b3ce0729.tar.xz
org.eclipse.tcf-d9fc2f18c89c9e14c486f4c2dc254d36b3ce0729.zip
Tycho: Fix the use of the pack200 plug-in's. Repository now contains packed artifacts too.
Diffstat (limited to 'admin')
-rw-r--r--admin/pom-build.xml8
-rw-r--r--admin/pom-config.xml16
2 files changed, 17 insertions, 7 deletions
diff --git a/admin/pom-build.xml b/admin/pom-build.xml
index 953c9456a..d25ce5b59 100644
--- a/admin/pom-build.xml
+++ b/admin/pom-build.xml
@@ -43,22 +43,22 @@
<!-- See http://wiki.eclipse.org/Platform-releng/Platform_Build#Building for details -->
<build>
<plugins>
-<!--
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200a-plugin</artifactId>
</plugin>
--->
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-jarsigner-plugin</artifactId>
</plugin>
-<!--
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200b-plugin</artifactId>
</plugin>
--->
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ </plugin>
</plugins>
</build>
</profile>
diff --git a/admin/pom-config.xml b/admin/pom-config.xml
index 43ba2a4af..8085babff 100644
--- a/admin/pom-config.xml
+++ b/admin/pom-config.xml
@@ -35,7 +35,7 @@
<gmaven-version>1.4</gmaven-version>
<findbugs-version>2.5.2</findbugs-version>
<!-- Check available versions at https://repository.sonatype.org/content/repositories/public/org/jacoco/jacoco-maven-plugin -->
- <jacoco-version>0.5.10.201208310627</jacoco-version>
+ <jacoco-version>0.6.0.201210061924</jacoco-version>
<!--<eclipse-jarsigner-version>1.0.2-SNAPSHOT</eclipse-jarsigner-version>
downgrade to the latest version published -->
<eclipse-jarsigner-version>1.0.0</eclipse-jarsigner-version>
@@ -159,9 +159,7 @@
</environments>
<resolver>p2</resolver>
<ignoreTychoRepositories>true</ignoreTychoRepositories>
-<!--
<includePackedArtifacts>true</includePackedArtifacts>
--->
<pomDependencies>consider</pomDependencies>
</configuration>
</plugin>
@@ -221,6 +219,18 @@
</baselineRepositories>
</configuration>
-->
+ <executions>
+ <execution>
+ <id>p2-metadata</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <defaultP2Metadata>false</defaultP2Metadata>
+ </configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>

Back to the top