Make pom.xml to reuse the tp file (#476)

microsoft · Mar 7, 2023 · 31cc033 · 31cc033
1 parent ed35d9a
commit 31cc033
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 29 deletions.
diff --git a/java.debug.target → ...target/com.microsoft.java.debug.tp.target b/java.debug.target → ...target/com.microsoft.java.debug.tp.target
@@ -16,12 +16,11 @@
             <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.jdt.source.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
-            <repository location="https://download.eclipse.org/releases/2021-12/202112081000/"/>
+            <repository location="https://download.eclipse.org/releases/2022-12/202212071000/"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-            <repository location="https://download.eclipse.org/releases/2021-09/202109151000/"/>
+            <repository location="https://download.eclipse.org/releases/2022-12/202212071000/"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.jboss.tools.maven.apt.core" version="0.0.0"/>
@@ -31,5 +30,9 @@
             <unit id="org.eclipse.jdt.ls.core" version="0.0.0"/>
             <repository location="https://download.eclipse.org/jdtls/snapshots/repository/latest/"/>
         </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+           <repository location="https://download.eclipse.org/lsp4j/updates/releases/0.20.0/"/>
+           <unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
+        </location>
     </locations>
 </target>
diff --git a/com.microsoft.java.debug.target/pom.xml b/com.microsoft.java.debug.target/pom.xml
@@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.microsoft.java</groupId>
+		<artifactId>java-debug-parent</artifactId>
+		<version>0.44.0</version>
+	</parent>
+	<artifactId>com.microsoft.java.debug.tp</artifactId>
+	<name>${base.name} :: Target Platform</name>
+	<packaging>eclipse-target-definition</packaging>
+</project>
diff --git a/javaConfig.json b/javaConfig.json
@@ -3,5 +3,5 @@
         "com.microsoft.java.debug.core",
         "com.microsoft.java.debug.plugin"
     ],
-   "targetPlatform": "java.debug.target"
+   "targetPlatform": "com.microsoft.java.debug.target/com.microsoft.java.debug.tp.target"
 }
diff --git a/pom.xml b/pom.xml
@@ -61,6 +61,7 @@
         <module>com.microsoft.java.debug.core</module>
         <module>com.microsoft.java.debug.plugin</module>
         <module>com.microsoft.java.debug.repository</module>
+        <module>com.microsoft.java.debug.target</module>
     </modules>
     <build>
         <pluginManagement>
@@ -135,9 +136,27 @@
                     <groupId>org.eclipse.tycho</groupId>
                     <artifactId>target-platform-configuration</artifactId>
                     <version>${tycho-version}</version>
+                    <configuration>
+                        <resolver>p2</resolver>
+                        <target>
+                            <artifact>
+                                <groupId>com.microsoft.java</groupId>
+                                <artifactId>com.microsoft.java.debug.tp</artifactId>
+                                <version>${project.version}</version>
+                            </artifact>
+                        </target>
+                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-maven-plugin</artifactId>
+                <version>${tycho-version}</version>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
     </build>
     <profiles>
         <profile>
@@ -153,37 +172,12 @@
         </profile>
     </profiles>
     <repositories>
-        <repository>
-            <id>202212</id>
-            <layout>p2</layout>
-            <url>https://download.eclipse.org/releases/2022-12/202212071000/</url>
-        </repository>
         <repository>
             <id>oss.sonatype.org</id>
             <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
             <snapshots>
                 <enabled>true</enabled>
             </snapshots>
         </repository>
-        <repository>
-            <id>JDT.LS</id>
-            <layout>p2</layout>
-            <url>https://download.eclipse.org/jdtls/snapshots/repository/latest/</url>
-        </repository>
-        <repository>
-            <id>JBOLL.TOOLS</id>
-            <layout>p2</layout>
-            <url>https://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-apt/1.5.3-2019-11-08_11-04-22-H22/</url>
-        </repository>
-        <repository>
-            <id>orbit</id>
-            <layout>p2</layout>
-            <url>https://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository/</url>
-        </repository>
-        <repository>
-            <id>lsp4j</id>
-            <layout>p2</layout>
-            <url>https://download.eclipse.org/lsp4j/updates/releases/0.20.0/</url>
-        </repository>
     </repositories>
 </project>