Merge pull request #840 from hcoles/master

Release 1.6.1
hcoles · Dec 8, 2020 · 97abb15 · 97abb15
2 parents 7876f3c + c90f3ed
commit 97abb15
Show file tree

Hide file tree

Showing 16 changed files with 211 additions and 108 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,50 @@
+name: Release
+on:
+  push:
+    branches:
+      - release
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    # sonatype nexus sometimes hangs
+    timeout-minutes: 20
+    steps:
+      # The build number is stored as a tag in git
+      # If it needs to be reset (eg after a major number version change)
+      # run
+      # git tag -d build-number-<x>
+      # git push --delete origin build-number-<x>
+      - name: Generate build number
+        id: buildnumber
+        uses: einaregilsson/build-number@v3
+        with:
+          token: ${{secrets.github_token}}
+      - name: Install gpg secret key
+        run: |
+          cat <(echo -e "${{ secrets.GPG_SECRET_KEY }}") | gpg --batch --import
+          gpg --list-secret-keys --keyid-format LONG
+      - name: Checkout project
+        uses: actions/checkout@v2
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-maven-
+      - name: Setup Java JDK
+        uses: actions/[email protected]
+        with:
+          java-version: 8
+          server-id: ossrh
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
+      - name: Configure Git user
+        run: |
+          git config user.email "[email protected]"
+          git config user.name "GitHub Actions"
+      - name: Publish JAR
+        run: mvn -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE}} -B -Prelease deploy scm:tag -Drevision=${{ steps.buildnumber.outputs.build_number }} -DskipTests=true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,5 @@ target/
 *.iml
 .checkstyle
 dependency-reduced-pom.xml
+.flattened-pom.xml
 */bin
diff --git a/perform_release.sh b/perform_release.sh
diff --git a/pitest-aggregator/pom.xml b/pitest-aggregator/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.pitest</groupId>
 		<artifactId>pitest-parent</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.6.${revision}</version>
 	</parent>
 	<artifactId>pitest-aggregator</artifactId>
 	<description>Aggregates the output of report XML documents into a new combined HTML report</description>

diff --git a/pitest-ant/pom.xml b/pitest-ant/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>pitest-parent</artifactId>
 		<groupId>org.pitest</groupId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.6.${revision}</version>
 	</parent>
 	<artifactId>pitest-ant</artifactId>
 	<name>pitest-ant</name>
@@ -77,7 +77,11 @@
 						</configuration>
 					</execution>
 				</executions>
-
+			</plugin>
+			<!-- must run after shade -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>flatten-maven-plugin</artifactId>
 			</plugin>
 		</plugins>
 	</build>

diff --git a/pitest-build-config/pom.xml b/pitest-build-config/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>pitest-parent</artifactId>
     <groupId>org.pitest</groupId>
-    <version>1.5.3-SNAPSHOT</version>
+    <version>1.6.${revision}</version>
   </parent>
 
 </project>
diff --git a/pitest-command-line/pom.xml b/pitest-command-line/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>pitest-parent</artifactId>
 		<groupId>org.pitest</groupId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.6.${revision}</version>
 	</parent>
 	<artifactId>pitest-command-line</artifactId>
 	<name>pitest-command-line</name>
@@ -56,7 +56,11 @@
 				</executions>
 
 			</plugin>
-
+			<!-- must run after shade -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>flatten-maven-plugin</artifactId>
+			</plugin>
 		</plugins>
 
 	</build>

diff --git a/pitest-entry/pom.xml b/pitest-entry/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>pitest-parent</artifactId>
 		<groupId>org.pitest</groupId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.6.${revision}</version>
 	</parent>
 	<artifactId>pitest-entry</artifactId>
 	<name>pitest-entry</name>
@@ -35,6 +35,11 @@
 				</executions>
 
 			</plugin>
+			<!-- must run after shade -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>flatten-maven-plugin</artifactId>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>

diff --git a/pitest-groovy-verification/pom.xml b/pitest-groovy-verification/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>pitest-parent</artifactId>
 		<groupId>org.pitest</groupId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.6.${revision}</version>
 	</parent>
 	<artifactId>pitest-groovy-verification</artifactId>
 	<packaging>jar</packaging>
@@ -18,9 +18,10 @@
 		<plugins>
 		    <!-- Don't deploy to Maven Central -->
             <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
+				<groupId>org.sonatype.plugins</groupId>
+				<artifactId>nexus-staging-maven-plugin</artifactId>
                 <configuration>
-                    <skip>true</skip>
+					<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
                 </configuration>
             </plugin>
 

diff --git a/pitest-html-report/pom.xml b/pitest-html-report/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>pitest-parent</artifactId>
 		<groupId>org.pitest</groupId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.6.${revision}</version>
 	</parent>
 	<artifactId>pitest-html-report</artifactId>
 	<name>pitest-html-report</name>
@@ -65,6 +65,11 @@
 				</executions>
 
 			</plugin>
+			<!-- must run after shade -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>flatten-maven-plugin</artifactId>
+			</plugin>
 
 		</plugins>
 

diff --git a/pitest-java8-verification/pom.xml b/pitest-java8-verification/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>pitest-parent</artifactId>
 		<groupId>org.pitest</groupId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.6.${revision}</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
@@ -14,13 +14,6 @@
 
 	<build>
 		<plugins>
-		    <!-- Don't deploy to Maven Central -->
-            <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>

diff --git a/pitest-maven-verification/pom.xml b/pitest-maven-verification/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>pitest-parent</artifactId>
 		<groupId>org.pitest</groupId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.6.${revision}</version>
 	</parent>
 	<artifactId>pitest-maven-verification</artifactId>
 	<packaging>jar</packaging>
@@ -14,13 +14,6 @@
 
 	<build>
 		<plugins>
-			<!-- Don't deploy to Maven Central -->
-			<plugin>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>

diff --git a/pitest-maven/pom.xml b/pitest-maven/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>pitest-parent</artifactId>
 		<groupId>org.pitest</groupId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.6.${revision}</version>
 	</parent>
 	<artifactId>pitest-maven</artifactId>
 	<packaging>maven-plugin</packaging>
@@ -60,13 +60,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<configuration>
-					<additionalparam>-Xdoclint:none</additionalparam>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 

diff --git a/pitest/pom.xml b/pitest/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>pitest-parent</artifactId>
 		<groupId>org.pitest</groupId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.6.${revision}</version>
 	</parent>
 	<artifactId>pitest</artifactId>
 	<packaging>jar</packaging>
@@ -113,34 +113,11 @@
 						</configuration>
 					</execution>
 				</executions>
-
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
+			<!-- must run after shade -->
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>javadoc</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<failOnError>false</failOnError>
-				</configuration>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>flatten-maven-plugin</artifactId>
 			</plugin>
 
 			<plugin>