Skip to content

Commit

Permalink
Merge pull request #103 from corehunter/release/3.2.0
Browse files Browse the repository at this point in the history
Release 3.2.0
  • Loading branch information
hdbeukel committed Sep 6, 2017
2 parents 66545a4 + 8b57ebc commit 9951df3
Show file tree
Hide file tree
Showing 90 changed files with 9,531 additions and 2,022 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -8,3 +8,4 @@
**/.checkstyle
**/.DS_Store
**/.Rhistory
**/nbactions.xml
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -13,7 +13,7 @@ env:
- COMMAND="generate-test-sources javadoc:test-javadoc" # javadoc generation for test classes

install:
- travis_retry mvn install -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip -B -V
- travis_retry mvn clean install -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip -B -V

script:
- mvn $COMMAND
Expand Down
37 changes: 19 additions & 18 deletions build-tools/pom.xml
Expand Up @@ -2,25 +2,26 @@
<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">

<modelVersion>4.0.0</modelVersion>
<groupId>org.corehunter</groupId>
<parent>
<groupId>org.corehunter</groupId>
<artifactId>corehunter</artifactId>
<version>3.2.0</version>
</parent>

<artifactId>build-tools</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
<name>Build Tools</name>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
<packaging>jar</packaging>

<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration combine.self="override" />
</plugin>
</plugins>
</pluginManagement>
</build>

</project>
15 changes: 7 additions & 8 deletions corehunter-base/pom.xml
@@ -1,12 +1,10 @@
<?xml version="1.0"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.corehunter</groupId>
<artifactId>corehunter</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
</parent>

<artifactId>corehunter-base</artifactId>
Expand Down Expand Up @@ -56,6 +54,10 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
<!-- checkstyle -->
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
<!-- jar with dependencies -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -118,10 +120,7 @@
<configuration>
<target>
<!-- copy jar with dependencies to bin directory after packaging -->
<copy
file="${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar"
tofile="bin/corehunter-${project.version}.jar"
/>
<copy file="${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar" tofile="bin/corehunter-${project.version}.jar" />
</target>
</configuration>
<goals>
Expand Down

0 comments on commit 9951df3

Please sign in to comment.