Use new maven rules

.gitignore

@@ -1,4 +1,9 @@
-/target/
+/target
+/bazel*
 .idea
-_*
+tmp-bzl-*.json
+BUILD*
+WORKSPACE*
 pom-effective.xml
+pom.xml.versionsBackup
+_*

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2018 Orhan Kupusoglu
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

pom.xml

@@ -7,14 +7,14 @@
     <!-- The Basics -->
     <groupId>kupusoglu.orhan</groupId>
     <artifactId>bazelize-maven-plugin</artifactId>
-    <version>0.2.1</version>
+    <version>0.3.3</version>
     <packaging>maven-plugin</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>3.5.4</version>
+            <version>3.6.0</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>3.5.4</version>
+            <version>3.6.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.5.2</version>
+            <version>3.6.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -46,12 +46,12 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>25.1-jre</version>
+            <version>27.0.1-jre</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20180130</version>
+            <version>20180813</version>
         </dependency>
     </dependencies>
 
@@ -66,7 +66,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
+                <version>3.8.0</version>
                 <configuration>
                     <compilerArgument>-Xlint:all</compilerArgument>
                     <showWarnings>true</showWarnings>
@@ -167,7 +167,7 @@
                     <dependency>
                         <groupId>org.apache.httpcomponents</groupId>
                         <artifactId>httpcore</artifactId>
-                        <version>4.4.9</version>
+                        <version>4.4.10</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -176,6 +176,11 @@
 
     <reporting>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>3.7.1</version>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>

src/main/java/kupusoglu/orhan/bazelize_maven_plugin/goal/GoalBinary.java

