Skip to content

Commit

Permalink
Remove current year from license headers, keeping inception year.
Browse files Browse the repository at this point in the history
New version string format for internal development use.
Cleanup and add to gitattributes and gitignore.
Update Maven plugin versions to latest.
Use new shared-parent pom.
  • Loading branch information
Wulfspider authored and Chris Sanders committed Jul 27, 2013
1 parent 606f646 commit 12bd488
Show file tree
Hide file tree
Showing 1,227 changed files with 1,365 additions and 1,367 deletions.
8 changes: 7 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
# Normalize as LF in the repository, OS native locally
* text
* text=auto
*.java text

# Binary files that should not be modified
*.dat binary
*.db binary
*.icns binary
*.ico binary
*.key binary
*.jks binary
*.jpg binary
*.png binary
*.ttf binary
*.wav binary
JavaApplicationStub binary
64 changes: 40 additions & 24 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Compiled source #
###################
# Build #
#########
MANIFEST.MF
dependency-reduced-pom.xml

# Compiled #
############
bin
build
dist
lib
out
target
Expand All @@ -11,9 +18,11 @@ target
*.o
*.so

# Git #
#######
.git
# Databases #
#############
*.db
*.sql
*.sqlite

# Packages #
############
Expand All @@ -26,33 +35,32 @@ target
*.tar
*.zip

# Logs and databases #
######################
# Repository #
##############
.git

# Logging #
###########
/logs
*.log
*.sql
*.sqlite

# OS generated files #
######################
# Misc #
########
*.bak

# System #
##########
.DS_Store
ehthumbs.db
Icon?
Thumbs.db

# Build files #
#################
MANIFEST.MF
dependency-reduced-pom.xml

# Project files #
#####################
# Project #
###########
.classpath
.externalToolBuilders
.idea
.project
.settings
build
dist
nbproject
atlassian-ide-plugin.xml
build.xml
Expand All @@ -61,6 +69,14 @@ nb-configuration.xml
*.ipr
*.iws

# Misc files #
##############
*.bak
# Runtime #
###########
/cache
/config
/data
/natives
/plugins
/resources
/update
/updates
/worlds
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: java
jdk: oraclejdk7

install: mvn clean -DbuildNumber=${TRAVIS_BUILD_NUMBER}
script: mvn clean -DbuildNumber=${TRAVIS_BUILD_NUMBER} -DciSystem=travis -Dcommit=${TRAVIS_COMMIT}
after_success:
- export PROJECT_ARTIFACT_ID="`sed -n 's|.*<artifactId>\(.*\)</artifactId>.*|\1|p' $TRAVIS_BUILD_DIR/pom.xml | awk '{ print $1; exit }'`" && echo Project artifactId is $PROJECT_ARTIFACT_ID
- export PROJECT_NAME="`sed -n 's|.*<name>\(.*\)</name>.*|\1|p' $TRAVIS_BUILD_DIR/pom.xml | awk '{ print $1; exit }'`" && echo Project name is $PROJECT_NAME
Expand Down
2 changes: 1 addition & 1 deletion HEADER.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This file is part of ${name}.

${copyright} <${url}/>
Copyright (c) ${inceptionYear} ${organization} <${url}/>
${name} is licensed under the Spout License Version 1.

${name} is free software: you can redistribute it and/or modify it under
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ If you do not already have repo.spout.org in your repository list, you will need

<repository>
<id>spout-repo</id>
<url>http://repo.spout.org</url>
<url>http://nexus.spout.org/content/groups/public/</url>
</repository>

If you'd prefer to manually import the latest .jar file, you can get it from our [download site][Download], or from our [build server][Builds]. [![Build Status][Build Icon]][Builds]
Expand All @@ -61,12 +61,12 @@ Want to know how to use the API? Check out the latest [Javadoc].

[Project Logo]: http://cdn.spout.org/vanilla-github.png
[Company Logo]: http://cdn.spout.org/spout-github.png
[Homepage]: http://www.getvanilla.org
[Homepage]: http://www.spout.org
[Forums]: http://forums.spout.org
[License]: http://spout.in/licensev1
[Source]: https://github.com/VanillaDev/Vanilla
[Source]: https://github.com/Vanilla/Vanilla
[Download]: http://get.spout.org/dev/vanilla.jar
[Download Source]: https://github.com/VanillaDev/Vanilla/archive/master.zip
[Download Source]: https://github.com/Vanilla/Vanilla/archive/master.zip
[Builds]: http://build.spout.org/job/Vanilla
[Build Icon]: http://build.spout.org/job/Vanilla/badge/icon
[Javadoc]: http://jd.spout.org/vanilla/latest
Expand Down
Loading

0 comments on commit 12bd488

Please sign in to comment.