KapDionOS/productmodel
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pom angepasst, dass kein assembly.xml mehr ausgeführt wird.
Some checks failed
Productmodel Java CI with Maven / build (push) Failing after 1m28s
Details

Browse Source
This commit is contained in:
Jens Bühring
2026-01-12 12:32:56 +01:00
parent e8354c9fd0
commit a7b40a9b9d
7 changed files with 117 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
.idea/workspace.xml generated
View File

@@ -9,12 +9,23 @@
</loaded-modules> </loaded-modules>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e0e5f782-08ef-4945-a944-b4866593efbf" name="Changes" comment="Projektstruktur vereinfacht" /> <list default="true" id="e0e5f782-08ef-4945-a944-b4866593efbf" name="Changes" comment="Maven goal auf deploy umgestellt">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.run/OMDSServiceDefinition [clean, deploy].run.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.run/OMDSServiceDefinition [clean, install].run.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.run/OMDSServiceDefinition [clean, package].run.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.run/OMDSServiceDefinition assembly.run.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/assembly.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="EmbeddingIndexingInfo">
<option name="fileBasedEmbeddingIndicesEnabled" value="true" />
</component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
@@ -30,50 +41,53 @@
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent">{ <component name="PropertiesComponent"><![CDATA[{
&quot;keyToString&quot;: { "keyToString": {
&quot;Maven.OMDSServiceDefinition [clean, install].executor&quot;: &quot;Run&quot;, "Maven.OMDS-Productmodel [clean, install].executor": "Run",
&quot;Maven.OMDSServiceDefinition [clean, package].executor&quot;: &quot;Run&quot;, "Maven.OMDSServiceDefinition [clean, install].executor": "Run",
&quot;Maven.OMDSServiceDefinition assembly.executor&quot;: &quot;Run&quot;, "Maven.OMDSServiceDefinition [clean, package].executor": "Run",
&quot;Maven.OMDSServiceDefinition clean package.executor&quot;: &quot;Run&quot;, "Maven.OMDSServiceDefinition assembly.executor": "Run",
&quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;, "Maven.OMDSServiceDefinition clean package.executor": "Run",
&quot;RunOnceActivity.MCP Project settings loaded&quot;: &quot;true&quot;, "ModuleVcsDetector.initialDetectionPerformed": "true",
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;, "RunOnceActivity.MCP Project settings loaded": "true",
&quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;, "RunOnceActivity.ShowReadmeOnStart": "true",
&quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;, "RunOnceActivity.git.unshallow": "true",
&quot;com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1&quot;: &quot;true&quot;, "RunOnceActivity.typescript.service.memoryLimit.init": "true",
&quot;git-widget-placeholder&quot;: &quot;main&quot;, "com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1": "true",
&quot;junie.onboarding.icon.badge.shown&quot;: &quot;true&quot;, "git-widget-placeholder": "main",
&quot;kotlin-language-version-configured&quot;: &quot;true&quot;, "junie.onboarding.icon.badge.shown": "true",
&quot;last_opened_file_path&quot;: &quot;C:/Users/Lukas/IdeaProjects/omdsservicedefinitions&quot;, "kotlin-language-version-configured": "true",
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;, "last_opened_file_path": "C:/Users/Lukas/IdeaProjects/omdsservicedefinitions",
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;, "node.js.detected.package.eslint": "true",
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;, "node.js.detected.package.tslint": "true",
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;, "node.js.selected.package.eslint": "(autodetect)",
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;, "node.js.selected.package.tslint": "(autodetect)",
&quot;project.structure.last.edited&quot;: &quot;Facets&quot;, "nodejs_package_manager_path": "npm",
&quot;project.structure.proportion&quot;: &quot;0.0&quot;, "project.structure.last.edited": "Facets",
&quot;project.structure.side.proportion&quot;: &quot;0.24482758&quot;, "project.structure.proportion": "0.0",
&quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;, "project.structure.side.proportion": "0.24482758",
&quot;to.speed.mode.migration.done&quot;: &quot;true&quot;, "settings.editor.selected.configurable": "preferences.pluginManager",
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot; "to.speed.mode.migration.done": "true",
"vue.rearranger.settings.migration": "true"
} }
}</component> }]]></component>
<component name="RecapSpentCounter">
<option name="endsOfQuotaMs" value="1768338000000" />
<option name="spentUsd" value="0.0329195" />
</component>
<component name="RecapUselessUpdatesCounter">
<option name="suspendCountdown" value="0" />
</component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="C:\Users\jensb\git\productmodel" /> <recent name="C:\Users\jensb\git\productmodel" />
</key> </key>
</component> </component>
<component name="RunManager"> <component name="RunManager" selected="Maven.OMDS-Productmodel [clean, install]">
<configuration default="true" type="JetRunConfigurationType"> <list>
<method v="2"> <item itemvalue="LaTeX.Einbeziehung PDF" />
<option name="Make" enabled="true" /> <item itemvalue="Maven.OMDS-Productmodel [clean, install]" />
</method> </list>
</configuration>
<configuration default="true" type="KotlinStandaloneScriptRunConfigurationType">
<option name="filePath" />
<method v="2" />
</configuration>
</component> </component>
<component name="SharedIndexes"> <component name="SharedIndexes">
<attachedChunks> <attachedChunks>
@@ -94,6 +108,10 @@
<workItem from="1715764551681" duration="125000" /> <workItem from="1715764551681" duration="125000" />
<workItem from="1744355646461" duration="35000" /> <workItem from="1744355646461" duration="35000" />
<workItem from="1767794921692" duration="705000" /> <workItem from="1767794921692" duration="705000" />
<workItem from="1767795639756" duration="8454000" />
<workItem from="1767864748186" duration="90000" />
<workItem from="1767978274219" duration="403000" />
<workItem from="1768215520119" duration="1675000" />
</task> </task>
<task id="LOCAL-00001" summary="Projektstruktur vereinfacht"> <task id="LOCAL-00001" summary="Projektstruktur vereinfacht">
<option name="closed" value="true" /> <option name="closed" value="true" />
@@ -111,7 +129,55 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1767795456704</updated> <updated>1767795456704</updated>
</task> </task>
<option name="localTasksCounter" value="3" /> <task id="LOCAL-00003" summary="Containerized Maven build configuration added to workflow">
<option name="closed" value="true" />
<created>1767795938016</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1767795938016</updated>
</task>
<task id="LOCAL-00004" summary="Removed containerized Maven setup and updated workflow to use standard runner with JDK 22">
<option name="closed" value="true" />
<created>1767796369362</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1767796369362</updated>
</task>
<task id="LOCAL-00005" summary="Added manual Maven installation">
<option name="closed" value="true" />
<created>1767797207172</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1767797207172</updated>
</task>
<task id="LOCAL-00006" summary="Added eigenes Image und Verbindung in zentrales .m2 directory">
<option name="closed" value="true" />
<created>1767806518936</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1767806518936</updated>
</task>
<task id="LOCAL-00007" summary="Removed manual Maven and JDK setup from workflow">
<option name="closed" value="true" />
<created>1767806596183</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1767806596183</updated>
</task>
<task id="LOCAL-00008" summary="Maven goal auf deploy umgestellt">
<option name="closed" value="true" />
<created>1768215586997</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1768215586997</updated>
</task>
<option name="localTasksCounter" value="9" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@@ -134,6 +200,12 @@
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="Projektstruktur vereinfacht" /> <MESSAGE value="Projektstruktur vereinfacht" />
<option name="LAST_COMMIT_MESSAGE" value="Projektstruktur vereinfacht" /> <MESSAGE value="Containerized Maven build configuration added to workflow" />
<MESSAGE value="Removed containerized Maven setup and updated workflow to use standard runner with JDK 22" />
<MESSAGE value="Added manual Maven installation" />
<MESSAGE value="Added eigenes Image und Verbindung in zentrales .m2 directory" />
<MESSAGE value="Removed manual Maven and JDK setup from workflow" />
<MESSAGE value="Maven goal auf deploy umgestellt" />
<option name="LAST_COMMIT_MESSAGE" value="Maven goal auf deploy umgestellt" />
</component> </component>
</project> </project>

