Skip to content

[pom] Run pom sort against poms #1086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 4, 2023
Merged

[pom] Run pom sort against poms #1086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
162 changes: 81 additions & 81 deletions core/mybatis-generator-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,86 @@
<artifactId>mybatis-generator-core</artifactId>
<packaging>jar</packaging>
<name>MyBatis Generator Core</name>


<description>MyBatis Generator - a code generator for MyBatis.</description>
<scm>
<tag>HEAD</tag>
<url>https://github.com/mybatis/generator</url>
</scm>

<distributionManagement>
<site>
<id>gh-pages</id>
<name>Mybatis Generator GitHub Pages</name>
<url>git:ssh://git@github.com/mybatis/generator.git?gh-pages#</url>
</site>
</distributionManagement>

<properties>
<checkstyle.config>${project.basedir}/../checkstyle-override.xml</checkstyle.config>
<module.name>org.mybatis.generator</module.name>
<sonar.sources>pom.xml,src/main/java</sonar.sources>
<sonar.tests>src/test/java,src/test/kotlin</sonar.tests>
</properties>

<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.javaparser</groupId>
<artifactId>javaparser-core</artifactId>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand All @@ -52,10 +124,10 @@
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
<phase>prepare-package</phase>
</execution>
</executions>
</plugin>
Expand All @@ -64,10 +136,10 @@
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>jar</goal>
</goals>
<phase>prepare-package</phase>
</execution>
</executions>
</plugin>
Expand Down Expand Up @@ -102,8 +174,8 @@
</plugin>

<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<executions>
<execution>
<id>compile</id>
Expand Down Expand Up @@ -147,92 +219,20 @@
</execution>
<execution>
<id>java-compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
<phase>compile</phase>
</execution>
<execution>
<id>java-test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
<goals>
<goal>testCompile</goal>
</goals>
<phase>test-compile</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.javaparser</groupId>
<artifactId>javaparser-core</artifactId>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<distributionManagement>
<site>
<id>gh-pages</id>
<name>Mybatis Generator GitHub Pages</name>
<url>git:ssh://git@github.com/mybatis/generator.git?gh-pages#</url>
</site>
</distributionManagement>

<description>MyBatis Generator - a code generator for MyBatis.</description>
<scm>
<url>https://github.com/mybatis/generator</url>
<tag>HEAD</tag>
</scm>
</project>
46 changes: 23 additions & 23 deletions core/mybatis-generator-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,34 @@
<packaging>maven-plugin</packaging>
<name>MyBatis Generator Maven Plugin</name>

<description>Maven plugin for MyBatis Generator.</description>

<properties>
<checkstyle.config>${project.basedir}/../checkstyle-override.xml</checkstyle.config>
<module.name>org.mybatis.generator.maven.plugin</module.name>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-core</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -60,27 +83,4 @@
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-core</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<description>Maven plugin for MyBatis Generator.</description>
</project>
2 changes: 1 addition & 1 deletion core/mybatis-generator-systests-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<artifactId>mybatis-generator-systests-common</artifactId>
<packaging>jar</packaging>
<name>MyBatis Generator Tests (Common Classes)</name>
<description>Shared classes for all the test projects.</description>

<properties>
<checkstyle.config>${project.basedir}/../checkstyle-override.xml</checkstyle.config>
Expand Down Expand Up @@ -58,5 +59,4 @@
</plugin>
</plugins>
</build>
<description>Shared classes for all the test projects.</description>
</project>
47 changes: 24 additions & 23 deletions core/mybatis-generator-systests-domtests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2006-2023 the original author or authors.
Expand All @@ -17,50 +18,63 @@
-->
<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>
<name>MyBatis Generator Tests (Java DOM Tests)</name>
<parent>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator</artifactId>
<version>1.4.3-SNAPSHOT</version>
</parent>
<artifactId>mybatis-generator-systests-domtests</artifactId>
<name>MyBatis Generator Tests (Java DOM Tests)</name>
<description>Tests for the Java DOM classes. Generates Java classes and fails if the classes won't compile.</description>

<properties>
<generated.source.directory>${project.build.directory}/generated-test-sources/mybatis-generator-domtest</generated.source.directory>
<checkstyle.config>${project.basedir}/../checkstyle-override.xml</checkstyle.config>
</properties>


<dependencies>
<dependency>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<mainClass>mbg.domtest.GenerateTestSourceFiles</mainClass>
<arguments>
<argument>${generated.source.directory}</argument>
</arguments>
</configuration>
<executions>
<execution>
<id>generate-test-sources</id>
<phase>generate-test-sources</phase>
<goals>
<goal>java</goal>
</goals>
<phase>generate-test-sources</phase>
</execution>
</executions>
<configuration>
<mainClass>mbg.domtest.GenerateTestSourceFiles</mainClass>
<arguments>
<argument>${generated.source.directory}</argument>
</arguments>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-test-source</id>
<phase>generate-test-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<phase>generate-test-sources</phase>
<configuration>
<sources>
<source>${generated.source.directory}</source>
Expand Down Expand Up @@ -100,17 +114,4 @@
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
</dependency>
</dependencies>
<description>Tests for the Java DOM classes. Generates Java classes and fails if the classes won't compile.</description>
</project>
Loading