Skip to content

Commit

Permalink
Merge pull request #154 from hazendaz/master
Browse files Browse the repository at this point in the history 
[pom] Sort pom and remove transaction api as not needed
  • Loading branch information
@hazendaz
hazendaz authored Feb 10, 2024
2 parents e8f0d5f + 0300623 commit bf728c7
Show file tree
Hide file tree
Showing 2 changed files with 126 additions and 134 deletions.
258 changes: 125 additions & 133 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2016-2023 the original author or authors.
Copyright 2016-2024 the original author or authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -18,137 +18,129 @@
-->
<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>

<parent>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-parent</artifactId>
<version>42</version>
<relativePath />
</parent>

<groupId>org.mybatis.caches</groupId>
<artifactId>mybatis-ignite</artifactId>
<version>1.1.2-SNAPSHOT</version>

<name>mybatis-ignite</name>
<description>Ignite support for MyBatis Cache</description>
<url>https://www.mybatis.org/ignite-cache/</url>

<inceptionYear>2016</inceptionYear>

<scm>
<url>https://github.com/mybatis/ignite-cache/</url>
<connection>scm:git:ssh://[email protected]/mybatis/ignite-cache.git</connection>
<developerConnection>scm:git:ssh://[email protected]/mybatis/ignite-cache.git</developerConnection>
<tag>HEAD</tag>
</scm>
<issueManagement>
<system>GitHub Issue Management</system>
<url>https://github.com/mybatis/ignite-cache/issues</url>
</issueManagement>
<ciManagement>
<system>Github Actions</system>
<url>https://github.com/mybatis/ignite-cache/actions</url>
</ciManagement>
<distributionManagement>
<site>
<id>gh-pages-scm</id>
<name>Mybatis GitHub Pages</name>
<url>scm:git:ssh://[email protected]/mybatis/ignite-cache.git</url>
</site>
</distributionManagement>

<properties>
<clirr.comparisonVersion>1.0.6</clirr.comparisonVersion>
<findbugs.onlyAnalyze>org.mybatis.caches.ignite.*</findbugs.onlyAnalyze>
<gcu.product>Cache</gcu.product>
<module.name>org.mybatis.caches.ignite</module.name>

<ignite.version>2.16.0</ignite.version>
<slf4j.version>2.0.12</slf4j.version>

<!-- Reproducible Builds -->
<project.build.outputTimestamp>1670787925</project.build.outputTimestamp>
</properties>

<dependencies>
<!-- Provided dependencies -->
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>3.5.15</version>
<scope>provided</scope>
</dependency>

<!-- compile dependencies -->
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
<version>${ignite.version}</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-spring</artifactId>
<version>${ignite.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- trick to fix javadoc generation -->
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>1.3.3</version>
<scope>provided</scope>
</dependency>

<!-- test dependencies -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.10.2</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-slf4j</artifactId>
<version>${ignite.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<profiles>
<profile>
<id>jdk17on</id>
<activation>
<jdk>[17,)</jdk>
</activation>
<properties>
<argLine>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED</argLine>
</properties>
</profile>
</profiles>
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-parent</artifactId>
<version>42</version>
<relativePath />
</parent>

<groupId>org.mybatis.caches</groupId>
<artifactId>mybatis-ignite</artifactId>
<version>1.1.2-SNAPSHOT</version>

<name>mybatis-ignite</name>
<description>Ignite support for MyBatis Cache</description>
<url>https://www.mybatis.org/ignite-cache/</url>

<inceptionYear>2016</inceptionYear>

<scm>
<connection>scm:git:ssh://[email protected]/mybatis/ignite-cache.git</connection>
<developerConnection>scm:git:ssh://[email protected]/mybatis/ignite-cache.git</developerConnection>
<tag>HEAD</tag>
<url>https://github.com/mybatis/ignite-cache/</url>
</scm>
<issueManagement>
<system>GitHub Issue Management</system>
<url>https://github.com/mybatis/ignite-cache/issues</url>
</issueManagement>
<ciManagement>
<system>Github Actions</system>
<url>https://github.com/mybatis/ignite-cache/actions</url>
</ciManagement>
<distributionManagement>
<site>
<id>gh-pages-scm</id>
<name>Mybatis GitHub Pages</name>
<url>scm:git:ssh://[email protected]/mybatis/ignite-cache.git</url>
</site>
</distributionManagement>

<properties>
<clirr.comparisonVersion>1.0.6</clirr.comparisonVersion>
<findbugs.onlyAnalyze>org.mybatis.caches.ignite.*</findbugs.onlyAnalyze>
<gcu.product>Cache</gcu.product>
<module.name>org.mybatis.caches.ignite</module.name>

<ignite.version>2.16.0</ignite.version>
<slf4j.version>2.0.12</slf4j.version>

<!-- Reproducible Builds -->
<project.build.outputTimestamp>1670787925</project.build.outputTimestamp>
</properties>

<dependencies>
<!-- Provided dependencies -->
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>3.5.15</version>
<scope>provided</scope>
</dependency>

<!-- compile dependencies -->
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
<version>${ignite.version}</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-spring</artifactId>
<version>${ignite.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- test dependencies -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.10.2</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-slf4j</artifactId>
<version>${ignite.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<profiles>
<profile>
<id>jdk17on</id>
<activation>
<jdk>[17,)</jdk>
</activation>
<properties>
<argLine>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED</argLine>
</properties>
</profile>
</profiles>

</project>
2 changes: 1 addition & 1 deletion src/site/site.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2016-2022 the original author or authors.
Copyright 2016-2024 the original author or authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down

0 comments on commit bf728c7

Please sign in to comment.