Skip to content

Commit dd1cc49

Browse files
pvlasovpvlasov
committed
2025.10.0
1 parent 931cb17 commit dd1cc49

9 files changed

Lines changed: 637 additions & 63 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
target/
2-
/nsd.log
2+
/logs/
33
/h2-2.4.240.jar

‎.project‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,15 @@
2020
<nature>org.eclipse.jdt.core.javanature</nature>
2121
<nature>org.eclipse.m2e.core.maven2Nature</nature>
2222
</natures>
23+
<filteredResources>
24+
<filter>
25+
<id>1760051262281</id>
26+
<name></name>
27+
<type>30</type>
28+
<matcher>
29+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
30+
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
31+
</matcher>
32+
</filter>
33+
</filteredResources>
2334
</projectDescription>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.apt.aptEnabled=false

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ 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.processAnnotations=disabled
78
org.eclipse.jdt.core.compiler.release=disabled
89
org.eclipse.jdt.core.compiler.source=21

‎.settings/org.eclipse.m2e.core.prefs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1

‎metadata.xml‎

Lines changed: 575 additions & 0 deletions
Large diffs are not rendered by default.

‎pom.xml‎

Lines changed: 21 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>org.nasdanika</groupId>
6-
<version>2025.7.0</version>
6+
<version>2025.10.0</version>
77
<artifactId>cli-launcher</artifactId>
88
<packaging>jar</packaging>
99
<name>Nasdanika CLI launcher</name>
@@ -40,12 +40,12 @@
4040
<dependency>
4141
<groupId>org.nasdanika.models.app</groupId>
4242
<artifactId>cli</artifactId>
43-
<version>2025.7.0</version>
43+
<version>2025.10.0</version>
4444
</dependency>
4545
<dependency>
4646
<groupId>org.nasdanika.models.java</groupId>
4747
<artifactId>cli</artifactId>
48-
<version>2025.7.0</version>
48+
<version>2025.10.0</version>
4949
</dependency>
5050
<!--
5151
<dependency>
@@ -57,66 +57,55 @@
5757
<dependency>
5858
<groupId>org.nasdanika.models.crew-ai</groupId>
5959
<artifactId>cli</artifactId>
60-
<version>2025.7.0</version>
60+
<version>2025.10.0</version>
6161
</dependency>
6262
<dependency>
6363
<groupId>org.nasdanika.models.sql</groupId>
6464
<artifactId>cli</artifactId>
65-
<version>2025.9.0</version>
65+
<version>2025.10.0</version>
6666
</dependency>
6767
<dependency>
6868
<groupId>org.nasdanika.models.architecture</groupId>
6969
<artifactId>model</artifactId>
70-
<version>2025.7.0</version>
70+
<version>2025.10.0</version>
7171
</dependency>
7272
<dependency>
7373
<groupId>org.nasdanika.core</groupId>
7474
<artifactId>http</artifactId>
75-
<version>2025.7.0</version>
75+
<version>2025.10.0</version>
7676
</dependency>
77+
<!--
7778
<dependency>
7879
<groupId>org.nasdanika.core</groupId>
7980
<artifactId>groovy</artifactId>
80-
<version>2025.7.0</version>
81+
<version>2025.10.0</version>
8182
</dependency>
83+
-->
8284
<dependency>
8385
<groupId>org.nasdanika.core</groupId>
8486
<artifactId>maven</artifactId>
85-
<version>2025.7.0</version>
87+
<version>2025.10.0</version>
8688
</dependency>
8789
<dependency>
8890
<groupId>org.nasdanika.models.echarts</groupId>
8991
<artifactId>graph</artifactId>
90-
<version>2025.7.0</version>
92+
<version>2025.10.0</version>
9193
</dependency>
9294
<dependency>
9395
<groupId>org.nasdanika.models.ecore</groupId>
9496
<artifactId>cli</artifactId>
95-
<version>2025.7.0</version>
96-
</dependency>
97-
<dependency>
98-
<groupId>org.apache.groovy</groupId>
99-
<artifactId>groovy-all</artifactId>
100-
<version>4.0.27</version>
101-
<type>pom</type>
97+
<version>2025.10.0</version>
10298
</dependency>
103-
104-
<dependency>
105-
<groupId>org.junit.platform</groupId>
106-
<artifactId>junit-platform-engine</artifactId>
107-
<version>1.12.1</version>
108-
<scope>test</scope>
109-
</dependency>
11099
<dependency>
111100
<groupId>org.junit.jupiter</groupId>
112101
<artifactId>junit-jupiter-api</artifactId>
113-
<version>5.12.1</version>
102+
<version>6.0.0</version>
114103
<scope>test</scope>
115104
</dependency>
116105
<dependency>
117106
<groupId>org.junit.jupiter</groupId>
118107
<artifactId>junit-jupiter-engine</artifactId>
119-
<version>5.12.1</version>
108+
<version>6.0.0</version>
120109
<scope>test</scope>
121110
</dependency>
122111
</dependencies>
@@ -135,7 +124,7 @@
135124
<plugin>
136125
<groupId>org.apache.maven.plugins</groupId>
137126
<artifactId>maven-dependency-plugin</artifactId>
138-
<version>3.8.1</version>
127+
<version>3.9.0</version>
139128
<executions>
140129
<execution>
141130
<id>copy-dependencies</id>
@@ -170,20 +159,13 @@
170159
<plugin>
171160
<groupId>org.apache.maven.plugins</groupId>
172161
<artifactId>maven-surefire-plugin</artifactId>
173-
<version>3.5.2</version>
174-
<dependencies>
175-
<dependency>
176-
<groupId>org.junit.jupiter</groupId>
177-
<artifactId>junit-jupiter-engine</artifactId>
178-
<version>5.11.4</version>
179-
</dependency>
180-
</dependencies>
162+
<version>3.5.4</version>
181163
</plugin>
182164

