Skip to content

Commit

Permalink
Merge branch '1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaelsembwever
michaelsembwever committed Aug 2, 2018
2 parents a2157fb + c16a728 commit 13732fb
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 11 deletions.
68 changes: 67 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<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>
<prerequisites><maven>${maven.version.minimum}</maven></prerequisites>

<groupId>io.cassandrareaper</groupId>
<artifactId>cassandra-reaper-pom</artifactId>
Expand Down Expand Up @@ -112,8 +113,48 @@
</modules>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-java</id>
<goals><goal>enforce</goal></goals>
<configuration>
<rules>
<requireJavaVersion>
<version>[${build.jdk.minimum},)</version>
</requireJavaVersion>
<requireMavenVersion>
<version>[${maven.version.minimum},)</version>
</requireMavenVersion>
<banDuplicatePomDependencyVersions/>
<reactorModuleConvergence/>
<requirePluginVersions/>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.7.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.21.0</version>
Expand All @@ -129,6 +170,19 @@
<workingDirectory>${project.build.directory}</workingDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand All @@ -138,7 +192,6 @@
<profile>

<id>release</id>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -184,13 +237,26 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<skip>false</skip>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.jdk>1.8</version.jdk>
<!-- travis of July 2018 was still using _151 -->
<build.jdk.minimum>1.8.0-151</build.jdk.minimum>
<!-- travis of July 2018 was still using maven-3.5.2 -->
<maven.version.minimum>3.5.2</maven.version.minimum>

<!--
Properties that influence various parts of the NetBeans IDE, especially code formatting and the like.
Expand Down
11 changes: 5 additions & 6 deletions src/ci/script.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ case "${TEST_TYPE}" in
exit 1
;;
"ccm")
mvn --version
ccm start
sleep 30
ccm status
Expand All @@ -21,15 +22,13 @@ case "${TEST_TYPE}" in
BETA_VERSION=$(echo $VERSION | sed "s/SNAPSHOT/BETA/")
mvn versions:set "-DnewVersion=${BETA_VERSION}-${DATE}"
fi

if [ "x${GRIM_MIN}" = "x" ]
if mvn help:evaluate -Dexpression=project.version | grep -v "^\[" | grep -q SNAPSHOT
then
# Rebuild the UI to get the right version number there
MAVEN_OPTS="-Xmx1g" mvn clean generate-sources 1> /dev/null
MAVEN_OPTS="-Xmx1g" mvn clean install
else
MAVEN_OPTS="-Xmx1g" mvn clean install -Prelease
fi

MAVEN_OPTS="-Xmx1g" mvn clean install

if [ "x${GRIM_MIN}" = "x" ]
then
mvn surefire:test -Dtest=ReaperIT
Expand Down
14 changes: 10 additions & 4 deletions src/server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<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>
<prerequisites><maven>${maven.version.minimum}</maven></prerequisites>

<parent>
<groupId>io.cassandrareaper</groupId>
Expand All @@ -14,7 +15,6 @@
<packaging>jar</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<dropwizard.version>1.1.7</dropwizard.version>
<docker.directory>src/main/docker</docker.directory>
<timestamp>${maven.build.timestamp}</timestamp>
Expand Down Expand Up @@ -269,8 +269,9 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>${version.jdk}</source>
<target>${version.jdk}</target>
<encoding>${project.build.sourceEncoding}</encoding>
<optimize>true</optimize>
<debug>true</debug>
<compilerId>javac-with-errorprone</compilerId>
Expand Down Expand Up @@ -443,7 +444,12 @@
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<directory>../ui/build</directory>
<filesets>
<fileset>
<directory>${project.build.directory}</directory>
<directory>../ui/build</directory>
</fileset>
</filesets>
</configuration>
</plugin>
<plugin>
Expand Down

0 comments on commit 13732fb

Please sign in to comment.