Merge pull request #63 from com-pas/update-riseclipse

Update RiseClipse to latest version

Author: Rob Tjalma

.github/workflows/build-project.yml

@@ -50,5 +50,9 @@ jobs:
         with:
           output_file: custom_maven_settings.xml
           servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
-      - name: Build with Maven
+      - name: Build with Maven (Pull Request)
+        if: ${{ github.event_name == 'pull_request' }}
+        run: ./mvnw -s custom_maven_settings.xml -B -Pjvm-image clean verify
+      - name: Build with Maven (Push)
+        if: ${{ github.event_name == 'push' }}
         run: ./mvnw -s custom_maven_settings.xml -B clean verify

.github/workflows/release-project.yml

@@ -66,6 +66,6 @@ jobs:
           ./mvnw -B -s custom_maven_settings.xml \
                  -DaltDeploymentRepository=github-packages-compas::default::https://maven.pkg.github.com/com-pas/compas-scl-validator \
                  -Dmaven.deploy.skip=snapshots \
-                 -Prelease clean deploy
+                 -Pjvm-image,release clean deploy
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitmodules

@@ -6,18 +6,6 @@
 # Remark: the option to ignore 'untracked' files is needed, because the submodules don't contain a file '.gitignore'.
 # This cause the target directories to be untracked.
 #
-[submodule "riseclipse/riseclipse-developer"]
-	path = riseclipse/riseclipse-developer
-	url = [email protected]:riseclipse/riseclipse-developer.git
-	ignore = dirty
-[submodule "riseclipse/riseclipse-main"]
-	path = riseclipse/riseclipse-main
-	url = [email protected]:riseclipse/riseclipse-main.git
-	ignore = dirty
-[submodule "riseclipse/riseclipse-metamodel-scl2003"]
-	path = riseclipse/riseclipse-metamodel-scl2003
-	url = [email protected]:riseclipse/riseclipse-metamodel-scl2003.git
-	ignore = dirty
 [submodule "riseclipse/riseclipse-ocl-constraints-scl2003"]
 	path = riseclipse/riseclipse-ocl-constraints-scl2003
 	url = [email protected]:riseclipse/riseclipse-ocl-constraints-scl2003.git

DEVELOPMENT.md

@@ -8,51 +8,50 @@ SPDX-License-Identifier: Apache-2.0
 
 ## Git
 
