Skip to content

Commit ca33f21

Browse files
cowtowncodercowtowncoder
authored
Remove Jakarta bundle fix added in #136 to try to fix #138 (#139)
Remove Jakarta bundle fix added in #136 to try to fix #138
1 parent e66f246 commit ca33f21

File tree

8 files changed

+10
-272
lines changed

8 files changed

+10
-272
lines changed

‎base/pom.xml

+1-39
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>com.fasterxml.jackson.jaxrs</groupId>
1111
<artifactId>jackson-jaxrs-providers</artifactId>
12-
<version>2.12.2-SNAPSHOT</version>
12+
<version>2.12.3-SNAPSHOT</version>
1313
</parent>
1414
<artifactId>jackson-jaxrs-base</artifactId>
1515
<name>Jackson-JAXRS-base</name>
@@ -116,44 +116,6 @@ ${project.groupId}.annotation.*;version=${project.version}
116116
</dependencies>
117117
</plugin>
118118

119-
<!-- Jakarta bundle fix - nb place last for execution order on package phase
120-
@gedmarc 20210222-->
121-
<plugin>
122-
<groupId>org.apache.felix</groupId>
123-
<artifactId>maven-bundle-plugin</artifactId>
124-
<executions>
125-
<execution>
126-
<id>default_bundle</id>
127-
<phase>process-classes</phase>
128-
<goals>
129-
<goal>bundle</goal>
130-
</goals>
131-
<configuration>
132-
<manifestLocation>${build.directory}/javax</manifestLocation>
133-
<packaging>jar</packaging>
134-
<instructions>
135-
<_nouses>false</_nouses>
136-
</instructions>
137-
</configuration>
138-
</execution>
139-
<execution>
140-
<id>bundle_jakarta_manifest</id>
141-
<phase>process-classes</phase>
142-
<goals>
143-
<goal>manifest</goal>
144-
</goals>
145-
<configuration>
146-
<manifestLocation>${build.directory}/jakarta</manifestLocation>
147-
<classifier>jakarta</classifier>
148-
<packaging>jar</packaging>
149-
<instructions>
150-
<Import-Package>jakarta.ws.rs;version="[3.0,4)",jakarta.ws.rs.core;version="[3.0,4)",jakarta.ws.rs.ext;version="[3.0,4)",!javax.ws*,*</Import-Package>
151-
</instructions>
152-
</configuration>
153-
</execution>
154-
</executions>
155-
</plugin>
156-
157119
</plugins>
158120
</build>
159121
</project>

‎cbor/pom.xml

+1-38
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>com.fasterxml.jackson.jaxrs</groupId>
1111
<artifactId>jackson-jaxrs-providers</artifactId>
12-
<version>2.12.2-SNAPSHOT</version>
12+
<version>2.12.3-SNAPSHOT</version>
1313
</parent>
1414
<artifactId>jackson-jaxrs-cbor-provider</artifactId>
1515
<name>Jackson-JAXRS-CBOR</name>
@@ -157,43 +157,6 @@
157157
</dependencies>
158158
</plugin>
159159

160-
<!-- Jakarta bundle fix - nb place last for execution order on package phase
161-
@gedmarc 20210222-->
162-
<plugin>
163-
<groupId>org.apache.felix</groupId>
164-
<artifactId>maven-bundle-plugin</artifactId>
165-
<executions>
166-
<execution>
167-
<id>default_bundle</id>
168-
<phase>process-classes</phase>
169-
<goals>
170-
<goal>bundle</goal>
171-
</goals>
172-
<configuration>
173-
<manifestLocation>${build.directory}/javax</manifestLocation>
174-
<packaging>jar</packaging>
175-
<instructions>
176-
<_nouses>false</_nouses>
177-
</instructions>
178-
</configuration>
179-
</execution>
180-
<execution>
181-
<id>bundle_jakarta_manifest</id>
182-
<phase>process-classes</phase>
183-
<goals>
184-
<goal>manifest</goal>
185-
</goals>
186-
<configuration>
187-
<manifestLocation>${build.directory}/jakarta</manifestLocation>
188-
<classifier>jakarta</classifier>
189-
<packaging>jar</packaging>
190-
<instructions>
191-
<Import-Package>jakarta.ws.rs;version="[3.0,4)",jakarta.ws.rs.core;version="[3.0,4)",jakarta.ws.rs.ext;version="[3.0,4)",!javax.ws*,*</Import-Package>
192-
</instructions>
193-
</configuration>
194-
</execution>
195-
</executions>
196-
</plugin>
197160
</plugins>
198161
</build>
199162
</project>

‎datatypes/pom.xml

