Skip to content

Commit

Permalink
Merge pull request #2 from J-N-K/with_lib
Browse files Browse the repository at this point in the history 
use only external dependencies
  • Loading branch information
@ZzetT
ZzetT authored Jul 22, 2019
2 parents 7d05806 + 1cf6ebc commit 5e48a0d
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 184 deletions.
Binary file removed bundles/org.openhab.binding.telegram/lib/telegrambots-4.2.jar
View file
Binary file not shown.
Binary file removed bundles/org.openhab.binding.telegram/lib/telegrambots-meta-4.2.jar
View file
Binary file not shown.
133 changes: 7 additions & 126 deletions bundles/org.openhab.binding.telegram/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,138 +14,19 @@

<name>openHAB Add-ons :: Bundles :: Telegram Binding</name>

<!-- dependencies>
<dependencies>
<dependency>
<groupId>org.telegram</groupId>
<artifactId>telegrambots</artifactId>
<groupId>org.openhab.osgiify</groupId>
<artifactId>org.telegram.telegrambots</artifactId>
<version>4.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.telegram</groupId>
<artifactId>telegrambots-meta</artifactId>
<version>4.2</version>
<scope>provided</scope>
</dependency>
</dependencies-->

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<guice.version>4.2.2</guice.version>
<glassfish.version>2.25.1</glassfish.version>
<jerseybundle.version>1.19.3</jerseybundle.version>
<httpcompontents.version>4.5.3</httpcompontents.version>
<jackson.version>2.9.8</jackson.version>
<jacksonanotation.version>2.9.0</jacksonanotation.version>
<json.version>20180813</json.version>
<guava.version>25.1-jre</guava.version>
<commonio.version>2.5</commonio.version>

