diff --git a/impl/src/main/java/com/geewhiz/pacify/model/utils/PFileResolver.java b/impl/src/main/java/com/geewhiz/pacify/model/utils/PFileResolver.java index d9316b3..4ec49af 100644 --- a/impl/src/main/java/com/geewhiz/pacify/model/utils/PFileResolver.java +++ b/impl/src/main/java/com/geewhiz/pacify/model/utils/PFileResolver.java @@ -25,6 +25,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import com.geewhiz.pacify.model.PFile; @@ -74,6 +75,8 @@ private List resolveRegEx() { result.add(pFile); } + Collections.sort(result); + return result; } diff --git a/impl/src/test/resources/testPreConfigure/correct/archiveWithRegEx/expectedResult/correct-CMFile.pacify b/impl/src/test/resources/testPreConfigure/correct/archiveWithRegEx/expectedResult/correct-CMFile.pacify index 386b79c..6e49af2 100644 --- a/impl/src/test/resources/testPreConfigure/correct/archiveWithRegEx/expectedResult/correct-CMFile.pacify +++ b/impl/src/test/resources/testPreConfigure/correct/archiveWithRegEx/expectedResult/correct-CMFile.pacify @@ -2,11 +2,11 @@ - + - + diff --git a/impl/src/test/resources/testPreConfigure/correct/archiveWithRegEx2/expectedResult/correct-CMFile.pacify b/impl/src/test/resources/testPreConfigure/correct/archiveWithRegEx2/expectedResult/correct-CMFile.pacify index 87a4f33..628d4c3 100644 --- a/impl/src/test/resources/testPreConfigure/correct/archiveWithRegEx2/expectedResult/correct-CMFile.pacify +++ b/impl/src/test/resources/testPreConfigure/correct/archiveWithRegEx2/expectedResult/correct-CMFile.pacify @@ -2,10 +2,10 @@ - + - + diff --git a/model/pom.xml b/model/pom.xml index ab2e54f..598a32e 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -40,6 +40,7 @@ -XtoString -Xannotate -Xcopyable + -Xinject-code diff --git a/model/src/main/resources/pacify.xjb b/model/src/main/resources/pacify.xjb index fbb4530..c9097d3 100644 --- a/model/src/main/resources/pacify.xjb +++ b/model/src/main/resources/pacify.xjb @@ -1,7 +1,7 @@ - > + @@ -30,7 +30,16 @@ PFileBase + ]]> + + + +