+1-39
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>com.fasterxml.jackson.jaxrs</groupId>
1111
<artifactId>jackson-jaxrs-providers</artifactId>
12-
<version>2.12.2-SNAPSHOT</version>
12+
<version>2.12.3-SNAPSHOT</version>
1313
</parent>
1414
<!-- note: different group id, it being datatype -->
1515
<groupId>com.fasterxml.jackson.datatype</groupId>
@@ -141,44 +141,6 @@
141141
</dependencies>
142142
</plugin>
143143

144-
<!-- Jakarta bundle fix - nb place last for execution order on package phase
145-
@gedmarc 20210222-->
146-
<plugin>
147-
<groupId>org.apache.felix</groupId>
148-
<artifactId>maven-bundle-plugin</artifactId>
149-
<executions>
150-
<execution>
151-
<id>default_bundle</id>
152-
<phase>process-classes</phase>
153-
<goals>
154-
<goal>bundle</goal>
155-
</goals>
156-
<configuration>
157-
<manifestLocation>${build.directory}/javax</manifestLocation>
158-
<packaging>jar</packaging>
159-
<instructions>
160-
<_nouses>false</_nouses>
161-
</instructions>
162-
</configuration>
163-
</execution>
164-
<execution>
165-
<id>bundle_jakarta_manifest</id>
166-
<phase>process-classes</phase>
167-
<goals>
168-
<goal>manifest</goal>
169-
</goals>
170-
<configuration>
171-
<manifestLocation>${build.directory}/jakarta</manifestLocation>
172-
<classifier>jakarta</classifier>
173-
<packaging>jar</packaging>
174-
<instructions>
175-
<Import-Package>jakarta.ws.rs;version="[3.0,4)",jakarta.ws.rs.core;version="[3.0,4)",jakarta.ws.rs.ext;version="[3.0,4)",!javax.ws*,*</Import-Package>
176-
</instructions>
177-
</configuration>
178-
</execution>
179-
</executions>
180-
</plugin>
181-
182144
</plugins>
183145
</build>
184146
</project>

‎json/pom.xml

+1-38
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>com.fasterxml.jackson.jaxrs</groupId>
1111
<artifactId>jackson-jaxrs-providers</artifactId>
12-
<version>2.12.2-SNAPSHOT</version>
12+
<version>2.12.3-SNAPSHOT</version>
1313
</parent>
1414
<artifactId>jackson-jaxrs-json-provider</artifactId>
1515
<name>Jackson-JAXRS-JSON</name>
@@ -179,43 +179,6 @@
179179
</dependencies>
180180
</plugin>
181181

182-
<!-- Jakarta bundle fix - nb place last for execution order on package phase
183-
@gedmarc 20210222-->
184-
<plugin>
185-
<groupId>org.apache.felix</groupId>
186-
<artifactId>maven-bundle-plugin</artifactId>
187-
<executions>
188-
<execution>
189-
<id>default_bundle</id>
190-
<phase>process-classes</phase>
191-
<goals>
192-
<goal>bundle</goal>
193-
</goals>
194-
<configuration>
195-
<manifestLocation>${build.directory}/javax</manifestLocation>
196-
<packaging>jar</packaging>
197-
<instructions>
198-
<_nouses>false</_nouses>
199-
</instructions>
200-
</configuration>
201-
</execution>
202-
<execution>
203-
<id>bundle_jakarta_manifest</id>
204-
<phase>process-classes</phase>
205-
<goals>
206-
<goal>manifest</goal>
207-
</goals>
208-
<configuration>
209-
<manifestLocation>${build.directory}/jakarta</manifestLocation>
210-
<classifier>jakarta</classifier>
211-
<packaging>jar</packaging>
212-
<instructions>
213-
<Import-Package>jakarta.ws.rs;version="[3.0,4)",jakarta.ws.rs.core;version="[3.0,4)",jakarta.ws.rs.ext;version="[3.0,4)",!javax.ws*,*</Import-Package>
214-
</instructions>
215-
</configuration>
216-
</execution>
217-
</executions>
218-
</plugin>
219182
</plugins>
220183
</build>
221184
</project>

‎pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<groupId>com.fasterxml.jackson.jaxrs</groupId>
1010
<artifactId>jackson-jaxrs-providers</artifactId>
1111
<name>Jackson JAX-RS</name>
12-
<version>2.12.2-SNAPSHOT</version>
12+
<version>2.12.3-SNAPSHOT</version>
1313
<packaging>pom</packaging>
1414
<description>Parent for Jackson JAX-RS providers
1515
</description>
@@ -171,16 +171,16 @@
171171
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
172172
</plugin>
173173

