Merge pull request #19 from zlamalp/bump

Updated all possible dependencies to the latest versions

Author: zlamalp

README.md

@@ -41,6 +41,7 @@ After creating properties file, add following properties in it:
 * `member_identifier` type of identifier you use in input files to identifier user
 * `allow_delete` true/false value determine, if users missing in input file are deleted from domain or just suspended
 * `allow_delete_teamdrive` true/false value determine, if TeamDrive is deleted when missing in input file or just all permissions are removed
+* `dry_run` true/false value determine, if this tool performs only READ or READ/WRITE operations with Gooogle API. If true, WRITE actions are logged, but not actually performed.
 
 Your properties file should look like this:
 
@@ -51,6 +52,7 @@ service_account_pkcs12_file_path=/etc/perun/name_of_your_p12_file
 scopes=https://www.googleapis.com/auth/admin.directory.group,https://www.googleapis.com/auth/admin.directory.orgunit,https://www.googleapis.com/auth/admin.directory.user,https://www.googleapis.com/auth/groups,https://www.googleapis.com/auth/userinfo.email
 member_identifier=id
 allow_delete=false
+dry_run=false
 ```
 
 ## Usage
@@ -114,11 +116,11 @@ Second argument is type of action: "users", "groups" or "teamDrives".
 Third argument is path to CSV file (users, groups or teamDrives - depending on action)
 
 ```
-java -jar ./GoogleGroupConnector-2.0.0.jar DOMAIN ACTION PATH_TO_CSV_FILE
+java -jar ./google-group-connector-2.0.0.jar DOMAIN ACTION PATH_TO_CSV_FILE
 ```
 
 By default, application logs to console. You can change default logging by passing own logback configuration.
 
 ```$xslt
-java -Dlogback.configurationFile=file:///etc/perun/logback-google-groups.xml -jar ./GoogleGroupConnector-2.0.0.jar DOMAIN ACTION PATH_TO_CSV_FILE
+java -Dlogback.configurationFile=file:///etc/perun/logback-google-groups.xml -jar ./google-group-connector-2.0.0.jar DOMAIN ACTION PATH_TO_CSV_FILE
 ```

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>cz.metacentrum.perun.core</groupId>
-	<artifactId>GoogleGroupConnector</artifactId>
+	<artifactId>google-group-connector</artifactId>
 	<version>2.0.0</version>
 	<packaging>jar</packaging>
 
@@ -22,14 +22,14 @@
 				<!-- Build an executable JAR -->
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.0.2</version>
+				<version>3.2.0</version>
 			</plugin>
 
 			<!-- Package JAR with Main class and all libraries -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.0.0</version>
+				<version>3.2.4</version>
 				<configuration>
 					<createDependencyReducedPom>false</createDependencyReducedPom>
 				</configuration>
@@ -55,7 +55,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>exec-maven-plugin</artifactId>
-				<version>1.6.0</version>
+				<version>3.0.0</version>
 				<executions>
 					<execution>
 						<goals>
@@ -75,32 +75,32 @@
 		<dependency>
 			<groupId>com.google.apis</groupId>
 			<artifactId>google-api-services-admin-directory</artifactId>
-			<version>directory_v1-rev91-1.23.0</version>
+			<version>directory_v1-rev118-1.25.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.apis</groupId>
 			<artifactId>google-api-services-drive</artifactId>
-			<version>v3-rev101-1.23.0</version>
+			<version>v3-rev197-1.25.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.http-client</groupId>
 			<artifactId>google-http-client-jackson2</artifactId>
-			<version>1.23.0</version>
+			<version>1.35.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.api-client</groupId>
 			<artifactId>google-api-client</artifactId>
-			<version>1.23.0</version>
+			<version>1.30.9</version>
 		</dependency>
 		<dependency>
 			<groupId>com.opencsv</groupId>
 			<artifactId>opencsv</artifactId>
-			<version>4.1</version>
+			<version>5.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.7</version>
+			<version>3.10</version>
 		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>

src/main/java/cz/metacentrum/perun/googlegroupconnector/GoogleGroupsConnection.java

@@ -32,9 +32,8 @@ public interface GoogleGroupsConnection {
 	 * Build and return an authorized Drive client service.
 	 *
 	 * @return an authorized Drive client service
-	 * @throws IOException
 	 */
-	Drive getDriveService() throws IOException;
+	Drive getDriveService();
 
 
 }

src/main/java/cz/metacentrum/perun/googlegroupconnector/GoogleGroupsConnectionImpl.java

@@ -32,7 +32,6 @@
  * email and user email filled in.
  *
  * @author Sona Mastrakova <sona.mastrakova@gmail.com>
- * @date 29.7.2015
  */
 public class GoogleGroupsConnectionImpl implements GoogleGroupsConnection {
 
@@ -73,7 +72,7 @@ public Directory getDirectoryService() {
 	}
 
 	@Override
-	public Drive getDriveService() throws IOException {
+	public Drive getDriveService() {
 		return new Drive.Builder(HTTP_TRANSPORT, JSON_FACTORY, authorize()).setApplicationName(APPLICATION_NAME).build();
 	}
 
@@ -125,7 +124,7 @@ private void loadProperties() throws IOException, GeneralSecurityException {
 				try {
 					input.close();
 				} catch (IOException ex) {
-					log.error("Problem with I/O operation while closing file \'" + PROPERTIES_PATH + "\'.", ex);
+					log.error("Problem with I/O operation while closing file '" + PROPERTIES_PATH + "'.", ex);
 				}
 			}
 		}