2
.run/OMDSServiceDefinition [clean, install].run.xml → .run/OMDS-Productmodel [clean, install].run.xml
View File

@@ -1,5 +1,5 @@
<component name="ProjectRunConfigurationManager"> <component name="ProjectRunConfigurationManager">
<configuration default="false" name="OMDSServiceDefinition [clean, install]" type="MavenRunConfiguration" factoryName="Maven"> <configuration default="false" name="OMDS-Productmodel [clean, install]" type="MavenRunConfiguration" factoryName="Maven">
<MavenSettings> <MavenSettings>
<option name="myGeneralSettings" /> <option name="myGeneralSettings" />
<option name="myRunnerSettings" /> <option name="myRunnerSettings" />

33
.run/OMDSServiceDefinition [clean, deploy].run.xml
View File

@@ -1,33 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="OMDSServiceDefinition [clean, deploy]" type="MavenRunConfiguration" factoryName="Maven">
<MavenSettings>
<option name="myGeneralSettings" />
<option name="myRunnerSettings" />
<option name="myRunnerParameters">
<MavenRunnerParameters>
<option name="cmdOptions" />
<option name="profiles">
<set />
</option>
<option name="goals">
<list>
<option value="clean" />
<option value="deploy" />
</list>
</option>
<option name="multimoduleDir" />
<option name="pomFileName" />
<option name="profilesMap">
<map />
</option>
<option name="projectsCmdOptionValues">
<list />
</option>
<option name="resolveToWorkspace" value="false" />
<option name="workingDirPath" value="$PROJECT_DIR$" />
</MavenRunnerParameters>
</option>
</MavenSettings>
<method v="2" />
</configuration>
</component>