174-
<!-- 05-Mar-2021, tatu: temporary override to prevent auto-close on release
174+
<!-- 05-Mar-2021, tatu: needed temporary override to prevent auto-close on release
175175
https://help.sonatype.com/repomanager2/staging-releases/configuring-your-project-for-deployment
176-
-->
177176
<plugin>
178177
<groupId>org.sonatype.plugins</groupId>
179178
<artifactId>nexus-staging-maven-plugin</artifactId>
180179
<configuration>
181180
<skipStagingRepositoryClose>true</skipStagingRepositoryClose>
182181
</configuration>
183182
</plugin>
183+
-->
184184

185185
</plugins>
186186
</build>

‎smile/pom.xml

+1-39
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>com.fasterxml.jackson.jaxrs</groupId>
1111
<artifactId>jackson-jaxrs-providers</artifactId>
12-
<version>2.12.2-SNAPSHOT</version>
12+
<version>2.12.3-SNAPSHOT</version>
1313
</parent>
1414
<artifactId>jackson-jaxrs-smile-provider</artifactId>
1515
<name>Jackson-JAXRS-Smile</name>
@@ -156,44 +156,6 @@
156156
</dependency>
157157
</dependencies>
158158
</plugin>
159-
160-
<!-- Jakarta bundle fix - nb place last for execution order on package phase
161-
@gedmarc 20210222-->
162-
<plugin>
163-
<groupId>org.apache.felix</groupId>
164-
<artifactId>maven-bundle-plugin</artifactId>
165-
<executions>
166-
<execution>
167-
<id>default_bundle</id>
168-
<phase>process-classes</phase>
169-
<goals>
170-
<goal>bundle</goal>
171-
</goals>
172-
<configuration>
173-
<manifestLocation>${build.directory}/javax</manifestLocation>
174-
<packaging>jar</packaging>
175-
<instructions>
176-
<_nouses>false</_nouses>
177-
</instructions>
178-
</configuration>
179-
</execution>
180-
<execution>
181-
<id>bundle_jakarta_manifest</id>
182-
<phase>process-classes</phase>
183-
<goals>
184-
<goal>manifest</goal>
185-
</goals>
186-
<configuration>
187-
<manifestLocation>${build.directory}/jakarta</manifestLocation>
188-
<classifier>jakarta</classifier>
189-
<packaging>jar</packaging>
190-
<instructions>
191-
<Import-Package>jakarta.ws.rs;version="[3.0,4)",jakarta.ws.rs.core;version="[3.0,4)",jakarta.ws.rs.ext;version="[3.0,4)",!javax.ws*,*</Import-Package>
192-
</instructions>
193-
</configuration>
194-
</execution>
195-
</executions>
196-
</plugin>
197159
</plugins>
198160
</build>
199161
</project>

‎xml/pom.xml

+1-38
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>com.fasterxml.jackson.jaxrs</groupId>
1111
<artifactId>jackson-jaxrs-providers</artifactId>
12-
<version>2.12.2-SNAPSHOT</version>
12+
<version>2.12.3-SNAPSHOT</version>
1313
</parent>
1414
<artifactId>jackson-jaxrs-xml-provider</artifactId>
1515
<name>Jackson-JAXRS-XML</name>
@@ -178,43 +178,6 @@
178178
</dependencies>
179179
</plugin>
180180

181-
<!-- Jakarta bundle fix - nb place last for execution order on package phase
182-
@gedmarc 20210222-->
183-
<plugin>
184-
<groupId>org.apache.felix</groupId>
185-
<artifactId>maven-bundle-plugin</artifactId>
186-
<executions>
187-
<execution>
188-
<id>default_bundle</id>
189-
<phase>process-classes</phase>
190-
<goals>
191-
<goal>bundle</goal>
192-
</goals>
193-
<configuration>
194-
<manifestLocation>${build.directory}/javax</manifestLocation>
195-
<packaging>jar</packaging>
196-
<instructions>
197-
<_nouses>false</_nouses>
198-
</instructions>
199-
</configuration>
200-
</execution>
201-
<execution>
202-
<id>bundle_jakarta_manifest</id>
203-
<phase>process-classes</phase>
204-
<goals>
205-
<goal>manifest</goal>
206-
</goals>
207-
<configuration>
208-
<manifestLocation>${build.directory}/jakarta</manifestLocation>
209-
<classifier>jakarta</classifier>
210-
<packaging>jar</packaging>
211-
<instructions>
212-
<Import-Package>jakarta.ws.rs;version="[3.0,4)",jakarta.ws.rs.core;version="[3.0,4)",jakarta.ws.rs.ext;version="[3.0,4)",!javax.ws*,*</Import-Package>
213-
</instructions>
214-
</configuration>
215-
</execution>
216-
</executions>
217-
</plugin>
218181
</plugins>
219182
</build>
220183
</project>

0 commit comments

Comments
 (0)