JAVA-21189: Formatting pom.xml modules starting from KLM (#14096)
This commit is contained in:
parent
2cdf336d57
commit
90f569018a
@ -109,19 +109,16 @@
|
|||||||
<artifactId>javafx-fxml</artifactId>
|
<artifactId>javafx-fxml</artifactId>
|
||||||
<version>${javafx.version}</version>
|
<version>${javafx.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-core</artifactId>
|
<artifactId>jackson-core</artifactId>
|
||||||
<version>${jackson-core.version}</version>
|
<version>${jackson-core.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-annotations</artifactId>
|
<artifactId>jackson-annotations</artifactId>
|
||||||
<version>${jackson-annotations.version}</version>
|
<version>${jackson-annotations.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
@ -144,6 +141,7 @@
|
|||||||
<glassfish.web.version>2.2.4</glassfish.web.version>
|
<glassfish.web.version>2.2.4</glassfish.web.version>
|
||||||
<olap4j.version>1.2.0</olap4j.version>
|
<olap4j.version>1.2.0</olap4j.version>
|
||||||
<javafx.version>19</javafx.version>
|
<javafx.version>19</javafx.version>
|
||||||
|
<spoon-core.version>10.3.0</spoon-core.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
</project>
|
</project>
|
@ -58,7 +58,7 @@
|
|||||||
<argument>-javaagent:${co.paralleluniverse:quasar-core:jar}</argument>
|
<argument>-javaagent:${co.paralleluniverse:quasar-core:jar}</argument>
|
||||||
<!-- Classpath -->
|
<!-- Classpath -->
|
||||||
<argument>-classpath</argument>
|
<argument>-classpath</argument>
|
||||||
<classpath />
|
<classpath/>
|
||||||
<!-- Main class -->
|
<!-- Main class -->
|
||||||
<argument>com.baeldung.quasar.App</argument>
|
<argument>com.baeldung.quasar.App</argument>
|
||||||
</arguments>
|
</arguments>
|
||||||
|
@ -178,23 +178,22 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<tasks>
|
<tasks>
|
||||||
<property name="plugin_classpath"
|
<property name="plugin_classpath"
|
||||||
refid="maven.plugin.classpath" />
|
refid="maven.plugin.classpath"/>
|
||||||
<taskdef name="gen-reladomo" classpath="plugin_classpath"
|
<taskdef name="gen-reladomo" classpath="plugin_classpath"
|
||||||
classname="com.gs.fw.common.mithra.generator.MithraGenerator" />
|
classname="com.gs.fw.common.mithra.generator.MithraGenerator"/>
|
||||||
<gen-reladomo
|
<gen-reladomo
|
||||||
xml="${project.basedir}/src/main/resources/reladomo/ReladomoClassList.xml"
|
xml="${project.basedir}/src/main/resources/reladomo/ReladomoClassList.xml"
|
||||||
generatedDir="${project.build.directory}/generated-sources/reladomo"
|
generatedDir="${project.build.directory}/generated-sources/reladomo"
|
||||||
nonGeneratedDir="${project.basedir}/src/main/java" />
|
nonGeneratedDir="${project.basedir}/src/main/java"/>
|
||||||
|
|
||||||
<taskdef name="gen-ddl"
|
<taskdef name="gen-ddl"
|
||||||
classname="com.gs.fw.common.mithra.generator.dbgenerator.MithraDbDefinitionGenerator"
|
classname="com.gs.fw.common.mithra.generator.dbgenerator.MithraDbDefinitionGenerator"
|
||||||
loaderRef="reladomoGenerator">
|
loaderRef="reladomoGenerator">
|
||||||
<classpath refid="maven.plugin.classpath" />
|
<classpath refid="maven.plugin.classpath"/>
|
||||||
</taskdef>
|
</taskdef>
|
||||||
<gen-ddl
|
<gen-ddl
|
||||||
xml="${project.basedir}/src/main/resources/reladomo/ReladomoClassList.xml"
|
xml="${project.basedir}/src/main/resources/reladomo/ReladomoClassList.xml"
|
||||||
generatedDir="${project.build.directory}/generated-db/sql"
|
generatedDir="${project.build.directory}/generated-db/sql"
|
||||||
databaseType="postgres" />
|
databaseType="postgres"/>
|
||||||
</tasks>
|
</tasks>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
<modules>
|
<modules>
|
||||||
<module>lombok</module>
|
<module>lombok</module>
|
||||||
<module>lombok-2</module>
|
<module>lombok-2</module>
|
||||||
<!-- <module>lombok-custom</module>--> <!-- this module uses legacy jdk-8 features (tools.jar), so can't upgrade to jdk9 or above-->
|
<!-- <module>lombok-custom</module>--> <!-- this module uses legacy jdk-8 features (tools.jar), so can't upgrade to jdk9 or above-->
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
@ -22,10 +22,10 @@
|
|||||||
<phase>generate-sources</phase>
|
<phase>generate-sources</phase>
|
||||||
<configuration>
|
<configuration>
|
||||||
<target>
|
<target>
|
||||||
<mkdir dir="${basedir}/target/destination-folder" />
|
<mkdir dir="${basedir}/target/destination-folder"/>
|
||||||
<copy todir="${basedir}/target/destination-folder">
|
<copy todir="${basedir}/target/destination-folder">
|
||||||
<fileset dir="${basedir}/source-files"
|
<fileset dir="${basedir}/source-files"
|
||||||
includes="foo.txt" />
|
includes="foo.txt"/>
|
||||||
</copy>
|
</copy>
|
||||||
</target>
|
</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>enforce-file-exists</id>
|
<id>enforce-file-exists</id>
|
||||||
<phase />
|
<phase/>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<rules>
|
<rules>
|
||||||
<banDuplicatePomDependencyVersions />
|
<banDuplicatePomDependencyVersions/>
|
||||||
<requireMavenVersion>
|
<requireMavenVersion>
|
||||||
<version>3.0</version>
|
<version>3.0</version>
|
||||||
<message>Invalid Maven version. It should, at least, be 3.0</message>
|
<message>Invalid Maven version. It should, at least, be 3.0</message>
|
||||||
|
@ -27,12 +27,12 @@
|
|||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<target>
|
<target>
|
||||||
<echo message="Hello, world" />
|
<echo message="Hello, world"/>
|
||||||
<echo message="Embed a line break: ${line.separator}" />
|
<echo message="Embed a line break: ${line.separator}"/>
|
||||||
<echo message="Build dir: ${project.build.directory}"
|
<echo message="Build dir: ${project.build.directory}"
|
||||||
level="info" />
|
level="info"/>
|
||||||
<echo file="${basedir}/logs/log-ant-run.txt" append="true"
|
<echo file="${basedir}/logs/log-ant-run.txt" append="true"
|
||||||
message="Save to file!" />
|
message="Save to file!"/>
|
||||||
</target>
|
</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
|
@ -90,7 +90,7 @@
|
|||||||
<mainClass>${exec.mainClass}</mainClass>
|
<mainClass>${exec.mainClass}</mainClass>
|
||||||
</transformer>
|
</transformer>
|
||||||
<transformer
|
<transformer
|
||||||
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
|
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
|
||||||
</transformers>
|
</transformers>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
@ -103,7 +103,7 @@
|
|||||||
<executable>java</executable>
|
<executable>java</executable>
|
||||||
<arguments>
|
<arguments>
|
||||||
<argument>-classpath</argument>
|
<argument>-classpath</argument>
|
||||||
<classpath />
|
<classpath/>
|
||||||
<argument>${exec.mainClass}</argument>
|
<argument>${exec.mainClass}</argument>
|
||||||
</arguments>
|
</arguments>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<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">
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>microservices-modules</artifactId>
|
<artifactId>microservices-modules</artifactId>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user