diff --git a/udc-backend/pom.xml b/udc-backend/pom.xml
index 220935e83..3852ab0b9 100644
--- a/udc-backend/pom.xml
+++ b/udc-backend/pom.xml
@@ -188,8 +188,8 @@
ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory
${project.build.directory}/classes/static/resources/css
- src/main/wro/wro.xml
- src/main/wro/wro.properties
+ ${basedir}/src/main/wro/wro.xml
+ ${basedir}/src/main/wro/wro.properties
${basedir}/src/main/less
diff --git a/udc-backend/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java b/udc-backend/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java
index 99988b731..3f48c0d4a 100644
--- a/udc-backend/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java
+++ b/udc-backend/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package test.java.org.springframework.samples.petclinic;
+package org.springframework.samples.petclinic;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/udc-backend/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java b/udc-backend/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
index 971f952f1..7da0d3dea 100644
--- a/udc-backend/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
+++ b/udc-backend/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
@@ -1,4 +1,4 @@
-package test.java.org.springframework.samples.petclinic.model;
+package org.springframework.samples.petclinic.model;
import java.util.Locale;
import java.util.Set;
diff --git a/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java b/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java
index 8f558c26f..7fccb3b04 100644
--- a/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java
+++ b/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java
@@ -1,4 +1,4 @@
-package test.java.org.springframework.samples.petclinic.owner;
+package org.springframework.samples.petclinic.owner;
import static org.hamcrest.Matchers.hasProperty;
import static org.hamcrest.Matchers.is;
diff --git a/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java b/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java
index 0e5cce9f8..f95d7c87c 100755
--- a/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java
+++ b/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java
@@ -1,4 +1,4 @@
-package test.java.org.springframework.samples.petclinic.owner;
+package org.springframework.samples.petclinic.owner;
import static org.mockito.BDDMockito.given;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
diff --git a/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java b/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java
index 306338b09..4e8e36c14 100644
--- a/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java
+++ b/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java
@@ -1,4 +1,4 @@
-package test.java.org.springframework.samples.petclinic.owner;
+package org.springframework.samples.petclinic.owner;
import java.text.ParseException;
import java.util.ArrayList;
diff --git a/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java b/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java
index 044ace0a6..08d61360e 100644
--- a/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java
+++ b/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java
@@ -1,4 +1,4 @@
-package test.java.org.springframework.samples.petclinic.owner;
+package org.springframework.samples.petclinic.owner;
import static org.mockito.BDDMockito.given;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
diff --git a/udc-backend/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java b/udc-backend/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java
index ca247c192..9f12151d9 100644
--- a/udc-backend/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java
+++ b/udc-backend/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package test.java.org.springframework.samples.petclinic.service;
+package org.springframework.samples.petclinic.service;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/udc-backend/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java b/udc-backend/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java
index 0eb130a4a..44dc6b1c2 100644
--- a/udc-backend/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java
+++ b/udc-backend/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package test.java.org.springframework.samples.petclinic.service;
+package org.springframework.samples.petclinic.service;
import java.util.Collection;
diff --git a/udc-backend/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java b/udc-backend/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java
index 1c2377f3b..3f108bfe9 100644
--- a/udc-backend/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java
+++ b/udc-backend/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java
@@ -1,4 +1,4 @@
-package test.java.org.springframework.samples.petclinic.system;
+package org.springframework.samples.petclinic.system;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/udc-backend/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java b/udc-backend/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java
index f860c8224..bd20ca79a 100644
--- a/udc-backend/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java
+++ b/udc-backend/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java
@@ -1,4 +1,4 @@
-package test.java.org.springframework.samples.petclinic.vet;
+package org.springframework.samples.petclinic.vet;
import static org.hamcrest.xml.HasXPath.hasXPath;
import static org.mockito.BDDMockito.given;
diff --git a/udc-backend/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java b/udc-backend/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java
index ed15c61de..de3a7b9bb 100644
--- a/udc-backend/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java
+++ b/udc-backend/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package test.java.org.springframework.samples.petclinic.vet;
+package org.springframework.samples.petclinic.vet;
import org.junit.Test;