Merge pull request #2 from Bernardo-MG/release

Release
Bernardo-MG · Nov 20, 2017 · 3db5158 · 3db5158
2 parents e964244 + e7704b2
commit 3db5158
Show file tree

Hide file tree

Showing 17 changed files with 80 additions and 96 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -2,13 +2,28 @@
 * text=auto
 
 # Known text files
-*.java text
-*.xml text
-*.yml text
-*.md text
-*.sh text
-*.css text
-*.txt text
+*.css           text diff=css
+*.java          text diff=java
+*.js            text
+*.json          text
+*.jsp           text
+*.jspf          text
+*.jspx          text
+*.htm           text diff=html
+*.html          text diff=html
+*.properties    text
+*.sh            text
+*.md            text
+*.txt           text
+*.xml           text
+*.yml           text
 
 # Known binary files
-*.jar binary
+*.class         binary
+*.gif           binary
+*.ico           binary
+*.jar           binary
+*.jpg           binary
+*.jpeg          binary
+*.png           binary
+*.war           binary
diff --git a/.travis.yml b/.travis.yml
@@ -3,24 +3,18 @@
 
 # Using Java for the project
 language: java
-jdk:
-# JDK 8 is set to deploy the docs in the configuration matrix
-#  - oraclejdk8
-# JDK 7 is set to deploy the artifacts in the configuration matrix
-#  - oraclejdk7
-  - openjdk7
 matrix:
   include:
-    # Code artifacts deployed with JDK7
-    - jdk: oraclejdk7
+    # Code artifacts deployed with open JDK7
+    - jdk: openjdk7
       env: DEPLOY=true
     # Documentation deployed with JDK8
     - jdk: oraclejdk8
       env: DEPLOY_DOCS=true
 
 before_install:
   # Gets scripts
