[FEAT] use Maven a build system root tool
This commit is contained in:
parent
c6cb79c8d7
commit
ec6a03835d
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="src" output="out/maven/classes" path="src">
|
<classpathentry including="**/*.java" kind="src" output="out/maven/classes" path="src">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="optional" value="true"/>
|
<attribute name="optional" value="true"/>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
@ -13,7 +13,7 @@
|
|||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
1
.project
1
.project
@ -36,7 +36,6 @@
|
|||||||
<nature>org.eclipse.m2e.core.maven2Nature</nature>
|
<nature>org.eclipse.m2e.core.maven2Nature</nature>
|
||||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||||
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
|
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
|
||||||
<nature>org.python.pydev.pythonNature</nature>
|
|
||||||
</natures>
|
</natures>
|
||||||
<filteredResources>
|
<filteredResources>
|
||||||
<filter>
|
<filter>
|
||||||
|
@ -40,7 +40,7 @@ def configure(target, my_module):
|
|||||||
'src/org/atriasoft/ejson/model/JsonBoolean.java',
|
'src/org/atriasoft/ejson/model/JsonBoolean.java',
|
||||||
'src/org/atriasoft/ejson/model/JsonString.java',
|
'src/org/atriasoft/ejson/model/JsonString.java',
|
||||||
'src/org/atriasoft/ejson/model/JsonObject.java',
|
'src/org/atriasoft/ejson/model/JsonObject.java',
|
||||||
'src/org/atriasoft/ejson/internal/Log.java',
|
'src/org/atriasoft/ejson/internal/LOGGER.java',
|
||||||
'src/org/atriasoft/ejson/annotation/JsonManaged.java',
|
'src/org/atriasoft/ejson/annotation/JsonManaged.java',
|
||||||
'src/org/atriasoft/ejson/annotation/EjsonAnnotation.java',
|
'src/org/atriasoft/ejson/annotation/EjsonAnnotation.java',
|
||||||
'src/org/atriasoft/ejson/annotation/JsonDefaultManaged.java',
|
'src/org/atriasoft/ejson/annotation/JsonDefaultManaged.java',
|
||||||
|
19
pom.xml
19
pom.xml
@ -1,41 +1,40 @@
|
|||||||
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>jatria-soft</groupId>
|
<groupId>org.atriasoft</groupId>
|
||||||
<artifactId>ejson</artifactId>
|
<artifactId>ejson</artifactId>
|
||||||
<version>0.1.0</version>
|
<version>0.1.0</version>
|
||||||
<properties>
|
<properties>
|
||||||
<maven.compiler.version>3.1</maven.compiler.version>
|
<maven.compiler.version>3.13.0</maven.compiler.version>
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
<maven.compiler.source>21</maven.compiler.source>
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
<maven.compiler.target>21</maven.compiler.target>
|
||||||
|
|
||||||
<maven.dependency.version>3.1.1</maven.dependency.version>
|
<maven.dependency.version>3.1.1</maven.dependency.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<repositories>
|
<repositories>
|
||||||
<repository>
|
<repository>
|
||||||
<id>gitea</id>
|
<id>gitea</id>
|
||||||
<url>https://gitea.atria-soft.org/api/packages/jatria-soft/maven</url>
|
<url>https://gitea.atria-soft.org/api/packages/org.atriasoft/maven</url>
|
||||||
</repository>
|
</repository>
|
||||||
</repositories>
|
</repositories>
|
||||||
<distributionManagement>
|
<distributionManagement>
|
||||||
<repository>
|
<repository>
|
||||||
<id>gitea</id>
|
<id>gitea</id>
|
||||||
<url>https://gitea.atria-soft.org/api/packages/jatria-soft/maven</url>
|
<url>https://gitea.atria-soft.org/api/packages/org.atriasoft/maven</url>
|
||||||
</repository>
|
</repository>
|
||||||
<snapshotRepository>
|
<snapshotRepository>
|
||||||
<id>gitea</id>
|
<id>gitea</id>
|
||||||
<url>https://gitea.atria-soft.org/api/packages/jatria-soft/maven</url>
|
<url>https://gitea.atria-soft.org/api/packages/org.atriasoft/maven</url>
|
||||||
</snapshotRepository>
|
</snapshotRepository>
|
||||||
</distributionManagement>
|
</distributionManagement>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>jatria-soft</groupId>
|
<groupId>org.atriasoft</groupId>
|
||||||
<artifactId>etk</artifactId>
|
<artifactId>etk</artifactId>
|
||||||
<version>0.1.0</version>
|
<version>0.1.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>jatria-soft</groupId>
|
<groupId>org.atriasoft</groupId>
|
||||||
<artifactId>aknot</artifactId>
|
<artifactId>aknot</artifactId>
|
||||||
<version>0.1.0</version>
|
<version>0.1.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
@ -12,7 +12,6 @@ open module org.atriasoft.ejson {
|
|||||||
exports org.atriasoft.ejson.parser;
|
exports org.atriasoft.ejson.parser;
|
||||||
|
|
||||||
requires transitive org.atriasoft.etk;
|
requires transitive org.atriasoft.etk;
|
||||||
requires transitive org.atriasoft.reggol;
|
|
||||||
requires java.base;
|
requires java.base;
|
||||||
requires org.atriasoft.aknot;
|
requires org.atriasoft.aknot;
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@ public class ParseJson {
|
|||||||
|
|
||||||
boolean iParseArray(final Object parent, final String data, final PositionParsing pos, final FilePos filePos, final ParsingProperty parsingProperty) throws EjsonException, AknotException {
|
boolean iParseArray(final Object parent, final String data, final PositionParsing pos, final FilePos filePos, final ParsingProperty parsingProperty) throws EjsonException, AknotException {
|
||||||
for (int iii = pos.value; iii < data.length(); iii++) {
|
for (int iii = pos.value; iii < data.length(); iii++) {
|
||||||
//Log.verbose("parse Array: '{}'", data.charAt(iii));
|
//LOGGER.trace("parse Array: '{}'", data.charAt(iii));
|
||||||
filePos.check(data.charAt(iii));
|
filePos.check(data.charAt(iii));
|
||||||
if (data.charAt(iii) == ' ' || data.charAt(iii) == '\t' || data.charAt(iii) == '\n' || data.charAt(iii) == '\r') {
|
if (data.charAt(iii) == ' ' || data.charAt(iii) == '\t' || data.charAt(iii) == '\n' || data.charAt(iii) == '\r') {
|
||||||
// white space == > nothing to do ...
|
// white space == > nothing to do ...
|
||||||
@ -218,7 +218,7 @@ public class ParseJson {
|
|||||||
boolean backslashPrevious = false;
|
boolean backslashPrevious = false;
|
||||||
final StringBuilder out = new StringBuilder();
|
final StringBuilder out = new StringBuilder();
|
||||||
for (int iii = pos.value + 1; iii < data.length(); iii++) {
|
for (int iii = pos.value + 1; iii < data.length(); iii++) {
|
||||||
//Log.verbose("parse String: '{}'", data.charAt(iii));
|
//LOGGER.trace("parse String: '{}'", data.charAt(iii));
|
||||||
filePos.check(data.charAt(iii));
|
filePos.check(data.charAt(iii));
|
||||||
if (data.charAt(iii) == '\\') {
|
if (data.charAt(iii) == '\\') {
|
||||||
if (backslashPrevious) {
|
if (backslashPrevious) {
|
||||||
@ -275,7 +275,7 @@ public class ParseJson {
|
|||||||
startPos = pos.value;
|
startPos = pos.value;
|
||||||
}
|
}
|
||||||
for (int iii = startPos; iii < data.length(); iii++) {
|
for (int iii = startPos; iii < data.length(); iii++) {
|
||||||
//Log.verbose("parse Object: '{}'", data.charAt(iii));
|
//LOGGER.trace("parse Object: '{}'", data.charAt(iii));
|
||||||
filePos.check(data.charAt(iii));
|
filePos.check(data.charAt(iii));
|
||||||
if (data.charAt(iii) == ' ' || data.charAt(iii) == '\t' || data.charAt(iii) == '\n' || data.charAt(iii) == '\r') {
|
if (data.charAt(iii) == ' ' || data.charAt(iii) == '\t' || data.charAt(iii) == '\n' || data.charAt(iii) == '\r') {
|
||||||
// white space == > nothing to do ...
|
// white space == > nothing to do ...
|
||||||
|
@ -214,7 +214,7 @@ public class EjsonTestAll {
|
|||||||
"logLocation": "/usr/local/tomcat/logs/CofaxTools.log",
|
"logLocation": "/usr/local/tomcat/logs/CofaxTools.log",
|
||||||
"logMaxSize": "",
|
"logMaxSize": "",
|
||||||
"dataLog": 1,
|
"dataLog": 1,
|
||||||
"dataLogLocation": "/usr/local/tomcat/logs/dataLog.log",
|
"dataLogLocation": "/usr/local/tomcat/logs/dataLOGGER.log",
|
||||||
"dataLogMaxSize": "",
|
"dataLogMaxSize": "",
|
||||||
"removePageCache": "/content/admin/remove?cache=pages&id=",
|
"removePageCache": "/content/admin/remove?cache=pages&id=",
|
||||||
"removeTemplateCache": "/content/admin/remove?cache=templates&id=",
|
"removeTemplateCache": "/content/admin/remove?cache=templates&id=",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user