Skip to content
This repository was archived by the owner on Jul 27, 2025. It is now read-only.

Commit 70ea5b9

Browse files
fugerit79fugerit79
authored
Merge pull request #4 from fugerit-org/3-change-parent-to-fj-universe-tool
3 change parent to fj universe tool
2 parents cf47dad + 1a96d81 commit 70ea5b9

File tree

4 files changed

+40
-98
lines changed

4 files changed

+40
-98
lines changed

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [0.7.0] - 2023-10-08
11+
12+
### Added
13+
14+
- added issue management section in pom
15+
16+
### Changed
17+
18+
- parent changed from fj-bom to fj-universe-tool 0.5.2
19+
1020
## [0.6.1] - 2023-10-07
1121

1222
### Added

‎pom.xml‎

Lines changed: 16 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

5+
<groupId>org.fugerit.java</groupId>
56
<artifactId>yaml-doc-tool</artifactId>
67

78
<parent>
8-
<groupId>org.fugerit.java</groupId>
9-
<artifactId>fj-bom</artifactId>
10-
<version>1.4.0</version>
9+
<groupId>org.fugerit.java.universe</groupId>
10+
<artifactId>fj-universe-tool</artifactId>
11+
<version>0.5.2</version>
1112
<relativePath></relativePath>
1213
</parent>
1314

14-
<version>0.6.1</version>
15+
<version>0.7.0</version>
1516
<packaging>jar</packaging>
1617

1718
<name>yaml-doc-tool</name>
@@ -21,22 +22,26 @@
2122
<scm>
2223
<connection>scm:git:git://github.com/fugerit-org/yaml-doc-tool.git</connection>
2324
<developerConnection>scm:git:ssh://github.com/fugerit-org/yaml-doc-tool.git</developerConnection>
24-
<url>http://github.com/fugerit-org/yaml-doc-tool/tree/main</url>
25+
<url>https://github.com/fugerit-org/yaml-doc-tool.git</url>
26+
<tag>HEAD</tag>
2527
</scm>
2628

29+
<issueManagement>
30+
<system>GitHub</system>
31+
<url>https://github.com/fugerit-org/yaml-doc-tool/issues</url>
32+
</issueManagement>
33+
2734
<properties>
2835
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
29-
<java-version-compliance>1.8</java-version-compliance>
30-
<maven.compiler.source>${java-version-compliance}</maven.compiler.source>
31-
<maven.compiler.target>${java-version-compliance}</maven.compiler.target>
36+
<java-version-compliance>8</java-version-compliance>
3237
<!-- libraries versions -->
33-
<fj-version>8.3.7</fj-version>
34-
<fj-doc-version>3.0.7</fj-doc-version>
3538
<snake-yaml-version>2.2</snake-yaml-version>
3639
<!-- sonar cloud configuration -->
3740
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
3841
<sonar.organization>fugerit-org</sonar.organization>
3942
<sonar.projectKey>fugerit-org_yaml-doc-tool</sonar.projectKey>
43+
<!-- tool main class -->
44+
<tool-main-class>org.fugerit.java.yaml.doc.YamlDocMain</tool-main-class>
4045
</properties>
4146

4247
<licenses>
@@ -80,55 +85,26 @@
8085
<dependency>
8186
<groupId>org.fugerit.java</groupId>
8287
<artifactId>fj-core</artifactId>
83-
<version>${fj-version}</version>
8488
</dependency>
8589

8690
<dependency>
8791
<groupId>org.fugerit.java</groupId>
8892
<artifactId>fj-doc-base</artifactId>
89-
<version>${fj-doc-version}</version>
9093
</dependency>
9194

9295
<dependency>
9396
<groupId>org.fugerit.java</groupId>
9497
<artifactId>fj-doc-freemarker</artifactId>
95-
<version>${fj-doc-version}</version>
9698
</dependency>
9799

98100
<dependency>
99101
<groupId>org.fugerit.java</groupId>
100102
<artifactId>fj-doc-mod-fop</artifactId>
101-
<version>${fj-doc-version}</version>
102103
</dependency>
103104

