Skip to content

Commit

Permalink
Merge pull request #101 from jeffgbutler/master
Browse files Browse the repository at this point in the history
Additional POM Tweaks and Bintray Configuration Updates
  • Loading branch information
jeffgbutler committed Jun 24, 2016
2 parents f0d6715 + 505926e commit 4ff09b4
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 9 deletions.
16 changes: 10 additions & 6 deletions core/mybatis-generator-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,16 @@
</dependency>
</dependencies>

<scm>
<url>http://github.com/mybatis/generator</url>
<connection>scm:git:ssh://github.com/mybatis/generator.git</connection>
<developerConnection>scm:git:ssh://git@github.com/mybatis/generator.git</developerConnection>
<tag>HEAD</tag>
</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>

<description>MyBatis Generator - a code generator for MyBatis and iBatis.</description>
<scm>
<url>https://github.com/mybatis/generator</url>
</scm>
</project>
2 changes: 1 addition & 1 deletion core/mybatis-generator-core/src/site/xhtml/index.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ AST walker to accomplish this. The Eclipse feature also has a few user interfac
that make the generator somewhat easier to run. Lastly, the Eclipse feature contributes
a full user manual for the generator to the Eclipse help system.</p>
<p>To install the eclipse feature, configure an Eclipse update site that points to
<a href="https://dl.bintray.com/jeffgbutler/mybatis-generator">https://dl.bintray.com/jeffgbutler/mybatis-generator</a>
<a href="https://dl.bintray.com/mybatis/mybatis-generator">https://dl.bintray.com/mybatis/mybatis-generator</a>
and install the feature using Eclipse P2. The plugin can also be found on the Eclipse marketplace
(<a href="https://marketplace.eclipse.org">https://marketplace.eclipse.org</a>).</p>

Expand Down
16 changes: 16 additions & 0 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -319,4 +319,20 @@
</profiles>

<description>Parent POM for MyBatis Generator</description>

<scm>
<url>https://github.com/mybatis/generator</url>
<connection>scm:git:ssh://github.com/mybatis/generator.git</connection>
<developerConnection>scm:git:ssh://git@github.com/mybatis/generator.git</developerConnection>
<tag>HEAD</tag>
</scm>
<issueManagement>
<system>GitHub Issue Management</system>
<url>https://github.com/mybatis/generator/issues</url>
</issueManagement>
<ciManagement>
<system>Travis CI</system>
<url>https://travis-ci.org/mybatis/generator/</url>
</ciManagement>

</project>
2 changes: 1 addition & 1 deletion eclipse/org.mybatis.generator.eclipse.site/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</activation>
<properties>
<p2.repo.base.directory>${project.build.directory}/p2-composite-repo</p2.repo.base.directory>
<bintray.subject>jeffgbutler</bintray.subject>
<bintray.subject>mybatis</bintray.subject>
<bintray.repo>mybatis-generator</bintray.repo>
<bintray.package>mybatis-generator</bintray.package>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion eclipse/org.mybatis.generator/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
</license>

<url>
<update label="MyBatis Generator Update Site" url="https://dl.bintray.com/jeffgbutler/mybatis-generator"/>
<update label="MyBatis Generator Update Site" url="https://dl.bintray.com/mybatis/mybatis-generator"/>
</url>

<plugin
Expand Down

0 comments on commit 4ff09b4

Please sign in to comment.