fix: Maven config transitions from root to child pom files (eclipse#1156

)
andre15silva · Dec 9, 2020 · 4c3098b · 4c3098b
1 parent 1357e4a
commit 4c3098b
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 17 deletions.
diff --git a/.ci/ci-deploy.sh b/.ci/ci-deploy.sh
@@ -6,18 +6,13 @@
 set -e
 
 sudo apt-get update
-sudo apt-get install -y xmlstarlet
-
 
 ### MAVEN CENTRAL
 if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_BRANCH" = "master" ]; then
     cp .travis/travis-settings.xml $HOME/.m2/settings.xml
     cd src 
 
     # pushing snapshot to https://oss.sonatype.org/content/repositories/snapshots/fr/inria/repairnator/
-    VERSION=`xmlstarlet sel -t -v '//_:project/_:properties/_:revision' pom.xml`
-    sed -i -e 's/\${revision}/'$VERSION'/' pom.xml */pom.xml
-    git diff
     mvn deploy -DskipTests -Dcheckstyle.skip
     echo Deployment to Maven Central done
 fi

diff --git a/.ci/ci-dockerfile b/.ci/ci-dockerfile
@@ -1,4 +1,4 @@
 FROM maven:3.6-openjdk-8
 
 RUN apt-get update
-RUN apt-get install xmlstarlet -y
+RUN apt-get install xmlstarlet -y
diff --git a/.ci/ci-maven-repair.sh b/.ci/ci-maven-repair.sh
@@ -4,11 +4,6 @@
 set -e
 export M2_HOME=/usr/local/maven
 
-VERSION=`xmlstarlet sel -t -v '//_:project/_:properties/_:revision' src/pom.xml`
-sed -i -e 's/\${revision}/'$VERSION'/' src/repairnator-core/pom.xml
-sed -i -e 's/\${revision}/'$VERSION'/' src/pom.xml
-sed -i -e 's/\${revision}/'$VERSION'/' "${TEST_PATH}"/pom.xml
-
 NPEFIX_VERSION=`xmlstarlet sel -t -v '//_:dependency[_:artifactId="npefix"]/_:version' src/maven-repair/pom.xml`
 
 mvn clean install -B -f src/repairnator-core/ && mvn -Dtest=$TEST_LIST -DNPEFIX_VERSION=$NPEFIX_VERSION clean test -B -f $TEST_PATH -DskipTests
diff --git a/.ci/ci-run-with-core.sh b/.ci/ci-run-with-core.sh
@@ -8,9 +8,4 @@ export M2_HOME=/usr/local/maven
 # sudo apt-get update
 # sudo apt-get install -y xmlstarlet
 
-VERSION=`xmlstarlet sel -t -v '//_:project/_:properties/_:revision' src/pom.xml`
-sed -i -e 's/\${revision}/'$VERSION'/' src/repairnator-core/pom.xml
-sed -i -e 's/\${revision}/'$VERSION'/' src/pom.xml
-sed -i -e 's/\${revision}/'$VERSION'/' "${TEST_PATH}"/pom.xml
-
 mvn clean install -B -f src/repairnator-core/ && mvn -Dtest=$TEST_LIST clean test -B -f $TEST_PATH -DskipTests
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@ pom.xml.tag
 pom.xml.releaseBackup
 pom.xml.versionsBackup
 pom.xml.next
+.flattened-pom.xml
 release.properties
 dependency-reduced-pom.xml
 buildNumber.properties
@@ -34,4 +35,4 @@ repairnator/docker-images/pipeline-dockerimage/version.ini
 repairnator/repairnator-pipeline/spooned*
 repairnator/repairnator-pipeline/output_astor
 /bin/
-*.java-version
+*.java-version
diff --git a/src/pom.xml b/src/pom.xml
@@ -115,6 +115,31 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.1.0</version>
+                <configuration>
+                    <updatePomFile>true</updatePomFile>
+                    <flattenMode>resolveCiFriendliesOnly</flattenMode>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>