SONARSCPER-11 Update p4java to version 2015.1.1210280

perforce · Aug 25, 2015 · c3508f3 · c3508f3
1 parent 006c163
commit c3508f3
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 25 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,10 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.codehaus.sonar-plugins</groupId>
+    <groupId>org.sonarsource.parent</groupId>
     <artifactId>parent</artifactId>
-    <version>19</version>
+    <version>23</version>
+    <relativePath />
   </parent>
+  <groupId>org.sonarsource.scm.perforce</groupId>
   <artifactId>sonar-scm-perforce-plugin</artifactId>
   <name>SonarQube :: Plugins :: SCM :: Perforce</name>
   <version>1.2-SNAPSHOT</version>
@@ -39,17 +41,16 @@
     <connection>scm:git:git@github.com:SonarCommunity/sonar-scm-perforce.git</connection>
     <developerConnection>scm:git:git@github.com:SonarCommunity/sonar-scm-perforce.git</developerConnection>
     <url>https://github.com/SonarCommunity/sonar-scm-perforce</url>
-    <tag>HEAD</tag>
   </scm>
 
   <issueManagement>
     <system>jira</system>
-    <url>http://jira.codehaus.org/browse/SONARSCPER</url>
+    <url>https://jira.sonarsource.com/browse/SONARSCPER</url>
   </issueManagement>
 
   <ciManagement>
-    <system>Cloudbees</system>
-    <url>https://sonarplugins.ci.cloudbees.com/job/scm-perforce/</url>
+    <system>Travis</system>
+    <url>https://travis-ci.org/SonarCommunity/sonar-scm-perforce</url>
   </ciManagement>
 
   <properties>
@@ -62,7 +63,7 @@
     <dependency>
       <groupId>com.perforce</groupId>
       <artifactId>p4java</artifactId>
-      <version>2014.1.965322</version>
+      <version>2015.1.1210280</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
@@ -79,12 +80,17 @@
 
     <!-- unit tests -->
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
-      <artifactId>sonar-testing-harness</artifactId>
-      <version>${sonar.buildVersion}</version>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>2.1.0</version>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

diff --git a/src/main/java/org/sonar/plugins/scm/perforce/PerforceBlameCommand.java b/src/main/java/org/sonar/plugins/scm/perforce/PerforceBlameCommand.java
@@ -1,7 +1,7 @@
 /*
  * SonarQube :: Plugins :: SCM :: Perforce
  * Copyright (C) 2014 SonarSource
- * dev@sonar.codehaus.org
+ * sonarqube@googlegroups.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/org/sonar/plugins/scm/perforce/PerforceBlameResult.java b/src/main/java/org/sonar/plugins/scm/perforce/PerforceBlameResult.java
@@ -1,7 +1,7 @@
 /*
  * SonarQube :: Plugins :: SCM :: Perforce
  * Copyright (C) 2014 SonarSource
- * dev@sonar.codehaus.org
+ * sonarqube@googlegroups.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/org/sonar/plugins/scm/perforce/PerforceConfiguration.java b/src/main/java/org/sonar/plugins/scm/perforce/PerforceConfiguration.java
@@ -1,7 +1,7 @@
 /*
  * SonarQube :: Plugins :: SCM :: Perforce
  * Copyright (C) 2014 SonarSource
- * dev@sonar.codehaus.org
+ * sonarqube@googlegroups.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/org/sonar/plugins/scm/perforce/PerforceExecutor.java b/src/main/java/org/sonar/plugins/scm/perforce/PerforceExecutor.java
@@ -1,7 +1,7 @@
 /*
  * SonarQube :: Plugins :: SCM :: Perforce
  * Copyright (C) 2014 SonarSource
- * dev@sonar.codehaus.org
+ * sonarqube@googlegroups.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/org/sonar/plugins/scm/perforce/PerforcePlugin.java b/src/main/java/org/sonar/plugins/scm/perforce/PerforcePlugin.java
@@ -1,7 +1,7 @@
 /*
  * SonarQube :: Plugins :: SCM :: Perforce
  * Copyright (C) 2014 SonarSource
- * dev@sonar.codehaus.org
+ * sonarqube@googlegroups.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/org/sonar/plugins/scm/perforce/PerforceScmProvider.java b/src/main/java/org/sonar/plugins/scm/perforce/PerforceScmProvider.java
@@ -1,7 +1,7 @@
 /*
  * SonarQube :: Plugins :: SCM :: Perforce
  * Copyright (C) 2014 SonarSource
- * dev@sonar.codehaus.org
+ * sonarqube@googlegroups.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/org/sonar/plugins/scm/perforce/package-info.java b/src/main/java/org/sonar/plugins/scm/perforce/package-info.java
@@ -1,7 +1,7 @@
 /*
  * SonarQube :: Plugins :: SCM :: Perforce
  * Copyright (C) 2014 SonarSource
- * dev@sonar.codehaus.org
+ * sonarqube@googlegroups.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/test/java/org/sonar/plugins/scm/perforce/PerforceBlameCommandTest.java b/src/test/java/org/sonar/plugins/scm/perforce/PerforceBlameCommandTest.java
@@ -1,7 +1,7 @@
 /*
  * SonarQube :: Plugins :: SCM :: Perforce
  * Copyright (C) 2014 SonarSource
- * dev@sonar.codehaus.org
+ * sonarqube@googlegroups.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/test/java/org/sonar/plugins/scm/perforce/PerforceConfigurationTest.java b/src/test/java/org/sonar/plugins/scm/perforce/PerforceConfigurationTest.java
@@ -1,7 +1,7 @@
 /*
  * SonarQube :: Plugins :: SCM :: Perforce
  * Copyright (C) 2014 SonarSource
- * dev@sonar.codehaus.org
+ * sonarqube@googlegroups.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -23,7 +23,7 @@
 import org.sonar.api.config.PropertyDefinitions;
 import org.sonar.api.config.Settings;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class PerforceConfigurationTest {
 

diff --git a/src/test/java/org/sonar/plugins/scm/perforce/PerforcePluginTest.java b/src/test/java/org/sonar/plugins/scm/perforce/PerforcePluginTest.java
@@ -1,7 +1,7 @@
 /*
  * SonarQube :: Plugins :: SCM :: Perforce
  * Copyright (C) 2014 SonarSource
- * dev@sonar.codehaus.org
+ * sonarqube@googlegroups.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,7 +21,7 @@
 
 import org.junit.Test;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class PerforcePluginTest {
 

diff --git a/src/test/java/org/sonar/plugins/scm/perforce/PerforceScmProviderTest.java b/src/test/java/org/sonar/plugins/scm/perforce/PerforceScmProviderTest.java
@@ -1,7 +1,7 @@
 /*
  * SonarQube :: Plugins :: SCM :: Perforce
  * Copyright (C) 2014 SonarSource
- * dev@sonar.codehaus.org
+ * sonarqube@googlegroups.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,7 +24,7 @@
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
 public class PerforceScmProviderTest {