183165
<plugin>
184166
<groupId>org.apache.maven.plugins</groupId>
185167
<artifactId>maven-failsafe-plugin</artifactId>
186-
<version>3.5.3</version>
168+
<version>3.5.4</version>
187169
<executions>
188170
<execution>
189171
<goals>
@@ -192,13 +174,6 @@
192174
</goals>
193175
</execution>
194176
</executions>
195-
<dependencies>
196-
<dependency>
197-
<groupId>org.junit.jupiter</groupId>
198-
<artifactId>junit-jupiter-engine</artifactId>
199-
<version>5.12.1</version>
200-
</dependency>
201-
</dependencies>
202177
</plugin>
203178
<plugin>
204179
<artifactId>maven-assembly-plugin</artifactId>
@@ -248,7 +223,7 @@
248223
<plugin>
249224
<groupId>org.apache.maven.plugins</groupId>
250225
<artifactId>maven-javadoc-plugin</artifactId>
251-
<version>3.11.2</version>
226+
<version>3.12.0</version>
252227
<executions>
253228
<execution>
254229
<id>attach-javadocs</id>
@@ -303,7 +278,7 @@
303278
<plugin>
304279
<groupId>org.apache.maven.plugins</groupId>
305280
<artifactId>maven-gpg-plugin</artifactId>
306-
<version>3.2.7</version>
281+
<version>3.2.8</version>
307282
<executions>
308283
<execution>
309284
<id>sign-artifacts</id>
@@ -317,7 +292,7 @@
317292
<plugin>
318293
<groupId>org.sonatype.central</groupId>
319294
<artifactId>central-publishing-maven-plugin</artifactId>
320-
<version>0.8.0</version>
295+
<version>0.9.0</version>
321296
<extensions>true</extensions>
322297
<configuration>
323298
<publishingServerId>central</publishingServerId>

‎src/main/resources/logback.xml‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<configuration>
3-
<appender name="file" class="ch.qos.logback.core.FileAppender">
4-
<file>nsd.log</file>
5-
<append>true</append>
6-
<encoder>
7-
<pattern>%d{yyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg %kvp{DOUBLE}%n</pattern>
8-
</encoder>
9-
</appender>
10-
<appender name="OpenTelemetry"
11-
class="io.opentelemetry.instrumentation.logback.appender.v1_0.OpenTelemetryAppender">
12-
<captureExperimentalAttributes>true</captureExperimentalAttributes>
13-
<captureKeyValuePairAttributes>true</captureKeyValuePairAttributes>
14-
</appender>
15-
<root level="INFO">
16-
<appender-ref ref="file"/>
17-
<appender-ref ref="OpenTelemetry"/>
18-
</root>
3+
<appender name="ROLLING" class="ch.qos.logback.core.rolling.RollingFileAppender">
4+
<file>logs/nsd.log</file>
5+
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
6+
<fileNamePattern>logs/nsd.%d{yyyy-MM-dd}.log</fileNamePattern>
7+
<maxHistory>30</maxHistory>
8+
</rollingPolicy>
9+
<encoder>
10+
<pattern>%d{yyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg %kvp{DOUBLE}%n</pattern>
11+
</encoder>
12+
</appender>
13+
<appender name="OpenTelemetry"
14+
class="io.opentelemetry.instrumentation.logback.appender.v1_0.OpenTelemetryAppender">
15+
<captureExperimentalAttributes>true</captureExperimentalAttributes>
16+
<captureKeyValuePairAttributes>true</captureKeyValuePairAttributes>
17+
</appender>
18+
<root level="INFO">
19+
<appender-ref ref="ROLLING"/>
20+
<appender-ref ref="OpenTelemetry"/>
21+
</root>
1922
</configuration>

‎src/test/java/org/nasdanika/launcher/tests/TestGroovy.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@
88
import javax.script.ScriptEngineManager;
99
import javax.script.ScriptException;
1010

11+
import org.junit.jupiter.api.Disabled;
1112
import org.junit.jupiter.api.Test;
1213
import org.nasdanika.common.Invocable;
1314

1415
public class TestGroovy {
1516

1617
@Test
18+
@Disabled
1719
public void testAnnotations() throws ScriptException {
1820
String source = """
1921
@@ -44,6 +46,7 @@ def annotatedMethod() {
4446
}
4547

4648
@Test
49+
@Disabled
4750
public void testAnomymous() throws ScriptException {
4851
String source = """
4952
new org.nasdanika.common.Invocable() {

0 commit comments

Comments
 (0)