Skip to content
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

Jump to bottom

Cleanup the bom for prep on first release #69

Merged
merged 8 commits into from
Apr 27, 2024
Merged

Cleanup the bom for prep on first release #69

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
24acdae
[pom] Format and remove retired items
hazendaz Apr 27, 2024
0a87dd7
[pom] Set version to 3.5.16 snapshot
hazendaz Apr 27, 2024
cb77365
[pom] Remove maven plugin for migrations from bom
hazendaz Apr 27, 2024
c760b1b
[pom] Remove jpetstore from bom as sample project
hazendaz Apr 27, 2024
e660406
[pom] Remove base-bundle-descriptor as not needed for bom
hazendaz Apr 27, 2024
b1c50bf
[pom] Remove commented out items as not needed
hazendaz Apr 27, 2024
438cbf6
[pom] Place mybatis first so its version is preferred
hazendaz Apr 27, 2024
a54c6e7
[pom] Add comment to ibatis legacy support
hazendaz Apr 27, 2024
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
72 changes: 7 additions & 65 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
<groupId>org.mybatis</groupId>
<artifactId>mybatis-parent</artifactId>
<version>43</version>
<relativePath/>
<relativePath />
</parent>

<artifactId>mybatis-bom</artifactId>
<version>3.5.10-SNAPSHOT</version>
<version>3.5.16-SNAPSHOT</version>
<packaging>pom</packaging>

<name>mybatis-bom</name>
Expand Down Expand Up @@ -64,11 +64,11 @@

<dependencyManagement>
<dependencies>
<!-- Bundle Descriptor -->
<!-- Mybatis -->
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>base-bundle-descriptor</artifactId>
<version>11</version>
<artifactId>mybatis</artifactId>
<version>3.5.16</version>
</dependency>

<!-- Caches -->
Expand All @@ -77,13 +77,6 @@
<artifactId>mybatis-caffeine</artifactId>
<version>1.0.0</version>
</dependency>
<!-- Not released yet
<dependency>
<groupId>org.mybatis.caches</groupId>
<artifactId>mybatis-couchbase</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
-->
<dependency>
<groupId>org.mybatis.caches</groupId>
<artifactId>mybatis-ehcache</artifactId>
Expand All @@ -104,28 +97,12 @@
<artifactId>mybatis-memcached</artifactId>
<version>1.1.1</version>
</dependency>
<!-- Retired
<dependency>
<groupId>org.mybatis.caches</groupId>
<artifactId>mybatis-oscache</artifactId>
<version>1.0.2</version>
</dependency>
-->
<dependency>
<groupId>org.mybatis.caches</groupId>
<artifactId>mybatis-redis</artifactId>
<version>1.0.0-beta2</version>
</dependency>

<!-- Converters -->
<!-- Not released yet
<groupId>
<groupId>org.mybatis</groupId>
<artifactId>ibatis2mybatis</artifactId>
<version>1.0.0-SNAPSHOT</version>
</groupId>
-->

<!-- Extensions -->
<dependency>
<groupId>org.mybatis</groupId>
Expand Down Expand Up @@ -155,7 +132,7 @@
<version>1.5.0</version>
</dependency>

<!-- ibatis -->
<!-- ibatis (legacy support) -->
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis2</artifactId>
Expand All @@ -173,25 +150,6 @@
<artifactId>mybatis-migrations</artifactId>
<version>3.3.11</version>
</dependency>
<dependency>
<groupId>org.mybatis.maven</groupId>
<artifactId>migrations-maven-plugin</artifactId>
<version>1.1.4</version>
</dependency>

<!-- Mybatis -->
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>3.5.16</version>
</dependency>

<!-- Samples -->
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>jpetstore</artifactId>
<version>6.1.0</version>
</dependency>

<!-- Scala -->
<dependency>
Expand Down Expand Up @@ -224,23 +182,7 @@
<version>2.3.2</version>
</dependency>

<!-- Spring Native -->
<!-- Not released yet
<dependency>
<groupId>org.mybatis.spring.native</groupId>
<artifactId>mybatis-spring-native-core</artifactId>
<version>0.1.0-SNAPSHOT</version>
</dependency>
-->

<!-- Typehandlers -->
<!-- retired
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-typehandlers-jsr310</artifactId>
<version>1.0.2</version>
</dependency>
-->
<!-- Addons -->
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-typehandlers-threeten-extra</artifactId>
Expand Down