104105
<dependency>
105106
<groupId>org.fugerit.java</groupId>
106107
<artifactId>fj-doc-mod-poi</artifactId>
107-
<version>${fj-doc-version}</version>
108-
</dependency>
109-
110-
<dependency>
111-
<groupId>org.slf4j</groupId>
112-
<artifactId>slf4j-api</artifactId>
113-
</dependency>
114-
115-
<dependency>
116-
<groupId>org.apache.logging.log4j</groupId>
117-
<artifactId>log4j-api</artifactId>
118-
</dependency>
119-
<dependency>
120-
<groupId>org.apache.logging.log4j</groupId>
121-
<artifactId>log4j-core</artifactId>
122-
</dependency>
123-
<dependency>
124-
<groupId>org.apache.logging.log4j</groupId>
125-
<artifactId>log4j-slf4j2-impl</artifactId>
126-
</dependency>
127-
128-
<dependency>
129-
<groupId>org.projectlombok</groupId>
130-
<artifactId>lombok</artifactId>
131-
<scope>provided</scope>
132108
</dependency>
133109

134110
<dependency>
@@ -152,12 +128,6 @@
152128
<scope>test</scope>
153129
</dependency>
154130

155-
<dependency>
156-
<groupId>junit</groupId>
157-
<artifactId>junit</artifactId>
158-
<scope>test</scope>
159-
</dependency>
160-
161131
<dependency>
162132
<groupId>org.fugerit.java</groupId>
163133
<artifactId>fj-test-helper8</artifactId>
@@ -172,58 +142,8 @@
172142

173143
</dependencies>
174144

175-
<profiles>
176-
177-
<profile>
178-
<id>singlepackage</id>
179-
<build>
180-
<plugins>
181-
<plugin>
182-
<groupId>org.apache.maven.plugins</groupId>
183-
<artifactId>maven-jar-plugin</artifactId>
184-
<version>3.0.2</version>
185-
<configuration>
186-
<archive>
187-
<manifest>
188-
<addClasspath>true</addClasspath>
189-
<mainClass>org.fugerit.java.yaml.doc.YamlDocMain</mainClass>
190-
</manifest>
191-
</archive>
192-
</configuration>
193-
</plugin>
194-
<plugin>
195-
<groupId>org.apache.maven.plugins</groupId>
196-
<artifactId>maven-shade-plugin</artifactId>
197-
<version>3.1.0</version>
198-
<executions>
199-
<execution>
200-
<phase>package</phase>
201-
<goals>
202-
<goal>shade</goal>
203-
</goals>
204-
</execution>
205-
</executions>
206-
<configuration>
207-
<finalName>dist-${project.artifactId}-${project.version}</finalName>
208-
</configuration>
209-
</plugin>
210-
</plugins>
211-
</build>
212-
</profile>
213-
</profiles>
214-
215-
<reporting>
216-
<plugins>
217-
<plugin>
218-
<groupId>org.apache.maven.plugins</groupId>
219-
<artifactId>maven-changelog-plugin</artifactId>
220-
<version>2.3</version>
221-
</plugin>
222-
</plugins>
223-
</reporting>
224-
225145
<organization>
226-
<url>http://www.fugerit.org</url>
146+
<url>http://www.fug erit.org</url>
227147
<name>Fugerit</name>
228148
</organization>
229149

‎src/main/config/log4j2.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Configuration status="WARN">
3+
<Appenders>
4+
<Console name="Console" target="SYSTEM_OUT">
5+
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
6+
</Console>
7+
</Appenders>
8+
<Loggers>
9+
<Root level="DEBUG">
10+
<AppenderRef ref="Console"/>
11+
</Root>
12+
</Loggers>
13+
</Configuration>

‎src/test/java/test/org/fugerit/java/yaml/doc/TestYamlDocConfig.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import java.util.Properties;
44

55
import org.fugerit.java.core.cfg.ConfigException;
6-
import org.fugerit.java.core.cfg.ConfigRuntimeException;
76
import org.fugerit.java.core.function.SafeFunction;
87
import org.fugerit.java.yaml.doc.YamlDocMain;
98
import org.junit.Assert;
@@ -52,7 +51,7 @@ public void testSampleIt() {
5251

5352
@Test
5453
public void testSampleFail1() {
55-
Assert.assertThrows( ConfigRuntimeException.class , () -> this.testWorkerSample( FILE_ENCODING, null ) );
54+
Assert.assertThrows( NullPointerException.class , () -> this.testWorkerSample( FILE_ENCODING, null ) );
5655
}
5756

5857
@Test

0 commit comments

Comments
 (0)