Skip to content

Commit 6574f22

Browse files
juliencherryjuliencherry
authored
Merge pull request #221 from rosette-api/COMN-308
COMN-308: Remove OSGi support
2 parents 2a1a2a1 + 88d1568 commit 6574f22

File tree

16 files changed

+4
-351
lines changed

16 files changed

+4
-351
lines changed

‎annotations/bnd.bnd‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎annotations/pom.xml‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright 2017 Basis Technology Corp.
3+
Copyright 2017-2024 Basis Technology Corp.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -50,10 +50,6 @@
5050
</dependencies>
5151
<build>
5252
<plugins>
53-
<plugin>
54-
<groupId>biz.aQute.bnd</groupId>
55-
<artifactId>bnd-maven-plugin</artifactId>
56-
</plugin>
5753
<plugin>
5854
<groupId>org.apache.maven.plugins</groupId>
5955
<artifactId>maven-compiler-plugin</artifactId>
@@ -62,15 +58,6 @@
6258
<compilerArgument>-proc:none</compilerArgument>
6359
</configuration>
6460
</plugin>
65-
<plugin>
66-
<groupId>org.apache.maven.plugins</groupId>
67-
<artifactId>maven-jar-plugin</artifactId>
68-
<configuration>
69-
<archive>
70-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
71-
</archive>
72-
</configuration>
73-
</plugin>
7461
</plugins>
7562
</build>
7663
</project>

‎api/bnd.bnd‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎api/pom.xml‎

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright 2018-2022 Basis Technology Corp.
3+
Copyright 2018-2024 Basis Technology Corp.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -68,30 +68,6 @@
6868
</exclusion>
6969
</exclusions>
7070
</dependency>
71-
<dependency>
72-
<groupId>com.basistech.org.apache.httpcomponents</groupId>
73-
<artifactId>httpclient-osgi</artifactId>
74-
<version>${bt-custom-httpclient-osgi-version}</version>
75-
<exclusions>
76-
<exclusion>
77-
<groupId>org.apache.httpcomponents</groupId>
78-
<artifactId>httpclient</artifactId>
79-
</exclusion>
80-
<exclusion>
81-
<groupId>org.apache.httpcomponents</groupId>
82-
<artifactId>httpmime</artifactId>
83-
</exclusion>
84-
<exclusion>
85-
<groupId>commons-codec</groupId>
86-
<artifactId>commons-codec</artifactId>
87-
</exclusion>
88-
</exclusions>
89-
</dependency>
90-
<dependency>
91-
<groupId>org.apache.httpcomponents</groupId>
92-
<artifactId>httpcore-osgi</artifactId>
93-
<version>${http-components-core.version}</version>
94-
</dependency>
9571
<dependency>
9672
<groupId>org.apache.httpcomponents</groupId>
9773
<artifactId>httpmime</artifactId>
@@ -133,19 +109,6 @@
133109
</dependencies>
134110
<build>
135111
<plugins>
136-
<plugin>
137-
<groupId>biz.aQute.bnd</groupId>
138-
<artifactId>bnd-maven-plugin</artifactId>
139-
</plugin>
140-
<plugin>
141-
<groupId>org.apache.maven.plugins</groupId>
142-
<artifactId>maven-jar-plugin</artifactId>
143-
<configuration>
144-
<archive>
145-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
146-
</archive>
147-
</configuration>
148-
</plugin>
149112
<plugin>
150113
<groupId>org.apache.maven.plugins</groupId>
151114
<artifactId>maven-surefire-plugin</artifactId>

‎bnd.bnd‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎common/bnd.bnd‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎common/pom.xml‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright 2017 Basis Technology Corp.
3+
Copyright 2016-2024 Basis Technology Corp.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -31,21 +31,4 @@
3131
<version>${project.version}</version>
3232
</dependency>
3333
</dependencies>
34-
<build>
35-
<plugins>
36-
<plugin>
37-
<groupId>biz.aQute.bnd</groupId>
38-
<artifactId>bnd-maven-plugin</artifactId>
39-
</plugin>
40-
<plugin>
41-
<groupId>org.apache.maven.plugins</groupId>
42-
<artifactId>maven-jar-plugin</artifactId>
43-
<configuration>
44-
<archive>
45-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
46-
</archive>
47-
</configuration>
48-
</plugin>
49-
</plugins>
50-
</build>
5134
</project>

‎json/bnd.bnd‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎json/pom.xml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,6 @@
7373
</dependencies>
7474
<build>
7575
<plugins>
76-
<plugin>
77-
<groupId>biz.aQute.bnd</groupId>
78-
<artifactId>bnd-maven-plugin</artifactId>
79-
</plugin>
80-
<plugin>
81-
<groupId>org.apache.maven.plugins</groupId>
82-
<artifactId>maven-jar-plugin</artifactId>
83-
<configuration>
84-
<archive>
85-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
86-
</archive>
87-
</configuration>
88-
</plugin>
8976
<plugin>
9077
<groupId>org.codehaus.mojo</groupId>
9178
<artifactId>build-helper-maven-plugin</artifactId>

‎model/bnd.bnd‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)