-  - git clone -b v0.4.2 --single-branch https://github.com/Bernardo-MG/ci-shell-scripts.git ~/.scripts
+  - git clone -b v1.1.2 --single-branch https://github.com/Bernardo-MG/ci-shell-scripts.git ~/.scripts
   # Sets scripts as executable
   - chmod -R +x ~/.scripts/*
   # Prepares CI environment

diff --git a/pom.xml b/pom.xml
@@ -9,18 +9,18 @@
    <!-- ********************************************** -->
 
    <parent>
-      <groupId>com.wandrell.maven</groupId>
+      <groupId>com.bernardomg.maven</groupId>
       <artifactId>base-pom</artifactId>
-      <version>1.1.4</version>
+      <version>1.2.0</version>
    </parent>
 
    <!-- ********************************************** -->
    <!-- **************** PROJECT INFO **************** -->
    <!-- ********************************************** -->
 
-   <groupId>com.wandrell.velocity</groupId>
+   <groupId>com.bernardomg.velocity</groupId>
    <artifactId>velocity-config-tool</artifactId>
-   <version>1.0.0</version>
+   <version>1.1.0</version>
    <packaging>jar</packaging>
 
    <name>Velocity config tool</name>
@@ -78,40 +78,6 @@
    <!-- ********************************************** -->
 
    <profiles>
-      <profile>
-         <!-- Profile for the Eclipse Maven plugin -->
-         <!-- Sets the POM so this plugin does not give the usual unregistered 
-            goals errors -->
-         <!-- It will be activated automatically on Eclipse if this has the 
-            m2e plugin, by detecting the version property -->
-         <id>eclipse-maven</id>
-         <activation>
-            <property>
-               <name>m2e.version</name>
-            </property>
-         </activation>
-         <build>
-            <pluginManagement>
-               <plugins>
-                  <plugin>
-                     <!-- m2e lifecycle mapping -->
-                     <!-- This is used to configure the Maven plugin for 
-                        Eclipse. -->
-                     <!-- Among other things, it allows registering goals, 
-                        which Eclipse would otherwise reject. -->
-                     <!-- It has no real effect on Maven. -->
-                     <groupId>org.eclipse.m2e</groupId>
-                     <artifactId>lifecycle-mapping</artifactId>
-                     <version>${plugin.lifecycle.version}</version>
-                     <configuration>
-                        <downloadSources>true</downloadSources>
-                        <downloadJavadocs>true</downloadJavadocs>
-                     </configuration>
-                  </plugin>
-               </plugins>
-            </pluginManagement>
-         </build>
-      </profile>
       <profile>
          <!-- Release site deployment profile -->
          <!-- Sets the site repository to point to the releases repo -->
@@ -124,7 +90,8 @@
             <site>
                <id>site</id>
                <name>Project Documentation Site</name>
-               <url>scp://docs.wandrell.com:2222/home1/duenco/www/maven/velocity-config-tool</url>
+               <!-- The URL should be set externally -->
+               <url>${site.release.url}</url>
             </site>
          </distributionManagement>
       </profile>
@@ -136,7 +103,8 @@
             <site>
                <id>site-development</id>
                <name>Project Development Documentation Site</name>
-               <url>scp://docs.wandrell.com:2222/home1/duenco/www/development/maven/velocity-config-tool</url>
+               <!-- The URL should be set externally -->
+               <url>${site.develop.url}</url>
             </site>
          </distributionManagement>
       </profile>
@@ -164,7 +132,7 @@
       <developer>
          <id>bmg</id>
          <name>Bernardo Martínez Garrido</name>
-         <email>programming@wandrell.com</email>
+         <email>programming@bernardomg.com</email>
          <url>https://github.com/Bernardo-MG</url>
          <organization>Bernardo Martínez Garrido</organization>
          <organizationUrl>https://github.com/Bernardo-MG</organizationUrl>
@@ -191,7 +159,7 @@
       <!-- ============================================== -->
       <!-- =============== MANIFEST DATA ================ -->
       <!-- ============================================== -->
-      <manifest.name>com/wandrell/velocity/velocity-config-tool</manifest.name>
+      <manifest.name>com/bernardomg/velocity/velocity-config-tool</manifest.name>
       <!-- ============================================== -->
       <!-- =========== DEPENDENCIES VERSIONS ============ -->
       <!-- ============================================== -->
@@ -210,9 +178,9 @@
       <!-- ============================================== -->
       <!-- ================= MAVEN SITE ================= -->
       <!-- ============================================== -->
-      <site.skin.version>0.6.0</site.skin.version>
+      <site.skin.version>1.2.0</site.skin.version>
       <bintrayURL>https://bintray.com/bernardo-mg/maven/velocity-config-tool/view</bintrayURL>
-      <mavenURL>http://mvnrepository.com/artifact/com.wandrell.velocity/velocity-config-tool</mavenURL>
+      <mavenURL>http://mvnrepository.com/artifact/com.bernardomg.velocity/velocity-config-tool</mavenURL>
    </properties>
 
    <!-- ********************************************** -->
@@ -361,7 +329,7 @@
             <dependencies>
                <dependency>
                   <!-- Docs Maven Skin -->
-                  <groupId>com.wandrell.maven.skins</groupId>
+                  <groupId>com.bernardomg.maven.skins</groupId>
                   <artifactId>docs-maven-skin</artifactId>
                   <version>${site.skin.version}</version>
                </dependency>

diff --git a/readme.md b/readme.md
@@ -4,7 +4,7 @@ Acquire the [Maven site skin][maven_site] configuration from a [Velocity][veloci
 
 This way any custom setting from the site.xml file can be used when generating the site pages.
 
-[![Maven Central](https://img.shields.io/maven-central/v/com.wandrell.velocity/velocity-config-tool.svg)][maven-repo]
+[![Maven Central](https://img.shields.io/maven-central/v/com.bernardomg.velocity/velocity-config-tool.svg)][maven-repo]
 [![Bintray](https://api.bintray.com/packages/bernardo-mg/maven/velocity-config-tool/images/download.svg)][bintray-repo]
 
 [![Release docs](https://img.shields.io/badge/docs-release-blue.svg)][site-release]
@@ -121,11 +121,11 @@ The project has been released under the [MIT License][license].
 [velocity]: http://velocity.apache.org/
 
 [bintray-repo]: https://bintray.com/bernardo-mg/maven/velocity-config-tool/view
-[maven-repo]: http://mvnrepository.com/artifact/com.wandrell.velocity/velocity-config-tool
+[maven-repo]: http://mvnrepository.com/artifact/com.bernardomg.velocity/velocity-config-tool
 [issues]: https://github.com/bernardo-mg/velocity-config-tool/issues
-[javadoc-develop]: http://docs.wandrell.com/development/maven/velocity-config-tool/apidocs
-[javadoc-release]: http://docs.wandrell.com/maven/velocity-config-tool/apidocs
+[javadoc-develop]: http://docs.bernardomg.com/development/maven/velocity-config-tool/apidocs
+[javadoc-release]: http://docs.bernardomg.com/maven/velocity-config-tool/apidocs
 [license]: http://www.opensource.org/licenses/mit-license.php
 [scm]: https://github.com/bernardo-mg/velocity-config-tool
-[site-develop]: http://docs.wandrell.com/development/maven/velocity-config-tool
-[site-release]: http://docs.wandrell.com/maven/velocity-config-tool
+[site-develop]: http://docs.bernardomg.com/development/maven/velocity-config-tool
+[site-release]: http://docs.bernardomg.com/maven/velocity-config-tool
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -3,13 +3,23 @@
    xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/xsd/changes-1.0.0.xsd">
    <properties>
       <title>Project Changes</title>
-      <author email="programming@wandrell.com">Bernardo Martínez Garrido</author>
+      <author email="programming@bernardomg.com">Bernardo Martínez Garrido</author>
    </properties>
    <body>
       <release version="1.0.0" date="2017-04-22" description="First release">
          <action dev="bmg" type="add">
             First release of the library.
          </action>
       </release>
+      <release version="1.0.1" date="2017-11-13" description="Relocation">
+         <action dev="bmg" type="add">
+            Prepared for Maven relocation.
+         </action>
+      </release>
+      <release version="1.1.0" date="2017-11-20" description="Relocation">
+         <action dev="bmg" type="add">
+            Relocation.
+         </action>
+      </release>
    </body>
 </document>
diff --git a/src/config/pmd/pmd-rules.xml b/src/config/pmd/pmd-rules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE xml>
-<ruleset name="DefaultWandrell">
+<ruleset name="Defaultbernardomg">
    <description>
       Default list of rulesets to use, along ignored rules.
    </description>

diff --git a/...om/wandrell/velocity/tool/ConfigTool.java → .../bernardomg/velocity/tool/ConfigTool.java b/...om/wandrell/velocity/tool/ConfigTool.java → .../bernardomg/velocity/tool/ConfigTool.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package com.wandrell.velocity.tool;
+package com.bernardomg.velocity.tool;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

diff --git a/...ll/velocity/tool/ConfigToolConstants.java → ...mg/velocity/tool/ConfigToolConstants.java b/...ll/velocity/tool/ConfigToolConstants.java → ...mg/velocity/tool/ConfigToolConstants.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package com.wandrell.velocity.tool;
+package com.bernardomg.velocity.tool;
 
 import org.apache.velocity.tools.config.DefaultKey;
 

diff --git a/.../wandrell/velocity/tool/package-info.java → ...ernardomg/velocity/tool/package-info.java b/.../wandrell/velocity/tool/package-info.java → ...ernardomg/velocity/tool/package-info.java
@@ -25,4 +25,4 @@
  * Provides Velocity tools classes.
  */
 