33
.run/OMDSServiceDefinition [clean, package].run.xml
View File

@@ -1,33 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="OMDSServiceDefinition [clean, package]" type="MavenRunConfiguration" factoryName="Maven">
<MavenSettings>
<option name="myGeneralSettings" />
<option name="myRunnerSettings" />
<option name="myRunnerParameters">
<MavenRunnerParameters>
<option name="cmdOptions" />
<option name="profiles">
<set />
</option>
<option name="goals">
<list>
<option value="clean" />
<option value="package" />
</list>
</option>
<option name="multimoduleDir" />
<option name="pomFileName" />
<option name="profilesMap">
<map />
</option>
<option name="projectsCmdOptionValues">
<list />
</option>
<option name="resolveToWorkspace" value="false" />
<option name="workingDirPath" value="$PROJECT_DIR$" />
</MavenRunnerParameters>
</option>
</MavenSettings>
<method v="2" />
</configuration>
</component>

32
.run/OMDSServiceDefinition assembly.run.xml
View File

@@ -1,32 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="OMDSServiceDefinition assembly" type="MavenRunConfiguration" factoryName="Maven">
<MavenSettings>
<option name="myGeneralSettings" />
<option name="myRunnerSettings" />
<option name="myRunnerParameters">
<MavenRunnerParameters>
<option name="cmdOptions" />
<option name="profiles">
<set />
</option>
<option name="goals">
<list>
<option value="assembly:single" />
</list>
</option>
<option name="multimoduleDir" />
<option name="pomFileName" />
<option name="profilesMap">
<map />
</option>
<option name="projectsCmdOptionValues">
<list />
</option>
<option name="resolveToWorkspace" value="false" />
<option name="workingDirPath" value="$PROJECT_DIR$" />
</MavenRunnerParameters>
</option>
</MavenSettings>
<method v="2" />
</configuration>
</component>

48
assembly.xml
View File

@@ -1,48 +0,0 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>Doku</id>
<formats>
<format>zip</format>
</formats>
<fileSets>
<!-- die Jars und die dlls einpacken -->
<fileSet>
<directory>${project.build.directory}</directory>
<outputDirectory>\</outputDirectory>
<includes>
<include>*dll</include>
<include>*.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>${basedir}</directory>
<includes>
<include>pom.xml</include>
</includes>
</fileSet>
<!-- Alles ausser bestimmte Dateitypen in doc (die manuell erstellte Dokumentation) -->
<fileSet>
<excludes>
<exclude>%regex[(?!.*doc/).*tex]</exclude>
<exclude>%regex[(?!.*doc/).*png]</exclude>
<exclude>%regex[(?!.*doc/).*EAI.*]</exclude>
</excludes>
<directory>${basedir}\doc</directory>
</fileSet>
<!-- Alles in docGen (die mit XML-SPY generierte Dokumentation) -->
<fileSet>
<directory>${basedir}\docGen</directory>
</fileSet>
<fileSet>
<directory>${basedir}\src\main\resources\def\r2025_27</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
</assembly>

33
pom.xml
View File

@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>at.vvo.omds</groupId> <groupId>com.kapdion.omds</groupId>
<artifactId>productmodel</artifactId> <artifactId>productmodel</artifactId>
<version>2025.27-PRODUKTE-SNAPSHOT</version> <version>2025.27-SNAPSHOT</version>
<name>productmodel abgeleitet von OMDS Service Definition</name> <name>productmodel abgeleitet von OMDS Service Definition</name>
<description>Dieses Projekt enthält das Produktmodell, abgeleictet vom OMDS Produktmodell.</description> <description>Dieses Projekt enthält das Produktmodell, abgeleictet vom OMDS Produktmodell.</description>
@@ -31,38 +31,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version> <version>3.12.1</version>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.7.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.3</version>
</plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>assembly.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>make-assembly</id> <!-- this is used for inheritance merges -->
<phase>install</phase> <!-- bind to the install phase, damit source-jar und javadoc-jar mit eingepackt werden -->
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>