mirror of
https://github.com/scm-manager/scm-manager.git
synced 2026-05-07 17:35:46 +02:00
3.x
Committed-by: Eduard Heimbuch<eduard.heimbuch@cloudogu.com> Pushed-by: Rene Pfeuffer<rene.pfeuffer@cloudogu.com> Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com> Pushed-by: Eduard Heimbuch<eduard.heimbuch@cloudogu.com> Committed-by: René Pfeuffer<rene.pfeuffer@cloudogu.com>
This commit is contained in:
Eduard Heimbuch
committed by
René Pfeuffer
René Pfeuffer
parent
d760f46d9d
commit
cf4d9cf20f
@@ -133,8 +133,8 @@ index 889cc49..d5a4811 100644
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
import sonia.scm.security.SessionId;
|
||||
+
|
||||
import javax.ws.rs.sse.OutboundSseEvent;
|
||||
import javax.ws.rs.sse.SseEventSink;
|
||||
import jakarta.ws.rs.sse.OutboundSseEvent;
|
||||
import jakarta.ws.rs.sse.SseEventSink;
|
||||
-
|
||||
import java.time.Clock;
|
||||
import java.time.Instant;
|
||||
|
||||
@@ -78,7 +78,7 @@ export const filenameXmlHit: Hit = {
|
||||
content: {
|
||||
highlighted: false,
|
||||
value:
|
||||
'<?xml version="1.0"?>\n<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\n\n <modelVersion>4.0.0</modelVersion>\n\n <parent>\n <artifactId>scm-clients</artifactId>\n <groupId>sonia.scm.clients</groupId>\n <version>2.0.0-SNAPSHOT</version>\n </parent>\n\n <artifactId>scm-cli-client</artifactId>\n <version>2.0.0-SNAPSHOT</version>\n <name>scm-cli-client</name>\n\n <dependencies>\n\n <!-- fix javadoc -->\n\n <dependency>\n <groupId>javax.servlet</groupId>\n <artifactId>javax.servlet-api</artifactId>\n <version>${servlet.version}</version>\n </dependency>\n\n <dependency>\n <groupId>javax.transaction</groupId>\n <artifactId>jta</artifactId>\n <version>1.1</version>\n <scope>provided</scope>\n </dependency>\n\n <dependency>\n <groupId>sonia.scm.clients</groupId>\n <artifactId>scm-client-impl</artifactId>\n <version>2.0.0-SNAPSHOT</version>\n </dependency>\n\n <dependency>\n <groupId>args4j</groupId>\n <artifactId>args4j</artifactId>\n <version>2.0.29</version>\n </dependency>\n\n <dependency>\n <groupId>ch.qos.logback</groupId>\n <artifactId>logback-classic</artifactId>\n <version>${logback.version}</version>\n </dependency>\n\n <dependency>\n <groupId>org.freemarker</groupId>\n <artifactId>freemarker</artifactId>\n <version>2.3.21</version>\n </dependency>\n\n </dependencies>\n\n <build>\n <plugins>\n\n <plugin>\n <groupId>com.mycila.maven-license-plugin</groupId>\n <artifactId>maven-license-plugin</artifactId>\n <version>1.9.0</version>\n <configuration>\n <header>http://download.scm-manager.org/licenses/mvn-license.txt</header>\n <includes>\n <include>src/**</include>\n <include>**/test/**</include>\n </includes>\n <excludes>\n <exclude>target/**</exclude>\n <exclude>.hg/**</exclude>\n <exclude>**/*.ftl</exclude>\n </excludes>\n <strictCheck>true</strictCheck>\n </configuration>\n </plugin>\n\n <plugin>\n <groupId>org.apache.maven.plugins</groupId>\n <artifactId>maven-assembly-plugin</artifactId>\n <version>2.3</version>\n <configuration>\n <archive>\n <manifest>\n <mainClass>sonia.scm.cli.App</mainClass>\n </manifest>\n </archive>\n <descriptorRefs>\n <descriptorRef>jar-with-dependencies</descriptorRef>\n </descriptorRefs>\n </configuration>\n <executions>\n <execution>\n <phase>package</phase>\n <goals>\n <goal>single</goal>\n </goals>\n </execution>\n </executions>\n </plugin>\n\n </plugins>\n </build>\n\n </project>\n',
|
||||
'<?xml version="1.0"?>\n<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\n\n <modelVersion>4.0.0</modelVersion>\n\n <parent>\n <artifactId>scm-clients</artifactId>\n <groupId>sonia.scm.clients</groupId>\n <version>2.0.0-SNAPSHOT</version>\n </parent>\n\n <artifactId>scm-cli-client</artifactId>\n <version>2.0.0-SNAPSHOT</version>\n <name>scm-cli-client</name>\n\n <dependencies>\n\n <!-- fix javadoc -->\n\n <dependency>\n <groupId>jakarta.servlet</groupId>\n <artifactId>jakarta.servlet-api</artifactId>\n <version>${servlet.version}</version>\n </dependency>\n\n <dependency>\n <groupId>jakarta.transaction</groupId>\n <artifactId>jta</artifactId>\n <version>1.1</version>\n <scope>provided</scope>\n </dependency>\n\n <dependency>\n <groupId>sonia.scm.clients</groupId>\n <artifactId>scm-client-impl</artifactId>\n <version>2.0.0-SNAPSHOT</version>\n </dependency>\n\n <dependency>\n <groupId>args4j</groupId>\n <artifactId>args4j</artifactId>\n <version>2.0.29</version>\n </dependency>\n\n <dependency>\n <groupId>ch.qos.logback</groupId>\n <artifactId>logback-classic</artifactId>\n <version>${logback.version}</version>\n </dependency>\n\n <dependency>\n <groupId>org.freemarker</groupId>\n <artifactId>freemarker</artifactId>\n <version>2.3.21</version>\n </dependency>\n\n </dependencies>\n\n <build>\n <plugins>\n\n <plugin>\n <groupId>com.mycila.maven-license-plugin</groupId>\n <artifactId>maven-license-plugin</artifactId>\n <version>1.9.0</version>\n <configuration>\n <header>http://download.scm-manager.org/licenses/mvn-license.txt</header>\n <includes>\n <include>src/**</include>\n <include>**/test/**</include>\n </includes>\n <excludes>\n <exclude>target/**</exclude>\n <exclude>.hg/**</exclude>\n <exclude>**/*.ftl</exclude>\n </excludes>\n <strictCheck>true</strictCheck>\n </configuration>\n </plugin>\n\n <plugin>\n <groupId>org.apache.maven.plugins</groupId>\n <artifactId>maven-assembly-plugin</artifactId>\n <version>2.3</version>\n <configuration>\n <archive>\n <manifest>\n <mainClass>sonia.scm.cli.App</mainClass>\n </manifest>\n </archive>\n <descriptorRefs>\n <descriptorRef>jar-with-dependencies</descriptorRef>\n </descriptorRefs>\n </configuration>\n <executions>\n <execution>\n <phase>package</phase>\n <goals>\n <goal>single</goal>\n </goals>\n </execution>\n </executions>\n </plugin>\n\n </plugins>\n </build>\n\n </project>\n',
|
||||
},
|
||||
},
|
||||
_links: {},
|
||||
|
||||
@@ -428,7 +428,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
### Added
|
||||
- Add iconStyle + onClick option and story shot for icon component ([#1100](https://github.com/scm-manager/scm-manager/pull/1100))
|
||||
- Making WebElements (Servlet or Filter) optional by using the \`@Requires\` annotation ([#1101](https://github.com/scm-manager/scm-manager/pull/1101))
|
||||
- Add class to manually validate rest data transfer objects with javax validation annotations ([#1114](https://github.com/scm-manager/scm-manager/pull/1114))
|
||||
- Add class to manually validate rest data transfer objects with jakarta validation annotations ([#1114](https://github.com/scm-manager/scm-manager/pull/1114))
|
||||
- Missing stories for ui-components ([#1140](https://github.com/scm-manager/scm-manager/pull/1140))
|
||||
|
||||
### Changed
|
||||
|
||||
@@ -12641,7 +12641,7 @@ and this project adheres to
|
||||
|
||||
|
||||
<li>
|
||||
Add class to manually validate rest data transfer objects with javax validation annotations (
|
||||
Add class to manually validate rest data transfer objects with jakarta validation annotations (
|
||||
<a
|
||||
href="https://github.com/scm-manager/scm-manager/pull/1114"
|
||||
rel="noopener noreferrer"
|
||||
@@ -25941,7 +25941,7 @@ exports[`Storyshots Repositories/Diff Changing Content 1`] = `
|
||||
onMouseEnter={[Function]}
|
||||
onMouseLeave={[Function]}
|
||||
>
|
||||
import javax.ws.rs.sse.OutboundSseEvent;
|
||||
import jakarta.ws.rs.sse.OutboundSseEvent;
|
||||
</td>
|
||||
</tr>
|
||||
<tr
|
||||
@@ -25966,7 +25966,7 @@ exports[`Storyshots Repositories/Diff Changing Content 1`] = `
|
||||
onMouseEnter={[Function]}
|
||||
onMouseLeave={[Function]}
|
||||
>
|
||||
import javax.ws.rs.sse.SseEventSink;
|
||||
import jakarta.ws.rs.sse.SseEventSink;
|
||||
</td>
|
||||
</tr>
|
||||
<tr
|
||||
@@ -33078,7 +33078,7 @@ exports[`Storyshots Repositories/Diff Expandable 1`] = `
|
||||
onMouseEnter={[Function]}
|
||||
onMouseLeave={[Function]}
|
||||
>
|
||||
import javax.ws.rs.sse.OutboundSseEvent;
|
||||
import jakarta.ws.rs.sse.OutboundSseEvent;
|
||||
</td>
|
||||
</tr>
|
||||
<tr
|
||||
@@ -33103,7 +33103,7 @@ exports[`Storyshots Repositories/Diff Expandable 1`] = `
|
||||
onMouseEnter={[Function]}
|
||||
onMouseLeave={[Function]}
|
||||
>
|
||||
import javax.ws.rs.sse.SseEventSink;
|
||||
import jakarta.ws.rs.sse.SseEventSink;
|
||||
</td>
|
||||
</tr>
|
||||
<tr
|
||||
@@ -37482,7 +37482,7 @@ exports[`Storyshots Repositories/Diff External state management 1`] = `
|
||||
onMouseEnter={[Function]}
|
||||
onMouseLeave={[Function]}
|
||||
>
|
||||
import javax.ws.rs.sse.OutboundSseEvent;
|
||||
import jakarta.ws.rs.sse.OutboundSseEvent;
|
||||
</td>
|
||||
</tr>
|
||||
<tr
|
||||
@@ -37507,7 +37507,7 @@ exports[`Storyshots Repositories/Diff External state management 1`] = `
|
||||
onMouseEnter={[Function]}
|
||||
onMouseLeave={[Function]}
|
||||
>
|
||||
import javax.ws.rs.sse.SseEventSink;
|
||||
import jakarta.ws.rs.sse.SseEventSink;
|
||||
</td>
|
||||
</tr>
|
||||
<tr
|
||||
@@ -41603,7 +41603,7 @@ exports[`Storyshots Repositories/Diff File Annotation 1`] = `
|
||||
onMouseEnter={[Function]}
|
||||
onMouseLeave={[Function]}
|
||||
>
|
||||
import javax.ws.rs.sse.OutboundSseEvent;
|
||||
import jakarta.ws.rs.sse.OutboundSseEvent;
|
||||
</td>
|
||||
</tr>
|
||||
<tr
|
||||
@@ -41628,7 +41628,7 @@ exports[`Storyshots Repositories/Diff File Annotation 1`] = `
|
||||
onMouseEnter={[Function]}
|
||||
onMouseLeave={[Function]}
|
||||
>
|
||||
import javax.ws.rs.sse.SseEventSink;
|
||||
import jakarta.ws.rs.sse.SseEventSink;
|
||||
</td>
|
||||
</tr>
|
||||
<tr
|
||||
@@ -45616,7 +45616,7 @@ exports[`Storyshots Repositories/Diff File Controls 1`] = `
|
||||
onMouseEnter={[Function]}
|
||||
onMouseLeave={[Function]}
|
||||
>
|
||||
import javax.ws.rs.sse.OutboundSseEvent;
|
||||
import jakarta.ws.rs.sse.OutboundSseEvent;
|
||||
</td>
|
||||
</tr>
|
||||
<tr
|
||||
@@ -45641,7 +45641,7 @@ exports[`Storyshots Repositories/Diff File Controls 1`] = `
|
||||
onMouseEnter={[Function]}
|
||||
onMouseLeave={[Function]}
|
||||
>
|
||||
import javax.ws.rs.sse.SseEventSink;
|
||||
import jakarta.ws.rs.sse.SseEventSink;
|
||||
</td>
|
||||
</tr>
|
||||
<tr
|
||||
@@ -52328,7 +52328,7 @@ exports[`Storyshots Repositories/Diff Line Annotation 1`] = `
|
||||
onMouseEnter={[Function]}
|
||||
onMouseLeave={[Function]}
|
||||
>
|
||||
import javax.ws.rs.sse.OutboundSseEvent;
|
||||
import jakarta.ws.rs.sse.OutboundSseEvent;
|
||||
</td>
|
||||
</tr>
|
||||
<tr
|
||||
@@ -52353,7 +52353,7 @@ exports[`Storyshots Repositories/Diff Line Annotation 1`] = `
|
||||
onMouseEnter={[Function]}
|
||||
onMouseLeave={[Function]}
|
||||
>
|
||||
import javax.ws.rs.sse.SseEventSink;
|
||||
import jakarta.ws.rs.sse.SseEventSink;
|
||||
</td>
|
||||
</tr>
|
||||
<tr
|
||||
@@ -56446,7 +56446,7 @@ exports[`Storyshots Repositories/Diff OnClick 1`] = `
|
||||
onMouseEnter={[Function]}
|
||||
onMouseLeave={[Function]}
|
||||
>
|
||||
import javax.ws.rs.sse.OutboundSseEvent;
|
||||
import jakarta.ws.rs.sse.OutboundSseEvent;
|
||||
</td>
|
||||
</tr>
|
||||
<tr
|
||||
@@ -56473,7 +56473,7 @@ exports[`Storyshots Repositories/Diff OnClick 1`] = `
|
||||
onMouseEnter={[Function]}
|
||||
onMouseLeave={[Function]}
|
||||
>
|
||||
import javax.ws.rs.sse.SseEventSink;
|
||||
import jakarta.ws.rs.sse.SseEventSink;
|
||||
</td>
|
||||
</tr>
|
||||
<tr
|
||||
@@ -60785,7 +60785,7 @@ exports[`Storyshots Repositories/Diff Side-By-Side 1`] = `
|
||||
onMouseEnter={[Function]}
|
||||
onMouseLeave={[Function]}
|
||||
>
|
||||
import javax.ws.rs.sse.OutboundSseEvent;
|
||||
import jakarta.ws.rs.sse.OutboundSseEvent;
|
||||
</td>
|
||||
<td
|
||||
className="diff-gutter diff-gutter-normal"
|
||||
@@ -60799,7 +60799,7 @@ exports[`Storyshots Repositories/Diff Side-By-Side 1`] = `
|
||||
onMouseEnter={[Function]}
|
||||
onMouseLeave={[Function]}
|
||||
>
|
||||
import javax.ws.rs.sse.OutboundSseEvent;
|
||||
import jakarta.ws.rs.sse.OutboundSseEvent;
|
||||
</td>
|
||||
</tr>
|
||||
<tr
|
||||
@@ -60817,7 +60817,7 @@ exports[`Storyshots Repositories/Diff Side-By-Side 1`] = `
|
||||
onMouseEnter={[Function]}
|
||||
onMouseLeave={[Function]}
|
||||
>
|
||||
import javax.ws.rs.sse.SseEventSink;
|
||||
import jakarta.ws.rs.sse.SseEventSink;
|
||||
</td>
|
||||
<td
|
||||
className="diff-gutter diff-gutter-normal"
|
||||
@@ -60831,7 +60831,7 @@ exports[`Storyshots Repositories/Diff Side-By-Side 1`] = `
|
||||
onMouseEnter={[Function]}
|
||||
onMouseLeave={[Function]}
|
||||
>
|
||||
import javax.ws.rs.sse.SseEventSink;
|
||||
import jakarta.ws.rs.sse.SseEventSink;
|
||||
</td>
|
||||
</tr>
|
||||
<tr
|
||||
@@ -65306,7 +65306,7 @@ exports[`Storyshots Repositories/Diff SyntaxHighlighting 1`] = `
|
||||
onMouseEnter={[Function]}
|
||||
onMouseLeave={[Function]}
|
||||
>
|
||||
import javax.ws.rs.sse.OutboundSseEvent;
|
||||
import jakarta.ws.rs.sse.OutboundSseEvent;
|
||||
</td>
|
||||
</tr>
|
||||
<tr
|
||||
@@ -65331,7 +65331,7 @@ exports[`Storyshots Repositories/Diff SyntaxHighlighting 1`] = `
|
||||
onMouseEnter={[Function]}
|
||||
onMouseLeave={[Function]}
|
||||
>
|
||||
import javax.ws.rs.sse.SseEventSink;
|
||||
import jakarta.ws.rs.sse.SseEventSink;
|
||||
</td>
|
||||
</tr>
|
||||
<tr
|
||||
@@ -69543,7 +69543,7 @@ exports[`Storyshots Repositories/Diff WithLinkToFile 1`] = `
|
||||
onMouseEnter={[Function]}
|
||||
onMouseLeave={[Function]}
|
||||
>
|
||||
import javax.ws.rs.sse.OutboundSseEvent;
|
||||
import jakarta.ws.rs.sse.OutboundSseEvent;
|
||||
</td>
|
||||
</tr>
|
||||
<tr
|
||||
@@ -69568,7 +69568,7 @@ exports[`Storyshots Repositories/Diff WithLinkToFile 1`] = `
|
||||
onMouseEnter={[Function]}
|
||||
onMouseLeave={[Function]}
|
||||
>
|
||||
import javax.ws.rs.sse.SseEventSink;
|
||||
import jakarta.ws.rs.sse.SseEventSink;
|
||||
</td>
|
||||
</tr>
|
||||
<tr
|
||||
@@ -79544,13 +79544,13 @@ exports[`Storyshots TextHitField Non Content Search 1`] = `
|
||||
<!-- fix javadoc -->
|
||||
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>jakarta.servlet</groupId>
|
||||
<artifactId>jakarta.servlet-api</artifactId>
|
||||
<version>\${servlet.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>javax.transaction</groupId>
|
||||
<groupId>jakarta.transaction</groupId>
|
||||
<artifactId>jta</artifactId>
|
||||
<version>1.1</version>
|
||||
<scope>provided</scope>
|
||||
@@ -79666,13 +79666,13 @@ exports[`Storyshots TextHitField Truncate Keep Whole Line 1`] = `
|
||||
<!-- fix javadoc -->
|
||||
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<groupId>jakarta.servlet</groupId>
|
||||
<artifactId>jakarta.servlet-api</artifactId>
|
||||
<version>\${servlet.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>javax.transaction</groupId>
|
||||
<groupId>jakarta.transaction</groupId>
|
||||
<artifactId>jta</artifactId>
|
||||
<version>1.1</version>
|
||||
<scope>provided</scope>
|
||||
|
||||
Reference in New Issue
Block a user