Update to build with Tycho 4.0.4

eclipse-mylyn · Nov 24, 2023 · b2359db · b2359db
1 parent a64d5de
commit b2359db
Show file tree

Hide file tree

Showing 7 changed files with 127 additions and 27 deletions.
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -15,6 +15,6 @@
 	<extension>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-build</artifactId>
-		<version>3.0.4</version>
+		<version>4.0.4</version>
 	</extension>
 </extensions>
diff --git a/mylyn.docs/docs/org.eclipse.mylyn.docs-site/category.xml b/mylyn.docs/docs/org.eclipse.mylyn.docs-site/category.xml
@@ -21,12 +21,6 @@
    <feature url="features/org.eclipse.mylyn.docs.sdk_0.0.0.jar" id="org.eclipse.mylyn.docs.sdk" version="0.0.0">
       <category name="SDK"/>
    </feature>
-   <feature url="features/org.eclipse.mylyn.docs.epub_0.0.0.qualifier.jar" id="org.eclipse.mylyn.docs.epub" version="0.0.0">
-      <category name="Features"/>
-   </feature>
-   <feature url="features/org.eclipse.mylyn.docs.epub.sdk_0.0.0.qualifier.jar" id="org.eclipse.mylyn.docs.epub.sdk" version="0.0.0">
-      <category name="SDK"/>
-   </feature>
    <bundle id="com.google.guava">
      <category name="SDK"/>
    </bundle>
@@ -35,11 +29,6 @@
          Tools.
       </description>
    </category-def>
-   <category-def name="Integration" label="Mylyn Docs Integrations">
-      <description>
-         Connectors that integrate with ALM systems.
-      </description>
-   </category-def>
    <category-def name="SDK" label="Mylyn Docs SDK and Framework">
       <description>
          Source code and documentation for integrators.

diff --git a/mylyn.docs/docs/pom.xml b/mylyn.docs/docs/pom.xml
@@ -56,5 +56,66 @@
 
 		<module>org.eclipse.mylyn.docs-site</module>
 	</modules>
-
+   <dependencies>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext.textile</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext.confluence</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext.tracwiki</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext.twiki</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext.asciidoc</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext.markdown</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext.ant</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext.html</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext.commonmark</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext.creole</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+	</dependencies>
 </project>
diff --git a/mylyn.docs/pom.xml b/mylyn.docs/pom.xml
@@ -15,7 +15,7 @@
     <properties>
         <releaseVersion>3.0.49</releaseVersion>
         <qualifier>-SNAPSHOT</qualifier>
-        <tycho-version>3.0.5</tycho-version>
+        <tycho-version>4.0.4</tycho-version>
         <tycho.scmUrl>scm:git:https://github.com/eclipse-mylyn/org.eclipse.mylyn.docs</tycho.scmUrl>
         <nexus.autoReleaseAfterClose>false</nexus.autoReleaseAfterClose>
     </properties>

diff --git a/mylyn.docs/wikitext/ui/org.eclipse.mylyn.wikitext.editors-feature/pom.xml b/mylyn.docs/wikitext/ui/org.eclipse.mylyn.wikitext.editors-feature/pom.xml
@@ -10,16 +10,4 @@
   <artifactId>org.eclipse.mylyn.wikitext.editors_feature</artifactId>
   <version>${releaseVersion}${qualifier}</version>
   <packaging>eclipse-feature</packaging>
-  <dependencies>
-    <dependency>
-        <groupId>org.eclipse.mylyn.docs</groupId>
-        <artifactId>org.eclipse.mylyn.wikitext.ant</artifactId>
-        <version>${project.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>org.eclipse.mylyn.docs</groupId>
-        <artifactId>org.eclipse.mylyn.wikitext.html</artifactId>
-        <version>${project.version}</version>
-    </dependency>
-  </dependencies>
 </project>
diff --git a/mylyn.docs/wikitext/ui/pom.xml b/mylyn.docs/wikitext/ui/pom.xml
@@ -139,4 +139,66 @@
             </plugin>
         </plugins>
     </build>
+    <dependencies>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext.textile</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext.confluence</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext.tracwiki</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext.twiki</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext.asciidoc</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext.markdown</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext.ant</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext.html</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext.commonmark</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.mylyn.docs</groupId>
+			<artifactId>org.eclipse.mylyn.wikitext.creole</artifactId>
+			<version>${releaseVersion}${qualifier}</version>
+		</dependency>
+	</dependencies>
 </project>
diff --git a/mylyn.releng/org.eclipse.mylyn.parent/pom.xml b/mylyn.releng/org.eclipse.mylyn.parent/pom.xml
@@ -26,7 +26,7 @@
     <maven>3.0</maven>
   </prerequisites>
   <properties>
-    <tycho-version>4.0.3</tycho-version>
+    <tycho-version>4.0.4</tycho-version>
     <tycho.scmUrl>scm:git:https://github.com/eclipse-mylyn/org.eclipse.mylyn.git</tycho.scmUrl>
     <tycho.testArgLine></tycho.testArgLine>
     <analysis.skip>true</analysis.skip>