-package com.wandrell.velocity.tool;
+package com.bernardomg.velocity.tool;
diff --git a/src/main/resources/META-INF/maven/site-tools.xml b/src/main/resources/META-INF/maven/site-tools.xml
@@ -3,6 +3,6 @@
    the classpath and Velocity finds it. -->
 <tools>
    <toolbox scope="request">
-      <tool class="com.wandrell.velocity.tool.ConfigTool" />
+      <tool class="com.bernardomg.velocity.tool.ConfigTool" />
    </toolbox>
 </tools>
diff --git a/src/site/markdown/reports.md b/src/site/markdown/reports.md
@@ -23,7 +23,6 @@
 
 |Report|Description|
 |---|---|
-|[OWASP Dependencies check][dependencies-check]|Dependencies vulnerabilities report.|
 |[Dependencies][dependencies]|Dependencies used by the project.|
 |[Dependencies Analysis][dependency-analysis]|Dependencies analysis of the project (used declared, used undeclared, unused declared).|
 |[Plugins][plugins]|Maven plugins used by the project.|
@@ -39,7 +38,6 @@
 [checkstyle]: ./checkstyle.html
 [cpd]: ./cpd.html
 [dependencies]: ./dependencies.html
-[dependencies-check]: ./dependency-check-report.html
 [dependency-analysis]: ./dependency-analysis.html
 [failsafe]: ./failsafe-report.html
 [findbugs]: ./findbugs.html

