From 4d49ed97508654e7fbf2896ad35b7715a482afe0 Mon Sep 17 00:00:00 2001
From: Philip Makedonski <makedonski@informatik.uni-goettingen.de>
Date: Fri, 16 Feb 2024 17:04:37 +0100
Subject: [PATCH] * classpath and build refinements

---
 .../build.properties                               |  3 +--
 .../dependencies/pom.xml                           |  6 +++---
 .../dependencies/resources/.classpath              | 14 ++------------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/build.properties b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/build.properties
index 7866994..5e583be 100644
--- a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/build.properties
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/build.properties
@@ -1,3 +1,2 @@
 bin.includes = META-INF/,\
-               lib/,\
-               libs/
+               lib/
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/pom.xml b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/pom.xml
index 9d837f4..dd251bf 100644
--- a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/pom.xml
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/pom.xml
@@ -26,7 +26,7 @@
 				<configuration>
 					<filesets combine.children="append">
 						<fileset>
-							<directory>${basedir}/../libs/</directory>
+							<directory>${basedir}/../lib/</directory>
 							<includes>
 								<include>**/*</include>
 							</includes>
@@ -48,7 +48,7 @@
 						</goals>
 						<configuration>
 							<outputFilterFile>true</outputFilterFile>
-							<prefix>libs</prefix>
+							<prefix>lib</prefix>
 							<regenerateFile>true</regenerateFile>
 							<pathSeparator>${classpath.placeholder}</pathSeparator>
 							<outputFile>${basedir}/classpath.properties</outputFile>
@@ -61,7 +61,7 @@
 							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${basedir}/../libs</outputDirectory>
+							<outputDirectory>${basedir}/../lib</outputDirectory>
 							<overWriteReleases>false</overWriteReleases>
 							<overWriteSnapshots>false</overWriteSnapshots>
 							<overWriteIfNewer>true</overWriteIfNewer>
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/resources/.classpath b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/resources/.classpath
index 9a1bbce..9a72e7f 100644
--- a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/resources/.classpath
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/resources/.classpath
@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="module" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry exported="true" kind="lib" path="${classpath}"/>	
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
-- 
GitLab