Skip to content

Commit

Permalink
Cleanup plugin name change from manual merge of tomcat8 repo
Browse files Browse the repository at this point in the history
  • Loading branch information
bobbywarner committed Jul 10, 2014
1 parent 67661a6 commit 880bd9c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>grails-tomcat8</name>
<name>tomcat</name>
<comment></comment>
<projects>
</projects>
Expand All @@ -26,7 +26,7 @@
<link>
<name>.link_to_grails_plugins</name>
<type>2</type>
<location>/home/burt/workspace.grails/plugins/grails-tomcat8-plugin/target/plugins</location>
<locationURI>GRAILS_ROOT/grails-tomcat-plugin/target/plugins</locationURI>
</link>
</linkedResources>
</projectDescription>
2 changes: 1 addition & 1 deletion TomcatGrailsPlugin.groovy
Expand Up @@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
class Tomcat8GrailsPlugin {
class TomcatGrailsPlugin {
def version = '8.0.5.1-SNAPSHOT'
def grailsVersion = '2.3 > *'
def scopes = [excludes: 'war']
Expand Down
2 changes: 1 addition & 1 deletion scripts/_Events.groovy
Expand Up @@ -8,7 +8,7 @@ eventCreatePluginArchiveStart = { stagingDir ->
return
}

ant.jar(destfile: "$stagingDir/grails-plugin-tomcat8-${plugin.version}.jar", filesonly: true) {
ant.jar(destfile: "$stagingDir/grails-plugin-tomcat-${plugin.version}.jar", filesonly: true) {
fileset(dir: classesDir, includes: 'org/grails/plugins/tomcat/**/*.class')
}
}
2 changes: 1 addition & 1 deletion travis-build.sh
Expand Up @@ -16,7 +16,7 @@ plugin=${plugin/"-$version"/}

echo "Publishing plugin $plugin with version $version"

if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_REPO_SLUG == "grails-plugins/grails-tomcat8-plugin" && $TRAVIS_PULL_REQUEST == 'false' ]]; then
if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_REPO_SLUG == "grails-plugins/grails-tomcat-plugin" && $TRAVIS_PULL_REQUEST == 'false' ]]; then
git config --global user.name "$GIT_NAME"
git config --global user.email "$GIT_EMAIL"
git config --global credential.helper "store --file=~/.git-credentials"
Expand Down

0 comments on commit 880bd9c

Please sign in to comment.