diff --git a/src/site/site.xml b/src/site/site.xml
@@ -4,7 +4,7 @@
    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd">
 
    <skin>
-      <groupId>com.wandrell.maven.skins</groupId>
+      <groupId>com.bernardomg.maven.skins</groupId>
       <artifactId>docs-maven-skin</artifactId>
       <version>${site.skin.version}</version>
    </skin>
@@ -13,7 +13,7 @@
       <skinConfig>
          <keywords>Velocity tool, configuration</keywords>
          <descriptionUrl>Check the documentation for the Velocity Config Tool</descriptionUrl>
-         <twitterSite>@Wandrell_BMG</twitterSite>
+         <twitterSite>@BernardoMartG</twitterSite>
          <topNav>
             <menu>Documentation</menu>
             <menu>Info and reports</menu>

diff --git a/...t/skinConfig/TestConfigToolConfigure.java → ...t/skinConfig/TestConfigToolConfigure.java b/...t/skinConfig/TestConfigToolConfigure.java → ...t/skinConfig/TestConfigToolConfigure.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package com.wandrell.velocity.tool.test.unit.skinConfig;
+package com.bernardomg.velocity.tool.test.unit.skinConfig;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -31,8 +31,8 @@
 import org.apache.velocity.tools.ToolContext;
 import org.testng.annotations.Test;
 
-import com.wandrell.velocity.tool.ConfigTool;
-import com.wandrell.velocity.tool.ConfigToolConstants;
+import com.bernardomg.velocity.tool.ConfigTool;
+import com.bernardomg.velocity.tool.ConfigToolConstants;
 
 /**
  * Unit tests for {@link ConfigTool}, testing the {@code configure} method to

diff --git a/...st/unit/skinConfig/TestConfigToolGet.java → ...st/unit/skinConfig/TestConfigToolGet.java b/...st/unit/skinConfig/TestConfigToolGet.java → ...st/unit/skinConfig/TestConfigToolGet.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package com.wandrell.velocity.tool.test.unit.skinConfig;
+package com.bernardomg.velocity.tool.test.unit.skinConfig;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -34,8 +34,8 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import com.wandrell.velocity.tool.ConfigTool;
-import com.wandrell.velocity.tool.ConfigToolConstants;
+import com.bernardomg.velocity.tool.ConfigTool;
+import com.bernardomg.velocity.tool.ConfigToolConstants;
 
 /**
  * Unit tests for {@link ConfigTool}, testing the {@code get} method.

diff --git a/...t/skinConfig/TestConfigToolGetFileId.java → ...t/skinConfig/TestConfigToolGetFileId.java b/...t/skinConfig/TestConfigToolGetFileId.java → ...t/skinConfig/TestConfigToolGetFileId.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package com.wandrell.velocity.tool.test.unit.skinConfig;
+package com.bernardomg.velocity.tool.test.unit.skinConfig;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -31,8 +31,8 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import com.wandrell.velocity.tool.ConfigTool;
-import com.wandrell.velocity.tool.ConfigToolConstants;
+import com.bernardomg.velocity.tool.ConfigTool;
+import com.bernardomg.velocity.tool.ConfigToolConstants;
 
 /**
  * Unit tests for {@link ConfigTool}, testing the {@code getFileId} method.

diff --git a/...nConfig/TestConfigToolGetMissingData.java → ...nConfig/TestConfigToolGetMissingData.java b/...nConfig/TestConfigToolGetMissingData.java → ...nConfig/TestConfigToolGetMissingData.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package com.wandrell.velocity.tool.test.unit.skinConfig;
+package com.bernardomg.velocity.tool.test.unit.skinConfig;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -34,8 +34,8 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import com.wandrell.velocity.tool.ConfigTool;
-import com.wandrell.velocity.tool.ConfigToolConstants;
+import com.bernardomg.velocity.tool.ConfigTool;
+import com.bernardomg.velocity.tool.ConfigToolConstants;
 
 /**
  * Unit tests for {@link ConfigTool}, testing the {@code get} method.