Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare release #28

Merged
merged 7 commits into from
Sep 19, 2023
Merged

Prepare release #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1221735
Ensure that implementation modules are resolvable
timothyjward Aug 22, 2023
38df16d
Prepare Release
maho7791 Aug 23, 2023
514fba5
Skip staging for test
maho7791 Aug 23, 2023
02e1327
Ignore Deploy
maho7791 Aug 23, 2023
af01b58
Remove project templates modules from build
maho7791 Sep 19, 2023
c8acec6
Allow timestmped snapshots in release
maho7791 Sep 19, 2023
05c3c96
set TCK in scope=test (#27)
maho7791 Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 81 additions & 0 deletions org.eclipse.osgitech.rest.jetty/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,85 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>copy-framework-scr-serviceloader-slf4j-impl</id>
<goals>
<goal>copy</goal>
</goals>
<phase>pre-integration-test</phase>
<configuration>
<outputDirectory>${project.build.directory}/bundles</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<destFileName>org.apache.felix.framework.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
<destFileName>org.apache.felix.scr.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.framework.extension</artifactId>
<destFileName>org.apache.aries.spifly.dynamic.framework.extension.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<destFileName>slf4j-simple.jar</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-resolver-maven-plugin</artifactId>
<executions>
<execution>
<id>resolve-test</id>
<configuration>
<skip>true</skip>
</configuration>
</execution>
<execution>
<id>resolve</id>
<phase>integration-test</phase>
<goals>
<goal>resolve</goal>
</goals>
<configuration>
<bndruns>
<bndrun>src/test/resources/resolve.bndrun</bndrun>
</bndruns>
<failOnChanges>false</failOnChanges>
<writeOnChanges>false</writeOnChanges>
<includeDependencyManagement>false</includeDependencyManagement>
<useMavenDependencies>true</useMavenDependencies>
<scopes>
<scope>compile</scope>
<scope>runtime</scope>
</scopes>
<bundles>
<bundle>${project.build.directory}/bundles/org.apache.felix.framework.jar</bundle>
<bundle>${project.build.directory}/bundles/org.apache.felix.scr.jar</bundle>
<bundle>${project.build.directory}/bundles/org.apache.aries.spifly.dynamic.framework.extension.jar</bundle>
<bundle>${project.build.directory}/bundles/slf4j-simple.jar</bundle>
</bundles>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
5 changes: 5 additions & 0 deletions org.eclipse.osgitech.rest.jetty/src/test/resources/resolve.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-runrequires: \
bnd.identity;id='org.eclipse.osgitech.rest.jetty'

-runfw: org.apache.felix.framework
-runee: JavaSE-11
12 changes: 12 additions & 0 deletions org.eclipse.osgitech.rest.servlet.whiteboard.tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
<name>JakartaREST / Jersey with Servlet Whiteboard Application Tests</name>
<description>Application tests for use of the Servlet Whiteboard implementation together with the JakartaREST Whiteboard</description>

<properties>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>

<dependencies>
<dependency>
<groupId>org.eclipse.osgi-technology.rest</groupId>
Expand Down Expand Up @@ -221,6 +225,14 @@
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-testing-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
</configuration>
</plugin>
</plugins>
</build>
</project>
89 changes: 88 additions & 1 deletion org.eclipse.osgitech.rest.servlet.whiteboard/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,92 @@
<artifactId>org.osgi.util.tracker</artifactId>
</dependency>
</dependencies>


<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>copy-framework-scr-servletwhiteboard-serviceloader-slf4j-impl</id>
<goals>
<goal>copy</goal>
</goals>
<phase>pre-integration-test</phase>
<configuration>
<outputDirectory>${project.build.directory}/bundles</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<destFileName>org.apache.felix.framework.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
<destFileName>org.apache.felix.scr.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.jetty</artifactId>
<destFileName>org.apache.felix.http.jetty.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.framework.extension</artifactId>
<destFileName>org.apache.aries.spifly.dynamic.framework.extension.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<destFileName>slf4j-simple.jar</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-resolver-maven-plugin</artifactId>
<executions>
<execution>
<id>resolve-test</id>
<configuration>
<skip>true</skip>
</configuration>
</execution>
<execution>
<id>resolve</id>
<phase>integration-test</phase>
<goals>
<goal>resolve</goal>
</goals>
<configuration>
<bndruns>
<bndrun>src/test/resources/resolve.bndrun</bndrun>
</bndruns>
<failOnChanges>false</failOnChanges>
<writeOnChanges>false</writeOnChanges>
<includeDependencyManagement>false</includeDependencyManagement>
<useMavenDependencies>true</useMavenDependencies>
<scopes>
<scope>compile</scope>
<scope>runtime</scope>
</scopes>
<bundles>
<bundle>${project.build.directory}/bundles/org.apache.felix.framework.jar</bundle>
<bundle>${project.build.directory}/bundles/org.apache.felix.scr.jar</bundle>
<bundle>${project.build.directory}/bundles/org.apache.felix.http.jetty.jar</bundle>
<bundle>${project.build.directory}/bundles/org.apache.aries.spifly.dynamic.framework.extension.jar</bundle>
<bundle>${project.build.directory}/bundles/slf4j-simple.jar</bundle>
</bundles>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
5 changes: 5 additions & 0 deletions org.eclipse.osgitech.rest.servlet.whiteboard/src/test/resources/resolve.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-runrequires: \
bnd.identity;id='org.eclipse.osgitech.rest.servlet.whiteboard'

-runfw: org.apache.felix.framework
-runee: JavaSE-11
13 changes: 9 additions & 4 deletions org.eclipse.osgitech.rest.sse/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
<description>SSE extension for the Jersey based Jakarta RESTful Web Services Whiteboard implementation</description>

<dependencies>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.jakartars</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
Expand Down Expand Up @@ -42,6 +46,10 @@
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bnd.annotation</artifactId>
</dependency>
</dependencies>

<build>
Expand All @@ -57,10 +65,7 @@
</goals>
<configuration>
<bnd><![CDATA[
Fragment-Host: org.glassfish.jersey.media.jersey-media-sse
Export-Package: \
org.glassfish.jersey.media.sse.internal,\
org.glassfish.jersey.media.sse
Fragment-Host: org.glassfish.jersey.media.jersey-media-sse;bundle-version="${range;[==,+);${jersey.version}}"
]]></bnd>
</configuration>
</execution>
Expand Down
2 changes: 1 addition & 1 deletion ...ime/common/SseEventSourceFactoryImpl.java → ...h/rest/sse/SseEventSourceFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Stefan Bishof - API and implementation
* Tim Ward - implementation
*/
package org.eclipse.osgitech.rest.runtime.common;
package org.eclipse.osgitech.rest.sse;

import jakarta.ws.rs.client.WebTarget;
import jakarta.ws.rs.sse.SseEventSource;
Expand Down
2 changes: 1 addition & 1 deletion ...ntime/common/SseSourceBuilderService.java → ...ech/rest/sse/SseSourceBuilderService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Stefan Bishof - API and implementation
* Tim Ward - implementation
*/
package org.eclipse.osgitech.rest.runtime.common;
package org.eclipse.osgitech.rest.sse;

import jakarta.ws.rs.client.WebTarget;

Expand Down
13 changes: 13 additions & 0 deletions org.eclipse.osgitech.rest.sse/src/main/java/org/eclipse/osgitech/rest/sse/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/**
* Copyright (c) 2012 - 2022 Data In Motion and others.
* All rights reserved.
*
* This program and the accompanying materials are made available under the terms of the
* Eclipse Public License v2.0 which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v20.html
*
* Contributors:
* Tim Ward - initial API and implementation
*/
@org.osgi.annotation.bundle.Export
package org.eclipse.osgitech.rest.sse;
55 changes: 35 additions & 20 deletions org.eclipse.osgitech.rest.tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,37 @@
<name>JakartaREST / Jersey Whiteboard Specification Compliance Tests</name>
<description>TCK tests for using the Jakarta RESTful Web Services Whiteboard implementation</description>

<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<ignoreSnapshots>true</ignoreSnapshots>
</properties>

<dependencies>
<dependency>
<groupId>org.eclipse.osgi-technology.rest</groupId>
<artifactId>org.eclipse.osgitech.rest</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<groupId>org.eclipse.osgi-technology.rest</groupId>
<artifactId>org.eclipse.osgitech.rest</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.osgi-technology.rest</groupId>
<artifactId>org.eclipse.osgitech.rest.jetty</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<groupId>org.eclipse.osgi-technology.rest</groupId>
<artifactId>org.eclipse.osgitech.rest.jetty</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.osgi-technology.rest</groupId>
<artifactId>org.eclipse.osgitech.rest.servlet.whiteboard</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.osgi-technology.rest</groupId>
<artifactId>org.eclipse.osgitech.rest.sse</artifactId>
<version>1.0.0-SNAPSHOT</version>
<groupId>org.eclipse.osgi-technology.rest</groupId>
<artifactId>org.eclipse.osgitech.rest.servlet.whiteboard</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.osgi-technology.rest</groupId>
<artifactId>org.eclipse.osgitech.rest.sse</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.test.cases.jakartars</artifactId>
<version>8.1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down Expand Up @@ -188,10 +199,6 @@
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.test.cases.jakartars</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down Expand Up @@ -252,6 +259,14 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
</configuration>
</plugin>
</plugins>
</build>
</project>
12 changes: 12 additions & 0 deletions org.eclipse.osgitech.rest.tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
<name>JakartaREST / Jersey Whitebboard Application Tests</name>
<description>Application tests for using the Jakarta RESTful Web Services Whiteboard implementation</description>

<properties>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>

<dependencies>
<dependency>
<groupId>org.eclipse.osgi-technology.rest</groupId>
Expand Down Expand Up @@ -216,6 +220,14 @@
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-testing-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
</configuration>
</plugin>
</plugins>
</build>
</project>
Loading