Skip to content

Commit 81b7a2c

Browse files
author
HaiJun Liu
committed
Fix issue #62 : add osgi support
1 parent f54097e commit 81b7a2c

File tree

2 files changed

+143
-2
lines changed

2 files changed

+143
-2
lines changed

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<module>weixin-java-common</module>
4040
<module>weixin-java-cp</module>
4141
<module>weixin-java-mp</module>
42+
<module>weixin-java-osgi</module>
4243
</modules>
4344

4445
<properties>
@@ -106,7 +107,7 @@
106107
<groupId>redis.clients</groupId>
107108
<artifactId>jedis</artifactId>
108109
<version>${jedis.version}</version>
109-
<scope>provided</scope>
110+
<optional>true</optional>
110111
</dependency>
111112
<dependency>
112113
<groupId>com.google.guava</groupId>
@@ -295,5 +296,4 @@
295296
</plugins>
296297
</build>
297298

298-
299299
</project>

‎weixin-java-osgi/pom.xml

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<parent>
7+
<groupId>com.github.binarywang</groupId>
8+
<artifactId>weixin-java-parent</artifactId>
9+
<version>2.3.0-SNAPSHOT</version>
10+
</parent>
11+
12+
<artifactId>weixin-java-osgi</artifactId>
13+
<packaging>bundle</packaging>
14+
<name>WeiXin Java Tools - OSGI</name>
15+
<description>微信公众号Java SDK OSGI</description>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>org.jodd</groupId>
20+
<artifactId>jodd-bean</artifactId>
21+
<version>${jodd-http.version}</version>
22+
</dependency>
23+
<dependency>
24+
<groupId>org.apache.servicemix.bundles</groupId>
25+
<artifactId>org.apache.servicemix.bundles.xmlpull</artifactId>
26+
<version>1.1.3.1_2</version>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.apache.servicemix.bundles</groupId>
30+
<artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
31+
<version>1.1.4c_7</version>
32+
</dependency>
33+
<dependency>
34+
<groupId>com.thoughtworks.xstream</groupId>
35+
<artifactId>xstream</artifactId>
36+
<version>1.4.7</version>
37+
<scope>provided</scope>
38+
<exclusions>
39+
<exclusion>
40+
<groupId>xmlpull</groupId>
41+
<artifactId>xmlpull</artifactId>
42+
</exclusion>
43+
<exclusion>
44+
<groupId>xpp3</groupId>
45+
<artifactId>xpp3_min</artifactId>
46+
</exclusion>
47+
</exclusions>
48+
</dependency>
49+
<dependency>
50+
<groupId>org.apache.httpcomponents</groupId>
51+
<artifactId>httpcore</artifactId>
52+
<version>4.4.1</version>
53+
<scope>provided</scope>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.apache.httpcomponents</groupId>
57+
<artifactId>httpclient</artifactId>
58+
<version>${httpclient.version}</version>
59+
<scope>provided</scope>
60+
</dependency>
61+
<dependency>
62+
<groupId>org.apache.httpcomponents</groupId>
63+
<artifactId>httpmime</artifactId>
64+
<version>${httpclient.version}</version>
65+
<scope>provided</scope>
66+
</dependency>
67+
<dependency>
68+
<groupId>com.github.binarywang</groupId>
69+
<artifactId>weixin-java-common</artifactId>
70+
<version>${project.version}</version>
71+
<scope>provided</scope>
72+
</dependency>
73+
<dependency>
74+
<groupId>com.github.binarywang</groupId>
75+
<artifactId>weixin-java-cp</artifactId>
76+
<version>${project.version}</version>
77+
<scope>provided</scope>
78+
</dependency>
79+
<dependency>
80+
<groupId>com.github.binarywang</groupId>
81+
<artifactId>weixin-java-mp</artifactId>
82+
<version>${project.version}</version>
83+
<scope>provided</scope>
84+
</dependency>
85+
</dependencies>
86+
87+
<build>
88+
<plugins>
89+
<plugin>
90+
<groupId>org.apache.felix</groupId>
91+
<artifactId>maven-bundle-plugin</artifactId>
92+
<version>3.2.0</version>
93+
<extensions>true</extensions>
94+
<configuration>
95+
<instructions>
96+
<Embed-Dependency>
97+
weixin-java-common;inline=true
98+
,weixin-java-cp;inline=true
99+
,weixin-java-mp;inline=true
100+
,httpcore;inline=true
101+
,httpclient;inline=true
102+
,httpmime;inline=true
103+
,xstream;inline=true
104+
</Embed-Dependency>
105+
<Export-Package>me.chanjar.weixin.*</Export-Package>
106+
<Import-Package>
107+
!org.apache.commons.logging
108+
,com.bea.xml.stream;resolution:=optional
109+
,com.ctc.wstx.stax;resolution:=optional
110+
,javax.xml.namespace;resolution:=optional
111+
,javax.xml.stream;resolution:=optional,
112+
,net.sf.cglib.proxy;resolution:=optional
113+
,nu.xom;resolution:=optional
114+
,org.codehaus.jettison;version="[1.2,2)";resolution:=optional
115+
,org.codehaus.jettison.mapped;version="[1.2,2)";resolution:=optional
116+
,org.dom4j;resolution:=optional
117+
,org.dom4j.io;resolution:=optional
118+
,org.dom4j.tree;resolution:=op
119+
tional,org.jdom;resolution:=optional
120+
,org.jdom.input;resolution:=optional
121+
,org.jdom2;resolution:=optional
122+
,org.jdom2.input;resolution:=optional
123+
,org.joda.time;version="[1.6,2)";resolution:=optional
124+
,org.joda.time.format;version="[1.6,2)";resolution:=optional
125+
,org.kxml2.io;resolution:=optional
126+
,org.w3c.dom;resolution:=optional
127+
,*</Import-Package>
128+
</instructions>
129+
</configuration>
130+
<dependencies>
131+
<dependency>
132+
<groupId>org.apache.felix</groupId>
133+
<artifactId>org.apache.felix.dependencymanager.annotation</artifactId>
134+
<version>4.1.0</version>
135+
</dependency>
136+
</dependencies>
137+
</plugin>
138+
</plugins>
139+
</build>
140+
141+
</project>

0 commit comments

Comments
 (0)