@@ -32,31 +32,42 @@ public class GoalBinary extends AbstractMojo {
     @Parameter(defaultValue = "${project}", required = true, readonly = true)
     private MavenProject project;
 
+    /**
+     * if true back up the 'BUILD' file
+     * @parameter
+     */
     @Parameter(property = "backup", defaultValue = "false")
     private Boolean backup;
 
+    /**
+     * if empty set current timestamp as suffix
+     * @parameter
+     */
     @Parameter(property = "suffix", defaultValue = "")
     private String suffix;
 
+    /**
+     * if empty use name of the main class as rule's name
+     * @parameter
+     */
     @Parameter(property = "binName", defaultValue = "")
     private String binName;
 
-    @Parameter(property = "mainClass", defaultValue = "")
+    /**
+     * name of the main class
+     * @parameter
+     */
+    @Parameter(property = "mainClass", required = true)
     private String mainClass;
 
 
     public void execute() throws MojoExecutionException {
         if (project.isExecutionRoot()) {
             String finalSuffix = null;
+            String ctxSuffix = (String)project.getContextValue("suffix");
 
             if (backup) {
-                LocalDateTime localDateTime = LocalDateTime.now();
-
-                if (suffix == null || suffix.isEmpty()) {
-                    finalSuffix = Common.getFormattedTimestamp(localDateTime);
-                } else {
-                    finalSuffix = suffix;
-                }
+                finalSuffix = Common.getBackupSuffix(suffix, ctxSuffix);
             }
 
             if (mainClass == null || mainClass.isEmpty()) {

src/main/java/kupusoglu/orhan/bazelize_maven_plugin/goal/GoalBuild.java

@@ -58,33 +58,76 @@ public class GoalBuild extends AbstractMojo {
     @Parameter(defaultValue = "${settings}", required = true, readonly = true)
     private Settings settings;
 
+    /**
+     * path of the settings file relative to local repo
+     * @parameter
+     */
     @Parameter(property = "settingsFile", defaultValue = "../settings.xml")
     private String settingsFile;
 
-    @Parameter(property = "rootDir", defaultValue = ".")
-    private String rootDir;
-
+    /**
+     * if true back up the 'BUILD' files
+     * @parameter
+     */
     @Parameter(property = "backup", defaultValue = "true")
     private Boolean backup;
 
+    /**
+     * if empty set current timestamp as suffix
+     * @parameter
+     */
     @Parameter(property = "suffix", defaultValue = "")
     private String suffix;
 
+    /**
+     * add dependency to the black list to be ignored
+     * @parameter
+     */
     @Parameter(property = "blackListPattern", defaultValue = "^jdk_tools")
     private String blackListPattern;
 
+    /**
+     * default remote repository
+     * @parameter
+     */
     @Parameter(property = "defaultServer", defaultValue = "central")
     private String defaultServer;
 
+    /**
+     * set scope of the Maven dependency
+     * @parameter
+     */
     @Parameter(property = "addScope", defaultValue = "true")
     private Boolean addScope;
 
+    /**
+     * add hash of the Maven dependency
+     * @parameter
+     */
     @Parameter(property = "addHash", defaultValue = "false")
     private Boolean addHash;
 
-    @Parameter(property = "addServer", defaultValue = "true")
+    /**
+     * add remote server of the Maven dependency
+     * @parameter
+     */
+    @Parameter(property = "addServer", defaultValue = "false")
     private Boolean addServer;
 
+    /**
+     * path of the resource files
+     * @parameter
+     */
+    @Parameter(property = "resMain", defaultValue = "src/main/resources")
+    private String resMain;
+
+    /**
+     * use glob("src/main/java/**\/*.java") and glob("src/main/resources/**\/*")
+     * @parameter
+     */
+    @Parameter(property = "useMavenStructure", defaultValue = "true")
+    private Boolean useMavenStructure;
+
     private SortedSet<MavenDependency> allDependencies = new TreeSet<>();
     private SortedSet<MavenServer> allServers = new TreeSet<>();
     private LocalDateTime dateTime = LocalDateTime.now();
@@ -95,25 +138,23 @@ public class GoalBuild extends AbstractMojo {
     public void execute() throws MojoExecutionException {
         // for LifeCycle.afterSessionEnd()
         if (Common.getProjectData("suffix") == null) { //project.isExecutionRoot()) {
-            project.setContextValue("rootDir", rootDir);
+            project.setContextValue("rootDir", project.getBasedir().getAbsolutePath());
             project.setContextValue("backup", backup);
             project.setContextValue("log", getLog());
 
-            LocalDateTime localDateTime = LocalDateTime.now();
             String finalSuffix = null;
+            String ctxSuffix = (String)project.getContextValue("suffix");
 
-            if (suffix == null || suffix.isEmpty()) {
-                finalSuffix = Common.getFormattedTimestamp(localDateTime);
-            } else {
-                finalSuffix = suffix;
+            if (backup) {
+                finalSuffix = Common.getBackupSuffix(suffix, ctxSuffix);
             }
 
             // for BUILD files
             Common.setProjectData("suffix", finalSuffix);
             // for WORKSPACE file
             project.setContextValue("suffix", finalSuffix);
 
-            getLog().info("local datetime: " + localDateTime + " | suffix: " + finalSuffix);
+            getLog().info("suffix: " + finalSuffix);
         }
 
         SortedSet<String> removeDep = new TreeSet<>();
@@ -177,13 +218,12 @@ public void execute() throws MojoExecutionException {
                                          + Common.getSepSanitize()
                                          + project.getVersion());
 
-        if (rootDir.isEmpty()) {
-            getLog().info("reading from class resources: " + Common.OUTPUT_FILES.JSON_META);
-        } else {
-            Common.setProjectData("rootDir", rootDir);
-            getLog().info("reading from root directory: "
-                          + Paths.get(rootDir, Common.OUTPUT_FILES.JSON_META.toString()).normalize().toAbsolutePath());
-        }
+
+        String baseDir = project.getBasedir().getAbsolutePath();
+        Common.setProjectData("baseDir", baseDir);
+
+        getLog().info("reading from root directory: "
+                      + Paths.get(baseDir, Common.OUTPUT_FILES.JSON_META.toString()).normalize().toAbsolutePath());
 
         Common.setBlackListPattern(finalBlackListPattern);
 
@@ -275,6 +315,12 @@ public void execute() throws MojoExecutionException {
 
         String contentLibrary = Common.getTemplateLibrary();
 
+        String resFiles;
+        if (this.useMavenStructure)
+            resFiles = "glob([\"src/main/resources/**/*\"])";
+        else
+            resFiles = "[" + Common.getResources(resMain) + "]";
+
         StringBuilder jsonDependency = new StringBuilder();
         StringBuilder jsonServer = new StringBuilder();
 
@@ -297,10 +343,10 @@ public void execute() throws MojoExecutionException {
 
                 for (MavenDependency dep : allDependencies) {
                     String depName = Common.sanitize(dep.getGroupId()
-                                                    + Common.getSepSanitize()
-                                                    + dep.getArtifactId()
-                                                    + Common.getSepSanitize()
-                                                    + dep.getVersion());
+                                                     + Common.getSepSanitize()
+                                                     + dep.getArtifactId()
+                                                     + Common.getSepSanitize()
+                                                     + dep.getVersion());
 
                     if (!Common.isBlackListed(depName)) {
                         JSONObject jsonObject = new JSONObject(dep);
@@ -313,9 +359,9 @@ public void execute() throws MojoExecutionException {
                         if (currDep == null || currDep.getLabel().isEmpty()) {
                             if (!removeDep.contains("@" + dep.getName() + "//jar")) {
                                 build.append(Common.getIndentTwo());
-                                build.append("\"@");
-                                build.append(dep.getName());
-                                build.append("//jar\",");
+                                build.append("\"@maven//:");
+                                build.append(Common.sanitize(dep.getMavenDependencyString(false, false).replaceAll(":", "_")));
+                                build.append("\",");
                                 build.append("\n");
                             }
                         } else {
@@ -346,7 +392,11 @@ public void execute() throws MojoExecutionException {
                 buildWriter.append(contentLibrary.replaceFirst("#LIB_NAME#",
                                                                libName)
                                                  .replaceFirst("#SRCS_GLOB#",
-                                                               Common.getGlobSources(metaDep.getSources()))
+                                                               this.useMavenStructure ?
+                                                                       "glob([\"src/main/java/**/*.java\"])" :
+                                                                       Common.getGlobSources(metaDep.getSources()))
+                                                 .replaceFirst("#RESOURCES#",
+                                                               resFiles)
                                                  .replaceFirst("#JAVA_DEPS#",
                                                                Common.removeLastChars(build.toString(), 1)));
 

src/main/java/kupusoglu/orhan/bazelize_maven_plugin/goal/GoalClean.java

@@ -34,6 +34,10 @@ public class GoalClean extends AbstractMojo {
     @Parameter(defaultValue = "${project}", required = true, readonly = true)
     private MavenProject project;
 
+    /**
+     * delete all generated files including BUILD and WORKSPACE files
+     * @parameter
+     */
     @Parameter(property = "expunge", defaultValue = "false")
     private Boolean expunge;
 

src/main/java/kupusoglu/orhan/bazelize_maven_plugin/goal/GoalMeta.java

@@ -34,25 +34,28 @@ public class GoalMeta extends AbstractMojo {
     @Parameter(defaultValue = "${project}", required = true, readonly = true)
     private MavenProject project;
 
+    /**
+     * if true back up the 'tmp-bzl-meta.json' files
+     * @parameter
+     */
     @Parameter(property = "backup", defaultValue = "false")
     private Boolean backup;
 
+    /**
+     * if empty set current timestamp as suffix
+     * @parameter
+     */
     @Parameter(property = "suffix", defaultValue = "")
     private String suffix;
 
 
     public void execute() throws MojoExecutionException {
         if (project.isExecutionRoot()) {
             String finalSuffix = null;
+            String ctxSuffix = (String)project.getContextValue("suffix");
 
             if (backup) {
-                LocalDateTime localDateTime = LocalDateTime.now();
-
-                if (suffix == null || suffix.isEmpty()) {
-                    finalSuffix = Common.getFormattedTimestamp(localDateTime);
-                } else {
-                    finalSuffix = suffix;
-                }
+                finalSuffix = Common.getBackupSuffix(suffix, ctxSuffix);
             }
 
             try {