From: Connor Petty <mistercpp2000@gmail.com>
Date: Wed, 25 Nov 2020 09:10:53 +0000 (-0800)
Subject: Merge client-api subproject into tado binding project. (#9125)
X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=62523e135aba680cc2f669f67c6904029b9896c3;p=openhab-addons.git

Merge client-api subproject into tado binding project. (#9125)

Signed-off-by: Connor Petty <mistercpp2000+gitsignoff@gmail.com>
---

diff --git a/bundles/org.openhab.binding.tado/pom.xml b/bundles/org.openhab.binding.tado/pom.xml
index 820647def0..e83e60f6f6 100644
--- a/bundles/org.openhab.binding.tado/pom.xml
+++ b/bundles/org.openhab.binding.tado/pom.xml
@@ -14,12 +14,56 @@
 
   <name>openHAB Add-ons :: Bundles :: Tado Binding</name>
 
+  <pluginRepositories>
+    <pluginRepository>
+      <id>jitpack.io</id>
+      <url>https://jitpack.io</url>
+    </pluginRepository>
+  </pluginRepositories>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.swagger</groupId>
+        <artifactId>swagger-codegen-maven-plugin</artifactId>
+        <version>2.3.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+              <inputSpec>${project.basedir}/src/main/api/tado-api.yaml</inputSpec>
+              <language>com.github.dfrommi.swagger.OpenHABClientGenerator</language>
+
+              <apiPackage>org.openhab.binding.tado.internal.api.client</apiPackage>
+              <modelPackage>org.openhab.binding.tado.internal.api.model</modelPackage>
+              <invokerPackage>org.openhab.binding.tado.internal.api</invokerPackage>
+            </configuration>
+          </execution>
+        </executions>
+
+        <dependencies>
+          <dependency>
+            <groupId>com.github.dfrommi</groupId>
+            <artifactId>swagger-codegen-openhab</artifactId>
+            <version>0.2</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+
   <dependencies>
     <dependency>
-      <groupId>org.openhab.binding.tado</groupId>
-      <artifactId>api-client</artifactId>
-      <version>1.4.1</version>
-      <scope>compile</scope>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.8.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-client</artifactId>
+      <version>9.4.12.v20180830</version>
     </dependency>
   </dependencies>
 
diff --git a/bundles/org.openhab.binding.tado/src/main/api/pom.xml b/bundles/org.openhab.binding.tado/src/main/api/pom.xml
deleted file mode 100644
index db567d4d05..0000000000
--- a/bundles/org.openhab.binding.tado/src/main/api/pom.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-
-	<groupId>org.openhab.binding.tado</groupId>
-	<artifactId>api-client</artifactId>
-	<version>1.4.1</version>
-
-	<properties>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>jitpack.io</id>
-			<url>https://jitpack.io</url>
-		</pluginRepository>
-	</pluginRepositories>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>io.swagger</groupId>
-				<artifactId>swagger-codegen-maven-plugin</artifactId>
-				<version>2.3.1</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<inputSpec>${project.basedir}/tado-api.yaml</inputSpec>
-							<language>com.github.dfrommi.swagger.OpenHABClientGenerator</language>
-
-							<apiPackage>org.openhab.binding.tado.internal.api.client</apiPackage>
-							<modelPackage>org.openhab.binding.tado.internal.api.model</modelPackage>
-							<invokerPackage>org.openhab.binding.tado.internal.api</invokerPackage>
-
-							<configOptions>
-								<artifactId>tado</artifactId>
-								<artifactVersion>${project.version}</artifactVersion>
-							</configOptions>
-						</configuration>
-					</execution>
-				</executions>
-
-				<dependencies>
-					<dependency>
-						<groupId>com.github.dfrommi</groupId>
-						<artifactId>swagger-codegen-openhab</artifactId>
-						<version>0.2</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<version>4.1.0</version>
-				<executions>
-					<execution>
-						<id>bundle-manifest</id>
-						<phase>process-classes</phase>
-						<goals>
-							<goal>manifest</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
-				<configuration>
-					<archive>
-						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-					</archive>
-					<outputDirectory>${project.basedir}/../../../lib</outputDirectory>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>2.8.3</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-client</artifactId>
-			<version>9.4.12.v20180830</version>
-		</dependency>
-	</dependencies>
-</project>
-