<bnd.importpackage>sun.net.*;resolution:="optional",com.google.inject.*;resolution:="optional"</bnd.importpackage>
</properties>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jacksonanotation.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${glassfish.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-base</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-grizzly2-http</artifactId>
<version>${glassfish.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
<version>${glassfish.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>${json.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpcompontents.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>${httpcompontents.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commonio.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>${guice.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
<scope>provided</scope>
<groupId>org.openhab.osgiify</groupId>
<artifactId>org.telegram.telegrambots-meta</artifactId>
<version>4.2</version>
<scope>provided</scope>
</dependency>

</dependencies>

</project>
80 changes: 22 additions & 58 deletions bundles/org.openhab.binding.telegram/src/main/feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,67 +4,31 @@

<feature name="openhab-binding-telegram" description="Telegram Binding" version="${project.version}">
<feature>openhab-runtime-base</feature>
<feature prerequisite="true">wrap</feature>
<!-- com.fasterxml.jackson.core/jackson-annotations -->
<bundle dependency="true">mvn:org.openhab.osgiify/org.telegram.telegrambots/4.2</bundle>
<bundle dependency="true">mvn:org.openhab.osgiify/org.telegram.telegrambots-meta/4.2</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.9.8</bundle>

<!-- com.google.inject/guice -->
<bundle dependency="true">wrap:mvn:com.google.inject/guice/4.2.2</bundle>

<!-- com.google.guava/guava -->
<bundle dependency="true">wrap:mvn:com.google.guava/guava/25.1-jre</bundle>

<!-- commons-io/commons-io -->
<bundle dependency="true">mvn:commons-io/commons-io/2.5</bundle>

<!-- org.apache.httpcomponents/httpclient -->
<bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.3</bundle>

<!-- org.apache.httpcomponents/httpmime -->
<bundle dependency="true">wrap:mvn:org.apache.httpcomponents/httpmime/4.5.3</bundle>

<!-- org.glassfish.jersey.containers/jersey-container-grizzly2-http -->
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.9.8</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.9.8</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.9.8</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.9.8</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.9.8</bundle>
<bundle dependency="true">mvn:org.glassfish.hk2/hk2-api/2.5.0-b32</bundle>
<bundle dependency="true">mvn:org.glassfish.hk2/hk2-utils/2.5.0-b32</bundle>
<bundle dependency="true">mvn:org.glassfish.hk2/hk2-locator/2.5.0-b32</bundle>
<bundle dependency="true">mvn:org.openhab.osgiify/org.json.json/20131018</bundle>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.9</bundle>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.5</bundle>
<bundle dependency="true">mvn:org.glassfish.jersey.containers/jersey-container-grizzly2-http/2.25.1</bundle>
<bundle dependency="true">mvn:org.glassfish.grizzly/grizzly-http-server/2.3.28</bundle>
<bundle dependency="true">mvn:org.glassfish.grizzly/grizzly-http/2.3.28</bundle>
<bundle dependency="true">mvn:org.glassfish.grizzly/grizzly-framework/2.3.28</bundle>

<!-- org.json/json -->
<bundle dependency="true">mvn:org.json/json/20180813</bundle>

<!-- org.glassfish.jersey.media/jersey-media-json-jackson -->
<bundle dependency="true">mvn:org.glassfish.jersey.media/jersey-media-json-jackson/2.25.1</bundle>
<bundle dependency="true">mvn:org.glassfish.jersey.core/jersey-common/2.25.1</bundle>
<bundle dependency="true">mvn:javax.annotation/javax.annotation-api/1.2</bundle>
<bundle dependency="true">mvn:javax.ws.rs/javax.ws.rs-api/2.0.1</bundle>
<bundle dependency="true">mvn:org.glassfish.hk2/hk2-api/2.5.0-b32</bundle>
<!--bundle dependency="true">mvn:javax.inject/javax.inject/1</bundle-->
<bundle dependency="true">mvn:org.glassfish.hk2/hk2-utils/2.5.0-b32</bundle>
<bundle dependency="true">mvn:org.glassfish.hk2.external/aopalliance-repackaged/2.5.0-b32</bundle>
<bundle dependency="true">mvn:org.glassfish.hk2/hk2-locator/2.5.0-b32</bundle>
<bundle dependency="true">mvn:org.javassist/javassist/3.20.0-GA</bundle>
<bundle dependency="true">mvn:org.glassfish.hk2/osgi-resource-locator/1.0.1</bundle>
<bundle dependency="true">mvn:org.glassfish.hk2.external/javax.inject/2.5.0-b32</bundle>
<bundle dependency="true">mvn:org.glassfish.jersey.bundles.repackaged/jersey-guava/2.25.1</bundle>
<bundle dependency="true">mvn:org.glassfish.jersey.ext/jersey-entity-filtering/2.25.1</bundle>


<!-- com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider -->
<bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.9.8</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.9.8</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.9.8</bundle>
<!-- com.fasterxml.jackson.core/jackson-databind -->
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.9.8</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.9.8</bundle>


<!-- org.glassfish.jersey.core/jersey-server -->
<bundle dependency="true">mvn:org.glassfish.grizzly/grizzly-http-server/2.3.28</bundle>
<bundle dependency="true">mvn:org.glassfish.grizzly/grizzly-http/2.3.28</bundle>
<bundle dependency="true">mvn:org.glassfish.grizzly/grizzly-framework/2.3.28</bundle>
<bundle dependency="true">mvn:org.glassfish.jersey.core/jersey-server/2.25.1</bundle>
<bundle dependency="true">mvn:javax.validation/validation-api/1.1.0.Final</bundle>
<bundle dependency="true">mvn:org.glassfish.jersey.core/jersey-client/2.25.1</bundle>
<bundle dependency="true">mvn:org.glassfish.jersey.media/jersey-media-jaxb/2.25.1</bundle>

<bundle dependency="true">mvn:org.glassfish.jersey.core/jersey-common/2.25.1</bundle>
<bundle dependency="true">mvn:org.glassfish.jersey.core/jersey-client/2.25.1</bundle>
<bundle dependency="true">mvn:org.glassfish.jersey.ext/jersey-entity-filtering/2.25.1</bundle>
<bundle dependency="true">mvn:org.glassfish.jersey.media/jersey-media-json-jackson/2.25.1</bundle>
<bundle dependency="true">mvn:org.glassfish.jersey.bundles.repackaged/jersey-guava/2.25.1</bundle>
<bundle dependency="true">mvn:org.javassist/javassist/3.20.0-GA</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.telegram/${project.version}</bundle>
</feature>
</features>

0 comments on commit 5e48a0d

Please sign in to comment.