fix license boilerplate generation/cleanup

Author: bbottema

.circleci/config.yml

@@ -7,7 +7,7 @@ mvn-build-test-command: &mvn-build-test-command
   mvn-build-test-command: mvn verify -DexcludeLiveServerTests=true -Dmaven.javadoc.skip=true
 
 mvn-deploy-command: &mvn-deploy-command
-  mvn-deploy-command: mvn -s .circleci/maven-release-settings.xml clean deploy -DdeployAtEnd=true -DperformRelease=true -DskipTests -Dspotbugs.skip=true && mvn clean
+  mvn-deploy-command: mvn -s .circleci/maven-release-settings.xml clean deploy -DdeployAtEnd=true -DperformRelease=true -DskipTests -Dspotbugs.skip=true
   context: RELEASE_PROFILE_BBOTTEMA
 
 workflows:

pom.xml

@@ -307,20 +307,9 @@
 					</includes>
 				</configuration>
 				<executions>
-					<execution>
-						<id>clean-remove</id>
-						<phase>clean</phase>
-						<goals>
-							<goal>remove</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>before-compile-format</id>
-						<phase>process-sources</phase>
-						<goals>
-							<goal>format</goal>
-						</goals>
-					</execution>
+					<execution><id>remove-licence-boilerplate-on-clean</id><phase>clean</phase><goals><goal>remove</goal></goals></execution>
+					<execution><id>add-licence-boilerplate-on-compile</id><phase>process-sources</phase><goals><goal>format</goal></goals></execution>
+					<execution><id>remove-licence-boilerplate-after-package</id><phase>package</phase><goals><goal>remove</goal></goals></execution>
 				</executions>
 			</plugin>
 		</plugins>