Skip to content

Commit b5acc52

Browse files
dagnirdagnir
committed
Temporarily remove OSGi support
The Netty client still has no support so holding off until it does. See #726
1 parent a2bf48d commit b5acc52

File tree

11 files changed

+5
-161
lines changed

11 files changed

+5
-161
lines changed

‎.changes/next-release/bugfix-AWSSDKforJavav2-22e76ea.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"category": "AWS SDK for Java v2",
3+
"type": "bugfix",
4+
"description": "Temporarily removed OSGi support because the Netty HTTP client does not yet support it. See [#726](https://github.com/aws/aws-sdk-java-v2/issues/726)"
5+
}

‎core/pom.xml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -46,30 +46,4 @@
4646
<module>protocols</module>
4747
</modules>
4848

49-
<build>
50-
<plugins>
51-
<plugin>
52-
<groupId>org.apache.maven.plugins</groupId>
53-
<artifactId>maven-jar-plugin</artifactId>
54-
<configuration>
55-
<archive>
56-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
57-
</archive>
58-
</configuration>
59-
</plugin>
60-
<plugin>
61-
<groupId>org.apache.felix</groupId>
62-
<artifactId>maven-bundle-plugin</artifactId>
63-
<executions>
64-
<execution>
65-
<id>bundle-manifest</id>
66-
<phase>process-classes</phase>
67-
<goals>
68-
<goal>manifest</goal>
69-
</goals>
70-
</execution>
71-
</executions>
72-
</plugin>
73-
</plugins>
74-
</build>
7549
</project>

‎core/sdk-core/pom.xml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -203,24 +203,6 @@
203203
</properties>
204204
</configuration>
205205
</plugin>
206-
<plugin>
207-
<groupId>org.apache.felix</groupId>
208-
<artifactId>maven-bundle-plugin</artifactId>
209-
<executions>
210-
<execution>
211-
<id>bundle-manifest</id>
212-
<phase>process-classes</phase>
213-
<goals>
214-
<goal>manifest</goal>
215-
</goals>
216-
</execution>
217-
</executions>
218-
<configuration>
219-
<instructions>
220-
<Require-Capability>osgi.serviceloader; filter:="(|(osgi.serviceloader=software.amazon.awssdk.http.SdkHttpService)(osgi.serviceloader=software.amazon.awssdk.http.SdkAsyncHttpService))";cardinality:=multiple,osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)"</Require-Capability>
221-
</instructions>
222-
</configuration>
223-
</plugin>
224206
<plugin>
225207
<groupId>org.apache.maven.plugins</groupId>
226208
<artifactId>maven-jar-plugin</artifactId>

‎flow/pom.xml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,27 +55,12 @@
5555
<configuration>
5656
<finalName>aws-flow-java</finalName>
5757
<archive>
58-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
5958
<manifestEntries>
6059
<Automatic-Module-Name>software.amazon.eventstream</Automatic-Module-Name>
6160
</manifestEntries>
6261
</archive>
6362
</configuration>
6463
</plugin>
65-
<plugin>
66-
<groupId>org.apache.felix</groupId>
67-
<artifactId>maven-bundle-plugin</artifactId>
68-
<version>3.5.1</version>
69-
<executions>
70-
<execution>
71-
<id>bundle-manifest</id>
72-
<phase>process-classes</phase>
73-
<goals>
74-
<goal>manifest</goal>
75-
</goals>
76-
</execution>
77-
</executions>
78-
</plugin>
7964
<!--Config to skip from release. Commenting it as we need to include flow in next release -->
8065
<!--<plugin>-->
8166
<!--<groupId>org.apache.maven.plugins</groupId>-->

‎http-client-spi/pom.xml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -68,26 +68,12 @@
6868
<artifactId>maven-jar-plugin</artifactId>
6969
<configuration>
7070
<archive>
71-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
7271
<manifestEntries>
7372
<Automatic-Module-Name>software.amazon.awssdk.http</Automatic-Module-Name>
7473
</manifestEntries>
7574
</archive>
7675
</configuration>
7776
</plugin>
78-
<plugin>
79-
<groupId>org.apache.felix</groupId>
80-
<artifactId>maven-bundle-plugin</artifactId>
81-
<executions>
82-
<execution>
83-
<id>bundle-manifest</id>
84-
<phase>process-classes</phase>
85-
<goals>
86-
<goal>manifest</goal>
87-
</goals>
88-
</execution>
89-
</executions>
90-
</plugin>
9177
</plugins>
9278
</build>
9379

‎http-clients/apache-client/pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,6 @@
7777

