Skip to content

Commit

Permalink
Pom Clean up
Browse files Browse the repository at this point in the history 
Remove unused plugins
Update Plugin versions
Add Javadoc plugin
-Fix JavaDoc
  • Loading branch information
@jottley
jottley committed Nov 20, 2017
1 parent 241b566 commit 32e363d
Show file tree
Hide file tree
Showing 21 changed files with 111 additions and 195 deletions.
198 changes: 40 additions & 158 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@
<mockito.version>2.11.0</mockito.version>
<commons-lang3.version>3.1</commons-lang3.version>
<rat.version>0.12</rat.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
<maven-resources-plugin.version>3.0.2</maven-resources-plugin.version>
<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
<maven-surefire-plugin.version>2.20.1</maven-surefire-plugin.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -127,31 +133,21 @@
</testResource>
</testResources>

<pluginManagement>
<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.0</version>
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
</configuration>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven-source-plugin.version}</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -161,18 +157,31 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version>
<version>${maven-resources-plugin.version}</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<version>${maven-jar-plugin.version}</version>
<executions>
<execution>
<goals>
Expand All @@ -184,111 +193,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit47</artifactId>
<version>2.12</version>
</dependency>
</dependencies>
<configuration>
<argLine>-XX:-UseSplitVerifier</argLine>
<includes>
<include>**/*.class</include>
</includes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<reportPlugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.4</version>
<reports>
<report>index</report>
<report>project-team</report>
<report>license</report>
<report>mailing-list</report>
<report>dependencies</report>
<report>dependency-convergence</report>
<report>plugin-management</report>
<report>cim</report>
<report>issue-tracking</report>
<report>scm</report>
<report>summary</report>
</reports>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.12</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.5.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
<version>2.4</version>
<configuration>
<tagListOptions>
<tagClasses>
<tagClass>
<displayName>TODO</displayName>
<tags>
<tag>
<matchString>@*[Tt][oO][dD][oO]:*</matchString>
<matchType>regEx</matchType>
</tag>
<tag>
<matchString>FIXME</matchString>
<matchType>exact</matchType>
</tag>
</tags>
</tagClass>
<tagClass>
<displayName>Deprecated</displayName>
<tags>
<tag>
<matchString>@deprecated</matchString>
<matchType>ignoreCase</matchType>
</tag>
</tags>
</tagClass>
</tagClasses>
</tagListOptions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>2.7.1</version>
<configuration>
<linkXref>true</linkXref>
<minimumTokens>100</minimumTokens>
<minimumPriority>3</minimumPriority>
<!-- Change minimum priority to see more or less messages -->
<targetJdk>${jdk.version}</targetJdk>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8.1</version>
</plugin>
</reportPlugins>
</configuration>
<version>${maven-surefire-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
Expand Down Expand Up @@ -316,41 +221,6 @@
</plugins>
</build>

<repositories>
<repository>
<id>org.springframework.maven.release</id>
<name>Spring Maven Release Repository</name>
<url>http://maven.springframework.org/release</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>

<repository>
<id>org.springframework.maven.snapshot</id>
<name>Spring Maven Snapshot Repository</name>
<url>http://maven.springframework.org/snapshot</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>

<repository>
<id>org.springframework.maven.milestone</id>
<name>Spring Maven Milestone Repository</name>
<url>http://maven.springframework.org/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>

<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
Expand All @@ -359,4 +229,16 @@
</license>
</licenses>

<scm>
<url>https://github.com/jottley/spring-social-salesforce</url>
<connection>scm:git:[email protected]:jottley/spring-social-salesforce.git</connection>
<developerConnection>scm:git:[email protected]:jottley/spring-social-salesforce.git</developerConnection>
</scm>
<issueManagement>
<system>GitHub</system>
<url>https://github.com/jottley/spring-social-salesforce/issues</url>
</issueManagement>
<ciManagement>
<url>https://travis-ci.org/jottley/spring-social-salesforce</url>
</ciManagement>
</project>
12 changes: 6 additions & 6 deletions src/main/java/org/springframework/social/salesforce/api/ChatterOperations.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2016 https://github.com/jottley/spring-social-salesforce
* Copyright (C) 2017 https://github.com/jottley/spring-social-salesforce
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -32,7 +32,7 @@ public interface ChatterOperations {
/**
* Retrieves the given user's profile
*
* @param userId
* @param userId The salesforce Id of the user
* @return user profile
*/
public SalesforceProfile getUserProfile(String userId);
Expand All @@ -47,24 +47,24 @@ public interface ChatterOperations {
/**
* Retrieves the given user's status
*
* @param userId
* @param userId The salesforce Id of the user
* @return status
*/
public Status getStatus(String userId);

/**
* Updates current user's status with the given message
*
* @param message
* @param message The message to be posted as the current user's status
* @return status
*/
public Status updateStatus(String message);

/**
* Updates the given user's status with the given message
*
* @param userId
* @param message
* @param userId The salesforce Id of the user
* @param message The message to be posted as the current user's status
* @return status
*/
public Status updateStatus(String userId, String message);
Expand Down
8 changes: 7 additions & 1 deletion src/main/java/org/springframework/social/salesforce/api/QueryOperations.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2016 https://github.com/jottley/spring-social-salesforce
* Copyright (C) 2017 https://github.com/jottley/spring-social-salesforce
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -24,6 +24,9 @@ public interface QueryOperations {

/**
* Execute SOQL query and return the first page of results
*
* @param query The SOQL query to execute
* @return QueryResult
*/
QueryResult query(String query);

Expand All @@ -34,6 +37,9 @@ public interface QueryOperations {

/**
* Execute SOQL query and return all results.
*
* @param query The SOQL query to execute
* @return QueryResult
*/
QueryResult queryAll(String query);

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/springframework/social/salesforce/api/SalesforceRequestException.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import org.springframework.social.salesforce.connect.SalesforceServiceProvider;

/**
* Encapsulates the error response sent by salesforce.
* <p/>
* Encapsulates the error response sent by Salesforce.
* <br>
*
* @see <a
* href="http://www.salesforce.com/us/developer/docs/api/Content/sforce_api_calls_concepts_core_data_objects.htm">
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/org/springframework/social/salesforce/api/SearchOperations.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2016 https://github.com/jottley/spring-social-salesforce
* Copyright (C) 2017 https://github.com/jottley/spring-social-salesforce
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -26,6 +26,9 @@ public interface SearchOperations {

/**
* Execute SOSL Query and retrieve results
*
* @param soslQuery The SOSL Query to execute
* @return List of ResultItem
*/
List<ResultItem> search(String soslQuery);

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/springframework/social/salesforce/api/impl/QueryTemplate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public QueryResult nextPage(String pathOrToken) {
}

/**
* Pages through the result set and aggregates all sObjects into the single result set. <p/>
* Pages through the result set and aggregates all sObjects into the single result set.<br>
* USUAL WARNINGS ABOUT RESULT SET SIZE APPLY
* @see org.springframework.social.salesforce.api.QueryOperations#queryAll(java.lang.String)
*/
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/springframework/social/salesforce/api/impl/json/ApiVersionMixin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
*/
package org.springframework.social.salesforce.api.impl.json;

import org.springframework.social.salesforce.api.ApiVersion;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;

/**
* {@see org.springframework.social.salesforce.api.ApiVersion} Mixin for api v23.0.
* {@link ApiVersion}
*
* @author Umut Utkan
* @author Jared Ottley
Expand Down
Loading

0 comments on commit 32e363d

Please sign in to comment.