Merge pull request CESNET#21 from zlamalp/update

Updated all dependencies

README.md

@@ -1,17 +1,17 @@
 # G Suite connector
 
-[![Build Status](https://travis-ci.org/CESNET/google-group-connector.svg?branch=master)](https://travis-ci.org/CESNET/google-group-connector)
+![](https://github.com/CESNET/google-group-connector/workflows/test%20build/badge.svg)
 
-This repository contains java application, used by [Perun](http://perun.cesnet.cz/web/) to connect to [G Suite](https://gsuite.google.com/) service and synchronize users and groups from Perun to your domain in G Suite. 
+This repository contains java application, used by [Perun](https://perun-aai.org) to connect to [G Suite](https://gsuite.google.com/) service and synchronize users and groups from Perun to your domain in G Suite. 
 
 You can also use this application without Perun. You just need to make necessary setup and pass input file in expected format.
 
 Sources of the Perun are located in own [repository](https://github.com/CESNET/perun).
 
 ## Requirements
 
-* Java >= 1.6
-* Maven >= 3.1.x
+* Java >= 17
+* Maven >= 3.6.x
 * G suite account
 
 ## Configuration
@@ -116,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 ./google-group-connector-2.0.0.jar DOMAIN ACTION PATH_TO_CSV_FILE
+java -jar ./google-group-connector-2.0.1.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 ./google-group-connector-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.1.jar DOMAIN ACTION PATH_TO_CSV_FILE
 ```

pom.xml

@@ -5,13 +5,13 @@
 
 	<groupId>cz.metacentrum.perun.core</groupId>
 	<artifactId>google-group-connector</artifactId>
-	<version>2.0.0</version>
+	<version>2.0.1</version>
 	<packaging>jar</packaging>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 		<start-class>cz.metacentrum.perun.googlegroupconnector.GoogleGroupsServiceImpl</start-class>
 	</properties>
 
@@ -75,37 +75,37 @@
 		<dependency>
 			<groupId>com.google.apis</groupId>
 			<artifactId>google-api-services-admin-directory</artifactId>
-			<version>directory_v1-rev118-1.25.0</version>
+			<version>directory_v1-rev20211109-1.32.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.apis</groupId>
 			<artifactId>google-api-services-drive</artifactId>
-			<version>v3-rev197-1.25.0</version>
+			<version>v3-rev20211107-1.32.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.http-client</groupId>
 			<artifactId>google-http-client-jackson2</artifactId>
-			<version>1.35.0</version>
+			<version>1.40.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.api-client</groupId>
 			<artifactId>google-api-client</artifactId>
-			<version>1.30.9</version>
+			<version>1.32.2</version>
 		</dependency>
 		<dependency>
 			<groupId>com.opencsv</groupId>
 			<artifactId>opencsv</artifactId>
-			<version>5.2</version>
+			<version>5.5.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.10</version>
+			<version>3.12.0</version>
 		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.2.3</version>
+			<version>1.2.7</version>
 		</dependency>
 	</dependencies>
 </project>

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

@@ -1,9 +1,8 @@
 package cz.metacentrum.perun.googlegroupconnector;
 
-import com.google.api.services.admin.directory.Directory;
+import com.google.api.services.directory.Directory;
 import com.google.api.services.drive.Drive;
 
-import java.io.IOException;
 import java.util.Properties;
 
 /**

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

@@ -7,7 +7,6 @@
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.client.json.JsonFactory;
 
-import com.google.api.services.admin.directory.Directory;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -17,6 +16,7 @@
 import java.util.List;
 import java.util.Properties;
 
+import com.google.api.services.directory.Directory;
 import com.google.api.services.drive.Drive;
 import org.slf4j.LoggerFactory;
 

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

@@ -1,7 +1,7 @@
 package cz.metacentrum.perun.googlegroupconnector;
 
-import com.google.api.services.admin.directory.model.Group;
-import com.google.api.services.admin.directory.model.User;
+import com.google.api.services.directory.model.Group;
+import com.google.api.services.directory.model.User;
 import com.google.api.services.drive.model.TeamDrive;
 import cz.metacentrum.perun.googlegroupconnector.exceptions.GoogleGroupsIOException;
 import java.io.File;

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

@@ -1,20 +1,20 @@
 package cz.metacentrum.perun.googlegroupconnector;
 
-import com.google.api.services.admin.directory.model.UserName;
+import com.google.api.services.directory.model.UserName;
 import com.google.api.services.drive.Drive;
 import com.google.api.services.drive.model.Permission;
 import com.google.api.services.drive.model.PermissionList;
 import com.opencsv.CSVParserBuilder;
 import com.opencsv.CSVReaderBuilder;
 import com.opencsv.exceptions.CsvException;
 import cz.metacentrum.perun.googlegroupconnector.exceptions.GoogleGroupsIOException;
-import com.google.api.services.admin.directory.Directory;
-import com.google.api.services.admin.directory.model.Group;
-import com.google.api.services.admin.directory.model.Groups;
-import com.google.api.services.admin.directory.model.Member;
-import com.google.api.services.admin.directory.model.Members;
-import com.google.api.services.admin.directory.model.User;
-import com.google.api.services.admin.directory.model.Users;
+import com.google.api.services.directory.Directory;
+import com.google.api.services.directory.model.Group;
+import com.google.api.services.directory.model.Groups;
+import com.google.api.services.directory.model.Member;
+import com.google.api.services.directory.model.Members;
+import com.google.api.services.directory.model.User;
+import com.google.api.services.directory.model.Users;
 import com.google.api.services.drive.model.TeamDriveList;
 import com.google.api.services.drive.model.TeamDrive;
 import com.opencsv.CSVReader;