This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new 6ade2a5 HOP-2703: remove from assemblies
new 15c319d Merge pull request #714 from hansva/master
6ade2a5 is described below
commit 6ade2a595981f1b25924675dfef133eec8b05d17
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Sat Mar 27 15:43:22 2021 +0100
HOP-2703: remove from assemblies
---
.../plugins/transforms/googleanalytics/pom.xml | 93 -----------------
.../googleanalytics/src/assembly/assembly.xml | 115 ---------------------
.../googleanalytics/src/main/resources/version.xml | 20 ----
assemblies/plugins/transforms/googlesheets/pom.xml | 72 -------------
.../googlesheets/src/assembly/assembly.xml | 69 -------------
.../googlesheets/src/main/resources/version.xml | 20 ----
assemblies/plugins/transforms/pom.xml | 2 -
7 files changed, 391 deletions(-)
diff --git a/assemblies/plugins/transforms/googleanalytics/pom.xml
b/assemblies/plugins/transforms/googleanalytics/pom.xml
deleted file mode 100644
index c61b900..0000000
--- a/assemblies/plugins/transforms/googleanalytics/pom.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
-
-<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.apache.hop</groupId>
- <artifactId>hop-assemblies-plugins-transforms</artifactId>
- <version>0.70-SNAPSHOT</version>
- </parent>
-
-
- <artifactId>hop-assemblies-plugins-transforms-googleanalytics</artifactId>
- <version>0.70-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>Hop Assemblies Plugins Transforms Google Analytics</name>
- <description></description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-transform-googleanalytics</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.apis</groupId>
- <artifactId>google-api-services-analytics</artifactId>
- <version>v3-rev116-1.20.0</version>
- </dependency>
- <dependency>
- <groupId>com.google.api-client</groupId>
- <artifactId>google-api-client</artifactId>
- <version>1.30.10</version>
- </dependency>
- <dependency>
- <groupId>com.google.oauth-client</groupId>
- <artifactId>google-oauth-client</artifactId>
- <version>1.31.2</version>
- </dependency>
- <dependency>
- <groupId>com.google.http-client</groupId>
- <artifactId>google-http-client-jackson2</artifactId>
- <version>1.37.0</version>
- </dependency>
- <dependency>
- <groupId>com.google.http-client</groupId>
- <artifactId>google-http-client</artifactId>
- <version>1.38.0</version>
- <exclusions>
- <!-- Vulnerable component - need more recent version
[PPP-3571] -->
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-context</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>io.opencensus</groupId>
- <artifactId>opencensus-api</artifactId>
- <version>0.28.3</version>
- </dependency>
- <dependency>
- <groupId>io.opencensus</groupId>
- <artifactId>opencensus-contrib-http-util</artifactId>
- <version>0.11.0</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
diff --git
a/assemblies/plugins/transforms/googleanalytics/src/assembly/assembly.xml
b/assemblies/plugins/transforms/googleanalytics/src/assembly/assembly.xml
deleted file mode 100644
index 7f78e23..0000000
--- a/assemblies/plugins/transforms/googleanalytics/src/assembly/assembly.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
-
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3
http://maven.apache.org/xsd/assembly-1.1.3.xsd";>
- <id>hop-assemblies-plugins-transforms-googleanalytics</id>
- <formats>
- <format>zip</format>
- </formats>
- <baseDirectory>transforms/googleanalytics</baseDirectory>
- <files>
- <file>
- <source>${project.basedir}/src/main/resources/version.xml</source>
- <outputDirectory>.</outputDirectory>
- <filtered>true</filtered>
- </file>
- </files>
- <fileSets>
- <fileSet>
- <outputDirectory>lib</outputDirectory>
- <excludes>
- <exclude>**/*</exclude>
- </excludes>
- </fileSet>
- </fileSets>
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <includes>
-
<include>org.apache.hop:hop-transform-googleanalytics:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
-
<include>com.google.apis:google-api-services-analytics:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>com.google.api-client:google-api-client:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
-
<include>com.google.oauth-client:google-oauth-client:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
-
<include>com.google.http-client:google-http-client-jackson2:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
-
<include>com.google.http-client:google-http-client:jar</include>
- </includes>
- <!--
- <exclusions>
- <!– Vulnerable component - need more
recent version [PPP-3571] –>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- -->
- </dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>io.grpc:grpc-context:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>io.opencensus:opencensus-api:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
-
<include>io.opencensus:opencensus-contrib-http-util:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
-</assembly>
\ No newline at end of file
diff --git
a/assemblies/plugins/transforms/googleanalytics/src/main/resources/version.xml
b/assemblies/plugins/transforms/googleanalytics/src/main/resources/version.xml
deleted file mode 100644
index 6be576a..0000000
---
a/assemblies/plugins/transforms/googleanalytics/src/main/resources/version.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
-
-<version>${project.version}</version>
\ No newline at end of file
diff --git a/assemblies/plugins/transforms/googlesheets/pom.xml
b/assemblies/plugins/transforms/googlesheets/pom.xml
deleted file mode 100644
index 9b5c36f..0000000
--- a/assemblies/plugins/transforms/googlesheets/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
-
-<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.apache.hop</groupId>
- <artifactId>hop-assemblies-plugins-transforms</artifactId>
- <version>0.70-SNAPSHOT</version>
- </parent>
-
-
- <artifactId>hop-assemblies-plugins-transforms-googlesheets</artifactId>
- <version>0.70-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>Hop Assemblies Plugins Transforms Google Sheets</name>
- <description></description>
-
- <properties>
- <google-api-client.version>1.23.0</google-api-client.version>
- <google-api-sheets.version>v4-rev493-1.23.0</google-api-sheets.version>
-
<google-api-drive.version>v3-rev20191108-1.30.3</google-api-drive.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-transform-googlesheets</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.api-client</groupId>
- <artifactId>google-api-client</artifactId>
- <version>${google-api-client.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.oauth-client</groupId>
- <artifactId>google-oauth-client-jetty</artifactId>
- <version>${google-api-client.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.apis</groupId>
- <artifactId>google-api-services-sheets</artifactId>
- <version>${google-api-sheets.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.apis</groupId>
- <artifactId>google-api-services-drive</artifactId>
- <version>${google-api-drive.version}</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
diff --git
a/assemblies/plugins/transforms/googlesheets/src/assembly/assembly.xml
b/assemblies/plugins/transforms/googlesheets/src/assembly/assembly.xml
deleted file mode 100644
index 12c4bb8..0000000
--- a/assemblies/plugins/transforms/googlesheets/src/assembly/assembly.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
-
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3
http://maven.apache.org/xsd/assembly-1.1.3.xsd";>
- <id>hop-assemblies-plugins-transforms-googlesheets</id>
- <formats>
- <format>zip</format>
- </formats>
- <baseDirectory>transforms/googlesheets</baseDirectory>
- <files>
- <file>
- <source>${project.basedir}/src/main/resources/version.xml</source>
- <outputDirectory>.</outputDirectory>
- <filtered>true</filtered>
- </file>
- </files>
- <fileSets>
- <fileSet>
- <outputDirectory>lib</outputDirectory>
- <excludes>
- <exclude>**/*</exclude>
- </excludes>
- </fileSet>
- </fileSets>
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <includes>
- <include>org.apache.hop:hop-transform-googlesheets:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>com.google.api-client:google-api-client:jar</include>
- <include>com.google.oauth-client:google-oauth-client:jar</include>
- <include>com.google.http-client:google-http-client:jar</include>
- <include>com.google.code.findbugs:jsr305:jar</include>
-
<include>com.google.http-client:google-http-client-jackson2:jar</include>
- <include>com.google.guava:guava-jdk5:jar</include>
-
<include>com.google.oauth-client:google-oauth-client-jetty:jar</include>
-
<include>com.google.oauth-client:google-oauth-client-java6:jar</include>
- <include>org.mortbay.jetty:jetty:jar</include>
- <include>org.mortbay.jetty:jetty-util:jar</include>
- <include>org.mortbay.jetty:servlet-api:jar</include>
- <include>com.google.apis:google-api-services-sheets:jar</include>
- <include>com.google.apis:google-api-services-drive:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
-</assembly>
\ No newline at end of file
diff --git
a/assemblies/plugins/transforms/googlesheets/src/main/resources/version.xml
b/assemblies/plugins/transforms/googlesheets/src/main/resources/version.xml
deleted file mode 100644
index 6be576a..0000000
--- a/assemblies/plugins/transforms/googlesheets/src/main/resources/version.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
-
-<version>${project.version}</version>
\ No newline at end of file
diff --git a/assemblies/plugins/transforms/pom.xml
b/assemblies/plugins/transforms/pom.xml
index 58db0fc..5905901 100644
--- a/assemblies/plugins/transforms/pom.xml
+++ b/assemblies/plugins/transforms/pom.xml
@@ -85,8 +85,6 @@
<module>getsubfolders</module>
<module>gettablenames</module>
<module>getvariable</module>
- <module>googleanalytics</module>
- <module>googlesheets</module>
<module>http</module>
<module>httppost</module>
<module>insertupdate</module>
