Merge remote-tracking branch 'upstream/master'

Author: TanyaEf

Vagrantfile

@@ -0,0 +1,33 @@
+#
+#   Copyright (C) 2005 - 2014 Jaspersoft Corporation. All rights  reserved.
+#   http://www.jaspersoft.com.
+#
+#   Unless you have purchased  a commercial license agreement from Jaspersoft,
+#   the following license terms  apply:
+#
+#   This program is free software: you can redistribute it and/or  modify
+#   it under the terms of the GNU Affero General Public License  as
+#   published by the Free Software Foundation, either version 3 of  the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#   GNU Affero  General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public  License
+#   along with this program.&nbsp; If not, see <http://www.gnu.org/licenses/>.
+#
+
+Vagrant.configure(2) do |config|
+
+	config.vm.box = "JasperSoft/JasperServer6.1.0"
+	config.vm.box_check_update = false
+	config.ssh.pty = true
+
+	config.vm.network "forwarded_port", guest: 8080, host: 8090
+	config.vm.network "forwarded_port", guest: 5432, host: 5430
+
+	config.vm.provision "shell", inline: "su vagrant -l -c '/bin/sh /home/vagrant/jasperreports-server-cp-6.1.0/ctlscript.sh start'"
+
+end

pom.xml

@@ -153,8 +153,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                 </configuration>
             </plugin>
             <plugin>

src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/ResourcesServiceIT.java

@@ -5,7 +5,7 @@
 import com.jaspersoft.jasperserver.jaxrs.client.core.JasperserverRestClient;
 import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
 import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
-import junit.framework.Assert;
+import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;