sopehl / fmerger Goto Github PK

if there are some uncommitted changes in the local environment. When anyone starts the build(with merge goal) with the scm integration, in the local of the team mambers, the undesirable conflict can be occured.

for example -> setProperties("finalName", "myFile-20191209134456-7.sql");

to catch it from the other tools like Jenkins, TeamCity or others.

like:

--xxx.sql
--yyy.sql
--ooo.sql

{body}

Caused by: org.apache.maven.plugin.PluginExecutionException: Execution default of goal com.sopehl:fmerger:1.0.1-alpha:merge failed.
at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo (DefaultBuildPluginManager.java:148)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute (MojoExecutor.java:210)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute (MojoExecutor.java:156)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute (MojoExecutor.java:148)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject (LifecycleModuleBuilder.java:117)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject (LifecycleModuleBuilder.java:81)
at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build (SingleThreadedBuilder.java:56)
at org.apache.maven.lifecycle.internal.LifecycleStarter.execute (LifecycleStarter.java:128)
at org.apache.maven.DefaultMaven.doExecute (DefaultMaven.java:305)
at org.apache.maven.DefaultMaven.doExecute (DefaultMaven.java:192)
at org.apache.maven.DefaultMaven.execute (DefaultMaven.java:105)
at org.apache.maven.cli.MavenCli.execute (MavenCli.java:956)
at org.apache.maven.cli.MavenCli.doMain (MavenCli.java:288)
at org.apache.maven.cli.MavenCli.main (MavenCli.java:192)
at sun.reflect.NativeMethodAccessorImpl.invoke0 (Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke (NativeMethodAccessorImpl.java:62)
at sun.reflect.DelegatingMethodAccessorImpl.invoke (DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke (Method.java:498)
at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced (Launcher.java:289)
at org.codehaus.plexus.classworlds.launcher.Launcher.launch (Launcher.java:229)
at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode (Launcher.java:415)
at org.codehaus.plexus.classworlds.launcher.Launcher.main (Launcher.java:356)
Caused by: java.lang.NullPointerException
at com.sopehl.mojo.FileMergerMojo.execute (FileMergerMojo.java:73)
at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo (DefaultBuildPluginManager.java:137)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute (MojoExecutor.java:210)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute (MojoExecutor.java:156)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute (MojoExecutor.java:148)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject (LifecycleModuleBuilder.java:117)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject (LifecycleModuleBuilder.java:81)
at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build (SingleThreadedBuilder.java:56)
at org.apache.maven.lifecycle.internal.LifecycleStarter.execute (LifecycleStarter.java:128)
at org.apache.maven.DefaultMaven.doExecute (DefaultMaven.java:305)
at org.apache.maven.DefaultMaven.doExecute (DefaultMaven.java:192)
at org.apache.maven.DefaultMaven.execute (DefaultMaven.java:105)
at org.apache.maven.cli.MavenCli.execute (MavenCli.java:956)
at org.apache.maven.cli.MavenCli.doMain (MavenCli.java:288)
at org.apache.maven.cli.MavenCli.main (MavenCli.java:192)
at sun.reflect.NativeMethodAccessorImpl.invoke0 (Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke (NativeMethodAccessorImpl.java:62)
at sun.reflect.DelegatingMethodAccessorImpl.invoke (DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke (Method.java:498)
at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced (Launcher.java:289)
at org.codehaus.plexus.classworlds.launcher.Launcher.launch (Launcher.java:229)
at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode (Launcher.java:415)
at org.codehaus.plexus.classworlds.launcher.Launcher.main (Launcher.java:356)

Default is no print on console

change "A" with "E"

mvn deploy:deploy-file -Durl=${nexus-url} -DrepositoryId=nexus-tr -DgroupId=com.sopehl -DartifactId=my-sql -Dversion=${currentVersion} -Dpackaging=sql -Dfile=/data/webapp/fmerger-source/fmerger-target/myfile-20191107151102-4.sql

mvn clean generate-resources -DfinalNamePrefix=${param}

<scm> <connection/> <commentPrefix/> </scm>

LOG.info("File moved success: " + source.getAbsolutePath() + " --> " + targetOutputPath + archiveFileNameWithExtension);

boolean isMoved = FileUtils.moveFile(source, targetOutputPath, archiveFileNameWithExtension);

first check isMoved success or not, then add the log after condition

every time create new file but if developer specified the file name in plugin conf, not override the former file that is created with the same file name. Add unique id at the end of files like:

fmerger-20190823000412-5.sql

Maybe it could be reverted by any rules for flexibility

Think and implement for generate-sources phases of maven

change the condition from File.seperator to "/".

mvn clean generate-resources -DdisableFinalNamePrefix

<output> <protocol>file</protocol> <**finalName**>${project.version}</**finalName**> <path>D:\paratika-fmerger\</path> <extension>sql</extension> </output>

convert it

<output> <protocol>file</protocol> <**finalNamePrefix**>${project.version}</**finalNamePrefix**> <path>D:\paratika-fmerger\</path> <extension>sql</extension> </output>