Skip to content

Commit

Permalink
All unittests executing - (Task #1184)
Browse files Browse the repository at this point in the history 
- All unit tests are back running and providing green lights
---
Task #1184: Updating to Eclipse 2024/03 and all dependencies
  • Loading branch information
@PhilMFischer
PhilMFischer committed Jul 3, 2024
1 parent a04a7b8 commit f098011
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 118 deletions.
116 changes: 0 additions & 116 deletions de.dlr.sc.virsat.server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,120 +18,4 @@
<name>de.dlr.sc.virsat.server</name>
<packaging>eclipse-plugin</packaging>

<properties>
<swagger-maven-plugin-version>2.2.21</swagger-maven-plugin-version>
<managementPath>management</managementPath>
<modelPath>model</modelPath>
<swagger.management.output>${basedir}/doc-gen/${managementPath}</swagger.management.output>
<swagger.model.output>${basedir}/doc-gen/${modelPath}</swagger.model.output>
<swagger.output.name>swagger</swagger.output.name>
<swagger2markup.version>1.2.0</swagger2markup.version>
<swagger.management.input>${swagger.management.output}/${swagger.output.name}.json</swagger.management.input>
<swagger.model.input>${swagger.model.output}/${swagger.output.name}.json</swagger.model.input>
</properties>

<pluginRepositories>
<pluginRepository>
<id>jcenter-snapshots</id>
<name>jcenter</name>
<url>https://oss.jfrog.org/artifactory/oss-snapshot-local/</url>
</pluginRepository>
<pluginRepository>
<id>jcenter-releases</id>
<name>jcenter</name>
<url>https://jcenter.bintray.com</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>

<dependencies>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-jaxrs2-jakarta</artifactId>
<version>2.2.21</version>
</dependency>
</dependencies>

<profiles>
<profile>
<id>doc</id>
<build>
<plugins>

<plugin>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-maven-plugin-jakarta</artifactId>
<version>2.2.21</version>
<executions>
<execution>
<phase>compile</phase>
<id>modelAPI</id>
<goals>
<goal>resolve</goal>
</goals>
<configuration>
<outputFileName>${swagger.output.name}</outputFileName>
<outputPath>${swagger.model.output}</outputPath>
<outputFormat>JSONANDYAML</outputFormat>

<resourceClasses>
<resourceClasse>de.dlr.sc.virsat.server.resources.modelaccess.ModelAccessResource</resourceClasse>
<resourceClasse>de.dlr.sc.virsat.server.resources.modelaccess.RepoModelAccessResource</resourceClasse>
<resourceClasse>de.dlr.sc.virsat.server.resources.model.CategoryAssignmentResource</resourceClasse>
</resourceClasses>
<!-- <resourcePackages>
<resourcePackage>de.dlr.sc.virsat.server.resources.model</resourcePackage>
<resourcePackage>de.dlr.sc.virsat.server.resources.modelaccess</resourcePackage>
</resourcePackages>
--> <prettyPrint>TRUE</prettyPrint>
<readAllResources>true</readAllResources>
</configuration>
</execution>
<!--<execution>
<phase>compile</phase>
<id>managementAPI</id>
<goals>
<goal>resolve</goal>
</goals>
<configuration>
<outputFileName>${swagger.output.name}</outputFileName>
<outputPath>${swagger.management.output}</outputPath>
<outputFormat>JSONANDYAML</outputFormat>
<resourceClasses>
<resourceClass>de.dlr.sc.virsat.server.resources.ProjectManagementResource</resourceClass>
</resourceClasses>
<prettyPrint>TRUE</prettyPrint>
</configuration>
</execution>-->
</executions>
</plugin>
<plugin>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId>
<version>7.5.0</version>
<executions>

<execution>
<id>open-api-doc-asciidoc</id>
<phase>prepare-package</phase>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<inputSpec>${swagger.model.input}</inputSpec>
<output>${project.basedir}/target/generated-doc/asciidoc</output>
<!-- https://openapi-generator.tech/docs/generators/asciidoc/ -->
<generatorName>asciidoc</generatorName>
<skipValidateSpec>true</skipValidateSpec>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>
</profile>
</profiles>
</project>
5 changes: 5 additions & 0 deletions de.dlr.sc.virsat.server/src/de/dlr/sc/virsat/server/repository/ServerRepoHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,11 @@ public static void registerRepositoryConfiguration(RepositoryConfiguration repos
RepoRegistry.getInstance().addRepository(repositoryConfiguration.getProjectName(), serverRepository);
}

public static void checkoutRepositoryConfiguration(RepositoryConfiguration repositoryConfiguration) throws Exception {
ServerRepository serverRepository = new ServerRepository(new File(ServerConfiguration.getProjectRepositoriesDir()), repositoryConfiguration);
serverRepository.updateOrCheckoutProject();
}

/**
* Saves the given repositoryConfiguration into a file into repository configuration dir
* with name like projectName.properties
Expand Down
19 changes: 17 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,23 @@
<id>updateLib</id>
<modules>
<module>de.dlr.sc.virsat.external.lib</module>
<module>de.dlr.sc.virsat.external.lib.swagger</module>
<module>de.dlr.sc.virsat.external.lib.apache.poi</module>
<module>de.dlr.sc.virsat.external.lib.spotbugs</module>
<module>de.dlr.sc.virsat.external.lib.commons.cli</module>
<module>de.dlr.sc.virsat.external.lib.commons.csv</module>
<module>de.dlr.sc.virsat.external.lib.commons.math</module>
<module>de.dlr.sc.virsat.external.lib.jfreechart</module>
<module>de.dlr.sc.virsat.external.lib.json-simple</module>
<module>de.dlr.sc.virsat.external.lib.matlabfile</module>
<module>de.dlr.sc.virsat.external.lib.jersey</module>
</modules>
<module>de.dlr.sc.virsat.external.lib.swagger</module>
<module>de.dlr.sc.virsat.external.lib.protobuf</module>
<module>de.dlr.sc.virsat.external.lib.vtk.linux.x86_64</module>
<module>de.dlr.sc.virsat.external.lib.vtk.win32.x86_64</module>
<module>de.dlr.sc.virsat.external.lib.zmq.linux.x86_64</module>
<module>de.dlr.sc.virsat.external.lib.zmq.win32.x86_64</module>
<module>de.dlr.sc.virsat.external.lib.z3</module>
<module>de.dlr.sc.virsat.external.lib.nebula.incubation</module> </modules>
</profile>
<profile>
<!-- Build profile for building the main product -->
Expand Down Expand Up @@ -117,6 +131,7 @@
<module>de.dlr.sc.virsat.team.test</module>

<module>de.dlr.sc.virsat.server</module>
<module>de.dlr.sc.virsat.server.swagger.ui</module>
<module>de.dlr.sc.virsat.server.test</module>

<module>de.dlr.sc.virsat.concept.unittest.util</module>
Expand Down

0 comments on commit f098011

Please sign in to comment.