Remove Uncategorized category using JBoss plugin and downgrade Tycho

The JBoss doesn't support Tycho 0.22.0 yet.

Change-Id: I44dd080d8c0e6a9bdf071a7aa3005c00be4fdfb1
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/38070
Reviewed-by: Hudson CI
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>

diff --git a/org.eclipse.tracecompass.releng-site/pom.xml b/org.eclipse.tracecompass.releng-site/pom.xml
index 6c049a3dbe256390f2bb82242f707269301b8aec..63d1efe0832d29ea2c6f2a33954d46998a9b927b 100644 (file)
--- a/org.eclipse.tracecompass.releng-site/pom.xml
+++ b/org.eclipse.tracecompass.releng-site/pom.xml
@@ -27,6 +27,28 @@
   <name>Trace Compass Repository</name>
   <packaging>eclipse-repository</packaging>
 
+<build>
+  <plugins>
+    <plugin>
+      <groupId>org.jboss.tools.tycho-plugins</groupId>
+      <artifactId>repository-utils</artifactId>
+      <executions>
+        <execution>
+          <id>generate-facade</id>
+          <phase>package</phase>
+          <goals>
+            <goal>generate-repository-facade</goal>
+          </goals>
+        </execution>
+      </executions>
+      <configuration>
+        <removeDefaultCategory>true</removeDefaultCategory>
+        <skipWebContentGeneration>true</skipWebContentGeneration>
+      </configuration>
+    </plugin>
+  </plugins>
+</build>
+
 <profiles>
   <profile>
     <id>build-update-site</id>

diff --git a/pom.xml b/pom.xml
index 74cf06160409b86fec9cfdf0a86595a943971bb9..4d4f47cea3034ed48d200195550ad8f882cc50aa 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,6 @@
   <artifactId>org.eclipse.tracecompass</artifactId>
   <version>0.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-
   <name>Trace Compass Parent</name>
 
   <licenses>
@@ -40,7 +39,7 @@
 
 <properties>
   <base.test.vmargs>-Xms256m -Xmx1024m -XX:MaxPermSize=256m</base.test.vmargs>
-  <tycho-version>0.22.0</tycho-version>
+  <tycho-version>0.21.0</tycho-version>
   <target-platform>tracecompass-e4.4</target-platform>
   <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
   <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
@@ -58,6 +57,11 @@
     <id>tycho-snapshots</id>
     <url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
   </pluginRepository>
+  <pluginRepository>
+    <id>jboss-public-repository-group</id>
+    <name>JBoss Public Repository Group</name>
+    <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+  </pluginRepository>
 </pluginRepositories>
 
 <profiles>
@@ -333,7 +337,9 @@
           <version>${tycho-version}</version>
           <configuration>
             <encoding>UTF-8</encoding>
-            <useProjectSettings>true</useProjectSettings>
+            <compilerArguments>
+              <properties>${project.basedir}/.settings/org.eclipse.jdt.core.prefs</properties>
+            </compilerArguments>
           </configuration>
         </plugin>
        <plugin>
@@ -390,6 +396,11 @@
             <excludePackageNames>org.eclipse.tracecompass.internal.*:*.test*</excludePackageNames>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.jboss.tools.tycho-plugins</groupId>
+          <artifactId>repository-utils</artifactId>
+          <version>0.21.1</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>