7878
<build>
7979
<plugins>
80-
<plugin>
81-
<groupId>org.apache.felix</groupId>
82-
<artifactId>maven-bundle-plugin</artifactId>
83-
<configuration>
84-
<instructions>
85-
<Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
86-
<Provide-Capability>osgi.serviceloader; osgi.serviceloader=software.amazon.awssdk.http.SdkHttpService</Provide-Capability>
87-
</instructions>
88-
</configuration>
89-
</plugin>
9080
<plugin>
9181
<groupId>org.apache.maven.plugins</groupId>
9282
<artifactId>maven-jar-plugin</artifactId>

‎http-clients/netty-nio-client/pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -156,16 +156,6 @@
156156
<groupId>org.codehaus.mojo</groupId>
157157
<artifactId>build-helper-maven-plugin</artifactId>
158158
</plugin>
159-
<plugin>
160-
<groupId>org.apache.felix</groupId>
161-
<artifactId>maven-bundle-plugin</artifactId>
162-
<configuration>
163-
<instructions>
164-
<Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
165-
<Provide-Capability>osgi.serviceloader; osgi.serviceloader=software.amazon.awssdk.http.SdkAsyncHttpService</Provide-Capability>
166-
</instructions>
167-
</configuration>
168-
</plugin>
169159
<plugin>
170160
<groupId>org.apache.maven.plugins</groupId>
171161
<artifactId>maven-jar-plugin</artifactId>

‎http-clients/pom.xml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -39,30 +39,4 @@
3939
<module>url-connection-client</module>
4040
</modules>
4141

42-
<build>
43-
<plugins>
44-
<plugin>
45-
<groupId>org.apache.maven.plugins</groupId>
46-
<artifactId>maven-jar-plugin</artifactId>
47-
<configuration>
48-
<archive>
49-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
50-
</archive>
51-
</configuration>
52-
</plugin>
53-
<plugin>
54-
<groupId>org.apache.felix</groupId>
55-
<artifactId>maven-bundle-plugin</artifactId>
56-
<executions>
57-
<execution>
58-
<id>bundle-manifest</id>
59-
<phase>process-classes</phase>
60-
<goals>
61-
<goal>manifest</goal>
62-
</goals>
63-
</execution>
64-
</executions>
65-
</plugin>
66-
</plugins>
67-
</build>
6842
</project>

‎pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@
116116
<maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
117117
<maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version>
118118
<maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
119-
<maven-bundle-plugin.version>4.0.0</maven-bundle-plugin.version>
120119
<maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
121120
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
122121
<checkstyle.version>7.8.2</checkstyle.version>
@@ -535,11 +534,6 @@
535534
<artifactId>maven-jar-plugin</artifactId>
536535
<version>${maven-jar-plugin.version}</version>
537536
</plugin>
538-
<plugin>
539-
<groupId>org.apache.felix</groupId>
540-
<artifactId>maven-bundle-plugin</artifactId>
541-
<version>${maven-bundle-plugin.version}</version>
542-
</plugin>
543537
</plugins>
544538
</pluginManagement>
545539

‎services/pom.xml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -330,28 +330,6 @@
330330
<groupId>org.codehaus.mojo</groupId>
331331
<artifactId>build-helper-maven-plugin</artifactId>
332332
</plugin>
333-
<plugin>
334-
<groupId>org.apache.maven.plugins</groupId>
335-
<artifactId>maven-jar-plugin</artifactId>
336-
<configuration>
337-
<archive>
338-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
339-
</archive>
340-
</configuration>
341-
</plugin>
342-
<plugin>
343-
<groupId>org.apache.felix</groupId>
344-
<artifactId>maven-bundle-plugin</artifactId>
345-
<executions>
346-
<execution>
347-
<id>bundle-manifest</id>
348-
<phase>process-classes</phase>
349-
<goals>
350-
<goal>manifest</goal>
351-
</goals>
352-
</execution>
353-
</executions>
354-
</plugin>
355333
</plugins>
356334
</build>
357335

‎utils/pom.xml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -81,26 +81,12 @@
8181
<artifactId>maven-jar-plugin</artifactId>
8282
<configuration>
8383
<archive>
84-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
8584
<manifestEntries>
8685
<Automatic-Module-Name>software.amazon.awssdk.utils</Automatic-Module-Name>
8786
</manifestEntries>
8887
</archive>
8988
</configuration>
9089
</plugin>
91-
<plugin>
92-
<groupId>org.apache.felix</groupId>
93-
<artifactId>maven-bundle-plugin</artifactId>
94-
<executions>
95-
<execution>
96-
<id>bundle-manifest</id>
97-
<phase>process-classes</phase>
98-
<goals>
99-
<goal>manifest</goal>
100-
</goals>
101-
</execution>
102-
</executions>
103-
</plugin>
10490
</plugins>
10591
</build>
10692

0 commit comments

Comments
 (0)