Merge branch 'master' into #1126_support_for_creating_library_archives

Author: jantje

.github/workflows/maven.yml

@@ -3,6 +3,9 @@
 
 name: Java CI with Maven
 
+
+            
+
 on:
   push:
     branches: [ master ]
@@ -15,6 +18,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+    - name: show Maven
+      run: mvn -version
+    
     - uses: actions/checkout@v2
     - name: Set up JDK 17
       uses: actions/setup-java@v2

io.sloeber.parent/pom.xml

@@ -9,7 +9,7 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<tycho.version>2.7.5</tycho.version>
+		<tycho.version>4.0.4</tycho.version>
 		<built.repo.dir>${project.build.directory}/repo</built.repo.dir>
 		<!-- maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target -->
@@ -51,13 +51,17 @@
 				<version>${tycho.version}</version>
 				<configuration>
 					<dependency-resolution>
-						<profileProperties>
-							<org.eclipse.justj.buildtime>true</org.eclipse.justj.buildtime>
+					 	<profileProperties>
+					 		<org.eclipse.justj.buildtime>true</org.eclipse.justj.buildtime> 
 						</profileProperties>
-					</dependency-resolution>
+					</dependency-resolution> 
+					<target>
+						<file>../io.sloeber.product/sloeber.target</file>
+					</target>
+
 				</configuration>
 			</plugin>
-		
+
 			<!-- Enable tycho build extension -->
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
@@ -76,9 +80,9 @@
 <!--
 					<source>11</source>
 					<target>11</target> -->
-                   <executionEnvironment>org.eclipse.justj.openjdk.hotspot.jre.full-17</executionEnvironment>
+					<executionEnvironment>org.eclipse.justj.openjdk.hotspot.jre.full-17</executionEnvironment>
 
- 				</configuration>
+				</configuration>
 			</plugin>
 
 			<!-- Enable version management -->
@@ -196,7 +200,7 @@
 						<version>${tycho.version}</version>
 						<configuration>
 							<!-- configure the p2 target environments for multi-platform build -->
-							<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
+							<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi 
 								spec -->
 							<environments>
 								<environment>
@@ -213,7 +217,7 @@
 									<os>macosx</os>
 									<ws>cocoa</ws>
 									<arch>x86_64</arch>
-								</environment>									
+								</environment>
 								<environment>
 									<os>macosx</os>
 									<ws>cocoa</ws>
@@ -237,7 +241,7 @@
 						<version>${tycho.version}</version>
 						<configuration>
 							<!-- configure the p2 target environments for multi-platform build -->
-							<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
+							<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi 
 								spec -->
 							<environments>
 								<environment>
@@ -262,7 +266,7 @@
 						<version>${tycho.version}</version>
 						<configuration>
 							<!-- configure the p2 target environments for multi-platform build -->
-							<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
+							<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi 
 								spec -->
 							<environments>
 								<environment>
@@ -276,7 +280,7 @@
 				</plugins>
 			</build>
 		</profile>
-		
+
 		<profile>
 			<id>mac64</id>
 			<build>
@@ -287,7 +291,7 @@
 						<version>${tycho.version}</version>
 						<configuration>
 							<!-- configure the p2 target environments for multi-platform build -->
-							<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
+							<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi 
 								spec -->
 							<environments>
 								<!-- Mac -->
@@ -302,7 +306,7 @@
 				</plugins>
 			</build>
 		</profile>
-		
+
 		<profile>
 			<id>macm1</id>
 			<build>
@@ -313,7 +317,7 @@
 						<version>${tycho.version}</version>
 						<configuration>
 							<!-- configure the p2 target environments for multi-platform build -->
-							<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
+							<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi 
 								spec -->
 							<environments>
 								<!-- Mac aarch64 -->

io.sloeber.product/sloeber.target

@@ -30,6 +30,11 @@
 			<unit id="org.eclipse.ecf.core.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.wildwebdeveloper.feature.feature.group" version="0.0.0"/>
 		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/egit/updates"/>
+			<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.egit.source.feature.group" version="0.0.0"/>
+		</location>
 		<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="DirectFromMaven" missingManifest="error" type="Maven">
 			<dependencies>
 				<dependency>
@@ -52,11 +57,6 @@
 				</dependency>
 			</dependencies>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/egit/updates"/>
-			<unit id="org.eclipse.egit.feature.group" version="6.7.0.202309050840-r"/>
-			<unit id="org.eclipse.egit.source.feature.group" version="6.7.0.202309050840-r"/>
-		</location>
 	</locations>
 	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 </target>

io.sloeber.tests/.classpath

@@ -2,6 +2,7 @@
 <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>
@@ -12,10 +13,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>