Magwas patch 1

.classpath

@@ -14,20 +14,21 @@
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="test" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk-21.0.7">
 		<attributes>
+			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>

.github/workflows/maven.yml

@@ -0,0 +1,36 @@
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ "develop" ]
+  pull_request:
+    branches: [ "develop" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+      with: 
+        fetch-depth: 0
+    - run: tools/updateManifestVersion
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
+      with:
+        java-version: '21'
+        distribution: 'temurin'
+        cache: maven
+    - uses: actions/cache@v4
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+            ${{ runner.os }}-maven-
+    - name: Build with Maven
+      run: mvn -B install -Dgpg.skip --file pom.xml
+
+    # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
+    - name: Update dependency graph
+      uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6

.gitignore

@@ -2,3 +2,4 @@
 .git-versioned-pom.xml
 xslt
 .konveyor
+workspace

.mvn/maven-git-versioning-extension.xml

@@ -14,7 +14,7 @@
     </refs>
 
     <rev>
-        <version>${describe.tag}.${describe.distance}</version>
+        <version>0.0.1</version>
     </rev>
 
 </configuration>

inez-model.testing/.classpath → inez.model.tests/.classpath

@@ -2,12 +2,11 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/inez-parser.testing"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

inez-model.testing/.project → inez.model.tests/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>inez-model.testing</name>
+	<name>inez.model.tests</name>
 	<comment></comment>
 	<projects>
 	</projects>

inez.model.tests/META-INF/MANIFEST.MF

@@ -0,0 +1,27 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Testing
+Bundle-SymbolicName: io.github.magwas.inez.model.tests
+Bundle-Version: 0.4.18
+Export-Package: io.github.magwas.inez,
+ io.github.magwas.inez.element,
+ io.github.magwas.inez.osgi,
+ io.github.magwas.inez.query,
+ io.github.magwas.inez.storage,
+ io.github.magwas.inez.storage.model,
+ io.github.magwas.inez.storage.repository
+Require-Bundle: org.mockito.mockito-core;bundle-version="5.18.0",
+ wrapped.org.springframework.spring-test;bundle-version="6.2.9",
+ wrapped.io.github.magwas.konveyor-base-testing;bundle-version="0.4.0",
+ io.github.magwas.inez.parser,
+ io.github.magwas.inez.parser.tests,
+ io.github.magwas.inez.model,
+ junit-jupiter-api;bundle-version="5.11.4",
+ wrapped.org.springframework.spring-beans;bundle-version="6.2.8",
+ wrapped.io.github.magwas.konveyor-base;bundle-version="0.4.0",
+ org.eclipse.core.runtime;bundle-version="3.33.0",
+ wrapped.org.springframework.spring-context;bundle-version="6.2.8",
+ wrapped.org.springframework.data.spring-data-keyvalue;bundle-version="3.5.1",
+ org.antlr.antlr4-runtime;bundle-version="4.13.2"
+Automatic-Module-Name: io.github.magwas.inez.model.tests
+Bundle-RequiredExecutionEnvironment: JavaSE-21

inez-model.testing/pom.xml → inez.model.tests/pom.xml

@@ -7,13 +7,12 @@
 	<parent>
 		<groupId>io.github.magwas</groupId>
 		<artifactId>inez</artifactId>
-		<version>0.0.1</version>
+		<version>0.4.18</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<packaging>eclipse-plugin</packaging>
-	<artifactId>inez-model.testing</artifactId>
-	<name>inez-model.testing</name>
+	<artifactId>io.github.magwas.inez.model.tests</artifactId>
 	<description>
 		model layer for Inez
 	</description>

model/.classpath → inez.model/.classpath

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk-21.0.7">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry exported="true" kind="lib" path="target/classes" sourcepath="target/classes"/>

inez.model/.gitignore

@@ -0,0 +1,2 @@
+/target/
+bin/