-If the project is already cloned and a submodule is added use the following commands, first `git submodule init` and
-next `git submodule update`.
+If the project is already cloned and a submodule is added use the following commands to retrieve the files from the
+RiseClipse Repository:
+
+- `git submodule init`
+- `git submodule update`
 
 More about Git Submodules can be found [here](https://git-scm.com/book/en/v2/Git-Tools-Submodules).
 
 **Remark**: The URLs to the submodules are configured in the file `.gitmodules`, but these are using the SSH URLs. There
 is a way described [here](https://git-scm.com/book/en/v2/Git-Tools-Submodules) that the URL can be overwritten locally
-with an HTTPS URL of the GIT Repository. Because of the subdirectory where the submodules are in, this doesn't work
-exactly that way. Use the following commands to update the URLs locally to HTTPS.
+with an HTTPS URL of the GIT Repository.
+
+Because of the subdirectory where the submodules are in, this doesn't work exactly that way. Use the following commands
+to update the URLs locally to HTTPS.
 
 ```
-git config submodule.riseclipse/riseclipse-developer.url https://github.com/riseclipse/riseclipse-developer.git
-git config submodule.riseclipse/riseclipse-main.url https://github.com/riseclipse/riseclipse-main.git
-git config submodule.riseclipse/riseclipse-metamodel-scl2003.url https://github.com/riseclipse/riseclipse-metamodel-scl2003.git
 git config submodule.riseclipse/riseclipse-ocl-constraints-scl2003.url https://github.com/riseclipse/riseclipse-ocl-constraints-scl2003.git
 
 git submodule init
 git submodule update
 ```
 
-## IntelliJ
+### Git update Submodules
 
-Importing the project is a bit harder for the SCL Validator then normal. It's caused because of the submodules that are
-needed from RiseClipse. These projects are Eclipse projects using Eclipse Tycho to build and Eclipse project structure.
+A submodule in Git is fixed to a specific commit of the remote repository. To update the reference to the latest commit
+in the remote repository execute the following command from the root directory of the project.
 
-The first step to make it work in IntelliJ is that an Eclipse version needs to be available on your local machine. The
-version we know that's working can be found [here](https://www.eclipse.org/downloads/packages/release/2019-06/r)
-Download (and install/unzip) Eclipse.
+```
+git submodule update --remote
+```
 
-Next a way to make everything work in IntelliJ is importing the project in the following way.
+Next commit and push the changes to the Git Repository of CoMPAS. The build now uses the latest commit of the main
+branch.
 
-- First step is to just import everything like it are Maven projects;
-- Next we need to add a Global Library in IntelliJ. Open the Module Settings and select "Global Libraries". And a new
-  libraries and name it "ECLIPSE". Point it to the directory "<ECLIPSE_INSTALL_DIR>/plugins";
-- Next step is to re-import the RiseClipse Submodule as Eclipse;
-  - In IntelliJ select "File" -> "New" -> "Module from Existing Sources...";
-  - Select one of the RiseClipse Submodules, for instance "riseclipse-metamodel-scl2003";
-  - Next select "Eclipse" by "Import module from External Model";
-  - Follow the rest of the wizard, only to remember to select all subprojects that are available in the directory;
+## Eclipse
 
-Now the module should be correctly imported in IntelliJ to be used. Check the Module Settings of one of the subprojects
-to check if the directory "src" is a Java Source Directory, for instance the module
-"riseclipse/riseclipse-metamodel-scl2003/fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities".
+### Eclipse Dependencies
 
-## Eclipse
+To make everything build and run Eclipse Dependencies are needed, but unlike the RiseClipse Dependencies these can't be
+found in the Maven Central Repository, but in an Eclipse P2 Repository. In RiseClipse there is a p2-to-m2 project that
+creates a local Maven Repository from the needed dependencies from the Eclipse P2 Repository. A CoMPAS Version of this
+maven module is created here, see [README.md](riseclipse/riseclipse-p2-to-m2/README.md) for more info.
+
+### Eclipse OCL
 
 Example about how to use Eclipse OCL was found
 [here](https://help.eclipse.org/latest/index.jsp?topic=%2Forg.eclipse.ocl.doc%2Fhelp%2FPivotStandalone.html).

README.md

@@ -28,19 +28,19 @@ automatically determine the URL to be used.
 
 ## Development
 
-For the RiseClipse implementation of the validator parts of the RiseClipse project are being used. Currently, these
-parts aren't distributed to any Maven Repository, so the Git Repositories need to be included. This is done using Git
-Submodules.
+Since version 1.2.x the JAR Files of RiseClipse are distributed through Maven Central Repository. The JAR Files can be
+retrieved from there and don't need to be build locally anymore. Only the OCL Files for the SCL validation still need to
+be downloaded from RiseClipse GIT Repository. This is still done using Git Submodules.
 
 To clone the project or update the project this means that the Git commands are sometimes a little different. To clone
 the project use the following command `git clone --recurse-submodules [email protected]:com-pas/compas-scl-validator.git`.
 This will also clone the submodules.
 
 Tip: The URL to the submodules are configured in the file `.gitmodules`, but these are using the SSH URL. There is a way
-described in the URL above that the URL can be overwritten locally with an HTTPS URL of the GIT Repository.
+described [here](https://git-scm.com/book/en/v2/Git-Tools-Submodules) to overwrite the URL locally with an HTTPS URL of
+the GIT Repository.
 
-Check the [Development](DEVELOPMENT.md) page for more detail information how to work with this repository, because of
-the mixture with RiseClipse.
+Check the [Development](DEVELOPMENT.md) page for more detail information how to develop in this GIT repository.
 
 ## Custom OCL Files
 

app/pom.xml

@@ -170,14 +170,50 @@ SPDX-License-Identifier: Apache-2.0
 
     <profiles>
         <profile>
-            <id>native</id>
+            <id>jvm-image</id>
 
             <properties>
+                <!-- Make a Docker Image, so the integration tests will be executed against the container -->
+                <quarkus.container-image.build>true</quarkus.container-image.build>
+            </properties>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>${surefire-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                                <configuration>
+                                    <systemPropertyVariables>
+                                        <java.util.logging.manager>
+                                            org.jboss.logmanager.LogManager
+                                        </java.util.logging.manager>
+                                        <maven.home>${maven.home}</maven.home>
+                                    </systemPropertyVariables>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>native-image</id>
+
+            <properties>
+                <!-- Make a Docker Image, so the integration tests will be executed against the container -->
+                <quarkus.container-image.build>true</quarkus.container-image.build>
+
                 <quarkus.package.type>native</quarkus.package.type>
                 <!-- Allows for creating a Linux executable without GraalVM being installed -->
                 <quarkus.native.container-build>true</quarkus.native.container-build>
-                <!-- Also make a Docker Image, so the native test will be executed against the container -->
-                <quarkus.container-image.build>true</quarkus.container-image.build>
                 <quarkus.native.additional-build-args>
                     --allow-incomplete-classpath
                 </quarkus.native.additional-build-args>
@@ -228,7 +264,9 @@ SPDX-License-Identifier: Apache-2.0
             <id>release</id>
 
             <properties>
+                <!-- Make a Docker Image from the component -->
                 <quarkus.container-image.build>true</quarkus.container-image.build>
+
                 <!-- Properties only used for publishing a native docker image (default to Docker Hub) -->
                 <quarkus.container-image.push>true</quarkus.container-image.push>
                 <quarkus.container-image.additional-tags>latest</quarkus.container-image.additional-tags>

app/src/test/java/org/lfenergy/compas/scl/validator/rest/CompasOclFileCollectorFromJarTest.java

@@ -14,11 +14,11 @@
 class CompasOclFileCollectorFromJarTest extends AbstractCompasOclFileCollectorTest {
     @Test
     void getDefaultOclFiles_WhenCalledWithoutCustomDirectory_ThenListReturned() {
-        assertValidateOclFileCollector(new CompasOclFileCollector(null), 226);
+        assertValidateOclFileCollector(new CompasOclFileCollector(null), 230);
     }
 
     @Test
     void getDefaultOclFiles_WhenCalledWithCustomDirectory_ThenListReturned() {
-        assertValidateOclFileCollector(new CompasOclFileCollector("./src/test/data/ocl"), 227);
+        assertValidateOclFileCollector(new CompasOclFileCollector("./src/test/data/ocl"), 231);
     }
 }

app/src/test/java/org/lfenergy/compas/scl/validator/rest/NativeHealthCheckIT.java renamed to app/src/test/java/org/lfenergy/compas/scl/validator/rest/HealthCheckIT.java

@@ -6,6 +6,6 @@
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 
 @QuarkusIntegrationTest
-class NativeHealthCheckIT extends HealthCheckTest {
+class HealthCheckIT extends HealthCheckTest {
     // Execute the same tests but in native mode.
 }

riseclipse/pom.xml

@@ -18,9 +18,7 @@ SPDX-License-Identifier: Apache-2.0
     <packaging>pom</packaging>
 
     <modules>
-        <module>riseclipse-developer</module>
-        <module>riseclipse-main</module>
-        <module>riseclipse-metamodel-scl2003</module>
+        <module>riseclipse-p2-to-m2</module>
         <module>validator-riseclipse</module>
     </modules>
 
@@ -30,26 +28,31 @@ SPDX-License-Identifier: Apache-2.0
         <eclipse.emf.common.version>2.24.0</eclipse.emf.common.version>
         <eclipse.ocl.version>1.17.0</eclipse.ocl.version>
         <antlr.runtime.version>3.2.0</antlr.runtime.version>
-        <riseclipse.version>1.1.0-SNAPSHOT</riseclipse.version>
 
-        <riseclipse.developer.root>${project.basedir}/riseclipse-developer</riseclipse.developer.root>
+        <riseclipse.scl.version>1.2.3</riseclipse.scl.version>
+        <riseclipse.main.version>1.2.5</riseclipse.main.version>
+
+        <riseclipse.p2.root>${project.basedir}/riseclipse-p2-to-m2</riseclipse.p2.root>
     </properties>
 
     <repositories>
         <repository>
             <id>local-eclipse-p2-mirror</id>
-            <url>
-                file:///${riseclipse.developer.root}/fr.centralesupelec.edf.riseclipse.developer.p2_to_m2/target/maven/repository/final
-            </url>
+            <url>file:///${riseclipse.p2.root}/target/maven/repository/final</url>
         </repository>
     </repositories>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>fr.centralesupelec.edf.riseclipse</groupId>
+                <groupId>io.github.riseclipse</groupId>
                 <artifactId>fr.centralesupelec.edf.riseclipse.iec61850.scl</artifactId>
-                <version>${riseclipse.version}</version>
+                <version>${riseclipse.scl.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.github.riseclipse</groupId>
+                <artifactId>fr.centralesupelec.edf.riseclipse.main</artifactId>
+                <version>${riseclipse.main.version}</version>
             </dependency>
 
             <dependency>