-
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/develop'
- Loading branch information
Showing
28 changed files
with
3,526 additions
and
2,791 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,33 +1,87 @@ | ||
# Compiled class file | ||
*.class | ||
# Git | ||
*.orig | ||
!.gitignore | ||
|
||
# Log file | ||
*.log | ||
# Windows | ||
Thumbs.db | ||
ehthumbs.db | ||
ehthumbs_vista.db | ||
*.stackdump | ||
[Dd]esktop.ini | ||
$RECYCLE.BIN/ | ||
*.lnk | ||
|
||
# BlueJ files | ||
*.ctxt | ||
# Linux | ||
*~ | ||
.fuse_hidden* | ||
.directory | ||
.Trash-* | ||
.nfs* | ||
|
||
# Mobile Tools for Java (J2ME) | ||
.mtj.tmp/ | ||
# MacOS | ||
.DS_Store | ||
.AppleDouble | ||
.LSOverride | ||
._* | ||
|
||
# Package Files # | ||
# Java | ||
*.class | ||
*.log | ||
*.ctxt | ||
.mtj.tmp/ | ||
*.jar | ||
*.war | ||
*.nar | ||
*.ear | ||
*.zip | ||
*.tar.gz | ||
*.rar | ||
|
||
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml | ||
hs_err_pid* | ||
|
||
### Intellij ### | ||
.idea/ | ||
# Maven | ||
target/ | ||
out/ | ||
pom.xml.tag | ||
pom.xml.releaseBackup | ||
pom.xml.versionsBackup | ||
pom.xml.next | ||
release.properties | ||
dependency-reduced-pom.xml | ||
buildNumber.properties | ||
|
||
## File-based project format: | ||
# Intellij | ||
*.iml | ||
*.java___jb_tmp___ | ||
.idea/* | ||
*.ipr | ||
*.iws | ||
*.iml | ||
/out/ | ||
.idea_modules/ | ||
|
||
# Eclipse | ||
*.pydevproject | ||
.metadata | ||
.gradle | ||
bin/ | ||
tmp/ | ||
*.tmp | ||
*.bak | ||
*.swp | ||
*~.nib | ||
local.properties | ||
.settings/ | ||
.loadpath | ||
.project | ||
.externalToolBuilders/ | ||
*.launch | ||
.cproject | ||
.classpath | ||
.buildpath | ||
.target | ||
|
||
# NetBeans | ||
nbproject/private/ | ||
build/ | ||
nbbuild/ | ||
dist/ | ||
nbdist/ | ||
nbactions.xml | ||
nb-configuration.xml | ||
.nb-gradle/ | ||
/.idea/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
language: java | ||
sudo: false | ||
addons: | ||
sonarcloud: | ||
organization: "bentobox-world" | ||
|
||
jdk: | ||
- openjdk8 | ||
- openjdk11 | ||
|
||
matrix: | ||
allow_failures: | ||
- jdk: openjdk11 | ||
|
||
script: | ||
# the following command line builds the project, runs the tests with coverage and then execute the SonarCloud analysis | ||
- mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar -Dsonar.projectKey=BentoBoxWorld_Likes | ||
|
||
cache: | ||
directories: | ||
- '$HOME/.m2/repository' | ||
- '$HOME/.sonar/cache' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<project xmlns="http://maven.apache.org/POM/4.0.0" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
|
||
<groupId>world.bentobox</groupId> | ||
|
@@ -14,30 +14,31 @@ | |
|
||
<inceptionYear>2019</inceptionYear> | ||
|
||
<!-- SCM is a GitHub link to your project --> | ||
<!-- Can be removed --> | ||
<!-- SCM is a GitHub link to your project --> | ||
<!-- Can be removed --> | ||
<scm> | ||
<connection>scm:git:https://github.com/BentoBoxWorld/Likes.git</connection> | ||
<developerConnection>scm:git:[email protected]:BentoBoxWorld/Likes.git</developerConnection> | ||
<url>https://github.com/BentoBoxWorld/Likes</url> | ||
</scm> | ||
|
||
<!-- ciManagement is a build server that runs builds for your project --> | ||
<!-- Can be removed --> | ||
<!-- ciManagement is a build server that runs builds for your project --> | ||
<!-- Can be removed --> | ||
<ciManagement> | ||
<system>jenkins</system> | ||
<url>http://ci.codemc.org/job/BentoBoxWorld/job/Likes</url> | ||
</ciManagement> | ||
|
||
<!-- issueManagement is a link to issues page. --> | ||
<!-- Can be removed --> | ||
<!-- issueManagement is a link to issues page. --> | ||
<!-- Can be removed --> | ||
<issueManagement> | ||
<system>GitHub</system> | ||
<url>https://github.com/BentoBoxWorld/Likes/issues</url> | ||
</issueManagement> | ||
|
||
<!-- distributionManagement contains public maven repositories for your addon --> | ||
<!-- Can be removed --> | ||
<!-- distributionManagement contains public maven repositories for your | ||
addon --> | ||
<!-- Can be removed --> | ||
<distributionManagement> | ||
<snapshotRepository> | ||
<id>codemc-snapshots</id> | ||
|
@@ -49,9 +50,10 @@ | |
</repository> | ||
</distributionManagement> | ||
|
||
<!-- Properties contains all variables that can offten change, f.e. BentoBox API version --> | ||
<!-- Properties contains all variables that can offten change, f.e. BentoBox | ||
API version --> | ||
<properties> | ||
<!-- Some JAVA encoding settings --> | ||
<!-- Some JAVA encoding settings --> | ||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> | ||
<java.version>1.8</java.version> | ||
|
@@ -69,7 +71,7 @@ | |
<!-- Revision variable removes warning about dynamic version --> | ||
<revision>${build.version}-SNAPSHOT</revision> | ||
<!-- This allows to change between versions and snapshots. --> | ||
<build.version>1.7.0</build.version> | ||
<build.version>1.7.1</build.version> | ||
<build.number>-LOCAL</build.number> | ||
</properties> | ||
|
||
|
@@ -83,7 +85,7 @@ | |
</activation> | ||
<properties> | ||
<!-- Override only if necessary --> | ||
<build.number>-#${env.BUILD_NUMBER}</build.number> | ||
<build.number>-b${env.BUILD_NUMBER}</build.number> | ||
<!-- GIT_BRANCH --> | ||
</properties> | ||
</profile> | ||
|
@@ -98,13 +100,37 @@ | |
<properties> | ||
<!-- Override only if necessary --> | ||
<revision>${build.version}</revision> | ||
<!-- Empties build number variable.--> | ||
<!-- Empties build number variable. --> | ||
<build.number></build.number> | ||
</properties> | ||
</profile> | ||
<profile> | ||
<id>sonar</id> | ||
<properties> | ||
<sonar.host.url>https://sonarcloud.io</sonar.host.url> | ||
<sonar.organization>bentobox-world</sonar.organization> | ||
</properties> | ||
<build> | ||
<plugins> | ||
<plugin> | ||
<groupId>org.sonarsource.scanner.maven</groupId> | ||
<artifactId>sonar-maven-plugin</artifactId> | ||
<version>3.6.0.1398</version> | ||
<executions> | ||
<execution> | ||
<phase>verify</phase> | ||
<goals> | ||
<goal>sonar</goal> | ||
</goals> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
</profile> | ||
</profiles> | ||
|
||
<!-- Repositories contains links from were dependencies will be searched --> | ||
<!-- Repositories contains links from were dependencies will be searched --> | ||
<repositories> | ||
<repository> | ||
<id>spigot-repo</id> | ||
|
@@ -124,7 +150,7 @@ | |
</repository> | ||
</repositories> | ||
|
||
<!-- Your addon must contain Spigot and BentoBox APIs dependencies. --> | ||
<!-- Your addon must contain Spigot and BentoBox APIs dependencies. --> | ||
<dependencies> | ||
<dependency> | ||
<groupId>org.spigotmc</groupId> | ||
|
@@ -153,7 +179,8 @@ | |
</dependency> | ||
</dependencies> | ||
|
||
<!-- Build contains information for maven. It allows to create correct jar file. --> | ||
<!-- Build contains information for maven. It allows to create correct | ||
jar file. --> | ||
<build> | ||
<finalName>${project.name}-${revision}${build.number}</finalName> | ||
|
||
|
@@ -255,6 +282,33 @@ | |
<artifactId>maven-install-plugin</artifactId> | ||
<version>2.5.2</version> | ||
</plugin> | ||
<plugin> | ||
<groupId>org.jacoco</groupId> | ||
<artifactId>jacoco-maven-plugin</artifactId> | ||
<version>0.8.3</version> | ||
<configuration> | ||
<append>true</append> | ||
<excludes> | ||
<!-- This is required to prevent Jacoco from adding | ||
synthetic fields to a JavaBean class (causes errors in testing) --> | ||
<exclude>**/*Names*</exclude> | ||
</excludes> | ||
</configuration> | ||
<executions> | ||
<execution> | ||
<id>pre-unit-test</id> | ||
<goals> | ||
<goal>prepare-agent</goal> | ||
</goals> | ||
</execution> | ||
<execution> | ||
<id>post-unit-test</id> | ||
<goals> | ||
<goal>report</goal> | ||
</goals> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
|
||
|
Oops, something went wrong.