Skip to content

Commit 7824003

Browse files
pvlasovpvlasov
committed
2025.12.0
1 parent 501c16e commit 7824003

10 files changed

Lines changed: 23 additions & 24 deletions

File tree

‎generator/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ org.eclipse.jdt.core.compiler.compliance=21
44
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
55
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
66
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
7-
org.eclipse.jdt.core.compiler.release=disabled
7+
org.eclipse.jdt.core.compiler.release=enabled
88
org.eclipse.jdt.core.compiler.source=21

‎generator/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
55
<groupId>org.nasdanika.models.maven</groupId>
6-
<version>2025.10.0</version>
6+
<version>2025.12.0</version>
77
<artifactId>parent</artifactId>
88
<relativePath>..</relativePath>
99
</parent>

‎generator/src/test/java/org/nasdanika/models/maven/generator/tests/TestMavenModelDocGen.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ protected boolean isPassThrough(Connection connection) {
9393

9494
EObjectNodeProcessorReflectiveFactory<WidgetFactory, WidgetFactory> eObjectNodeProcessorReflectiveFactory = new EObjectNodeProcessorReflectiveFactory<>(ecoreNodeProcessorFactory);
9595
EObjectReflectiveProcessorFactoryProvider eObjectReflectiveProcessorFactoryProvider = new EObjectReflectiveProcessorFactoryProvider(eObjectNodeProcessorReflectiveFactory);
96-
Map<Element, ProcessorInfo<Object>> registry = eObjectReflectiveProcessorFactoryProvider.getFactory().createProcessors(configs.values(), false, progressMonitor);
96+
Map<Element, ProcessorConfig<WidgetFactory, WidgetFactory, Object>> registry = eObjectReflectiveProcessorFactoryProvider.getFactory().createProcessors(configs.values(), false, progressMonitor);
9797

9898
WidgetFactory mavenProcessor = null;
9999
Collection<Throwable> resolveFailures = new ArrayList<>();
@@ -105,13 +105,13 @@ protected boolean isPassThrough(Connection connection) {
105105
);
106106

107107
for (EPackage topLevelPackage: ePackages) {
108-
for (Entry<Element, ProcessorInfo<Object>> re: registry.entrySet()) {
108+
for (Entry<Element, ProcessorConfig<WidgetFactory, WidgetFactory, Object>> re: registry.entrySet()) {
109109
Element element = re.getKey();
110110
if (element instanceof EObjectNode) {
111111
EObjectNode eObjNode = (EObjectNode) element;
112112
EObject target = eObjNode.get();
113113
if (target == topLevelPackage) {
114-
ProcessorInfo<Object> info = re.getValue();
114+
ProcessorConfig<WidgetFactory, WidgetFactory, Object> info = re.getValue();
115115
Object processor = info.getProcessor();
116116
if (processor instanceof WidgetFactory) {
117117
WidgetFactory widgetFactoryNodeProcessor = (WidgetFactory) processor;

‎model/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
55
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
66
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
77
org.eclipse.jdt.core.compiler.processAnnotations=disabled
8-
org.eclipse.jdt.core.compiler.release=disabled
8+
org.eclipse.jdt.core.compiler.release=enabled
99
org.eclipse.jdt.core.compiler.source=21

‎model/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<parent>
66
<groupId>org.nasdanika.models.maven</groupId>
7-
<version>2025.10.0</version>
7+
<version>2025.12.0</version>
88
<artifactId>parent</artifactId>
99
<relativePath>..</relativePath>
1010
</parent>
@@ -16,7 +16,7 @@
1616
<plugin>
1717
<groupId>org.apache.maven.plugins</groupId>
1818
<artifactId>maven-jar-plugin</artifactId>
19-
<version>3.4.2</version>
19+
<version>3.5.0</version>
2020
<executions>
2121
<execution>
2222
<phase>package</phase>
@@ -65,7 +65,7 @@
6565
<dependency>
6666
<groupId>org.eclipse.emf</groupId>
6767
<artifactId>org.eclipse.emf.ecore</artifactId>
68-
<version>2.40.0</version>
68+
<version>2.41.0</version>
6969
</dependency>
7070
<dependency>
7171
<groupId>org.nasdanika.core</groupId>

‎pom.xml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.nasdanika.models.maven</groupId>
55
<artifactId>parent</artifactId>
6-
<version>2025.10.0</version>
6+
<version>2025.12.0</version>
77
<packaging>pom</packaging>
88
<name>Maven model, processors, doc generator</name>
99
<description>Loading of data from Maven pom.xml file to Ecore Maven model</description>
@@ -21,10 +21,10 @@
2121
</scm>
2222

2323
<properties>
24-
<core.version>2025.10.0</core.version>
25-
<html.version>2025.10.0</html.version>
26-
<models.ecore.version>2025.10.0</models.ecore.version>
27-
<jacoco.version>0.8.12</jacoco.version>
24+
<core.version>2025.12.0</core.version>
25+
<html.version>2025.12.0</html.version>
26+
<models.ecore.version>2025.12.0</models.ecore.version>
27+
<jacoco.version>0.8.14</jacoco.version>
2828
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2929
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
3030
</properties>
@@ -41,10 +41,9 @@
4141
<plugin>
4242
<groupId>org.apache.maven.plugins</groupId>
4343
<artifactId>maven-compiler-plugin</artifactId>
44-
<version>3.14.0</version>
44+
<version>3.14.1</version>
4545
<configuration>
46-
<source>21</source>
47-
<target>21</target>
46+
<release>21</release>
4847
</configuration>
4948
</plugin>
5049
<plugin>
@@ -55,7 +54,7 @@
5554
<plugin>
5655
<groupId>org.apache.maven.plugins</groupId>
5756
<artifactId>maven-source-plugin</artifactId>
58-
<version>3.3.1</version>
57+
<version>3.4.0</version>
5958
<executions>
6059
<execution>
6160
<id>attach-sources</id>
@@ -142,13 +141,13 @@
142141
<dependency>
143142
<groupId>org.junit.jupiter</groupId>
144143
<artifactId>junit-jupiter-api</artifactId>
145-
<version>6.0.0</version>
144+
<version>6.0.1</version>
146145
<scope>test</scope>
147146
</dependency>
148147
<dependency>
149148
<groupId>org.junit.jupiter</groupId>
150149
<artifactId>junit-jupiter-engine</artifactId>
151-
<version>6.0.0</version>
150+
<version>6.0.1</version>
152151
<scope>test</scope>
153152
</dependency>
154153
</dependencies>

‎pom.xml.versionsBackup‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<core.version>2024.6.0</core.version>
1212
<html.version>2024.6.0</html.version>
1313
<models.ecore.version>2024.6.0</models.ecore.version>
14-
<jacoco.version>0.8.12</jacoco.version>
14+
<jacoco.version>0.8.14</jacoco.version>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
1717
</properties>

‎processors/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ org.eclipse.jdt.core.compiler.compliance=21
44
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
55
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
66
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
7-
org.eclipse.jdt.core.compiler.release=disabled
7+
org.eclipse.jdt.core.compiler.release=enabled
88
org.eclipse.jdt.core.compiler.source=21

‎processors/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
55
<groupId>org.nasdanika.models.maven</groupId>
6-
<version>2025.10.0</version>
6+
<version>2025.12.0</version>
77
<artifactId>parent</artifactId>
88
<relativePath>..</relativePath>
99
</parent>

‎processors/src/main/java/org/nasdanika/models/maven/processors/EcoreGenMavenProcessorsFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public EcoreGenMavenProcessorsFactory(Context context) {
4646
// """
4747
// )
4848
// public EPackageNodeProcessor createEPackageProcessor(
49-
// NodeProcessorConfig<WidgetFactory, WidgetFactory> config,
49+
// NodeProcessorConfig<WidgetFactory, WidgetFactory, Object> config,
5050
// java.util.function.BiFunction<EObject, ProgressMonitor, Action> prototypeProvider,
5151
// BiConsumer<Label, ProgressMonitor> labelConfigurator,
5252
// ProgressMonitor progressMonitor) {

0 commit comments

Comments
 (0)