Skip to content

More jakarta work and prepare for new site distro #620

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 4 commits into from
Nov 4, 2023
Merged

More jakarta work and prepare for new site distro #620

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c1ec298
[pom] Prepare for new site distro
hazendaz Nov 4, 2023
3f6fd40
[pom] Remove snapshots usage as noted reason addressed
hazendaz Nov 4, 2023
8c73707
[pom] Bump geronimo connector to 4.0.0 and remove exclusions for jakarta
hazendaz Nov 4, 2023
a87f4ea
[pom] Remove legacy exclusions from guice
hazendaz Nov 4, 2023
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
46 changes: 4 additions & 42 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
<relativePath />
</parent>

<groupId>org.mybatis</groupId>
<artifactId>mybatis-guice</artifactId>
<version>3.19-SNAPSHOT</version>
<packaging>jar</packaging>

<name>mybatis-guice</name>
<description>The MyBatis Guice module is easy-to-use Google Guice bridge for MyBatis sql mapping framework.</description>
Expand Down Expand Up @@ -66,7 +66,7 @@

<scm>
<url>http://github.com/mybatis/guice</url>
<connection>scm:git:ssh://github.com/mybatis/guice.git</connection>
<connection>scm:git:ssh://git@github.com/mybatis/guice.git</connection>
<developerConnection>scm:git:ssh://git@github.com/mybatis/guice.git</developerConnection>
<tag>HEAD</tag>
</scm>
Expand All @@ -80,9 +80,9 @@
</ciManagement>
<distributionManagement>
<site>
<id>gh-pages</id>
<id>gh-pages-scm</id>
<name>Mybatis GitHub Pages</name>
<url>git:ssh://git@github.com/mybatis/guice.git?gh-pages#</url>
<url>scm:git:ssh://git@github.com/mybatis/guice.git</url>
</site>
</distributionManagement>

Expand Down Expand Up @@ -121,16 +121,6 @@
<artifactId>guice</artifactId>
<version>${guice.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
Expand Down Expand Up @@ -343,20 +333,6 @@
<artifactId>geronimo-connector</artifactId>
<version>4.0.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-transaction</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-validation_1.0_spec</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -394,20 +370,6 @@
</dependency>
</dependencies>

<!-- TODO: Allow pull from snapshots while on mybatis parent snapshot, remove once finalized -->
<repositories>
<repository>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>oss.sonatype.org-snapshot</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>

<build>
<plugins>
<plugin>
Expand Down