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

Bump to 2.2-SNAPSHOT #229

Merged
merged 4 commits into from
Sep 20, 2023
Merged

Bump to 2.2-SNAPSHOT #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0b80f7
Bump to 2.2-SNAPSHOT
heruan Jun 8, 2023
3cf05b6
Bump version constant
heruan Jun 12, 2023
040d34f
Merge branch 'main' into chore/bump-to-2.2
MatthewVaadin Sep 20, 2023
0d411f5
Bump Flow to 24.2 and Hilla to 2.2
heruan Sep 20, 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
2 changes: 1 addition & 1 deletion observability-kit-agent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>observability-kit</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.2-SNAPSHOT</version>
</parent>

<artifactId>observability-kit-agent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion observability-kit-agent/src/main/java/com/vaadin/extension/InstrumentationHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@

public class InstrumentationHelper {
public static final String INSTRUMENTATION_NAME = "com.vaadin.observability.instrumentation";
public static final String INSTRUMENTATION_VERSION = "2.1";
public static final String INSTRUMENTATION_VERSION = "2.2";

private static final SpanNameGenerator generator = new SpanNameGenerator();
private static final SpanAttributeGenerator attrGet = new SpanAttributeGenerator();
Expand Down
10,328 changes: 4,087 additions & 6,241 deletions observability-kit-demo-hilla/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

423 changes: 194 additions & 229 deletions observability-kit-demo-hilla/package.json
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 1 addition & 6 deletions observability-kit-demo-hilla/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<artifactId>observability-kit</artifactId>
<groupId>com.vaadin</groupId>
<version>2.1-SNAPSHOT</version>
<version>2.2-SNAPSHOT</version>
</parent>

<properties>
Expand Down Expand Up @@ -106,11 +106,6 @@
<artifactId>exampledata</artifactId>
<version>${exampledata.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-testbench-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion observability-kit-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>observability-kit</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.2-SNAPSHOT</version>
</parent>
<artifactId>observability-kit-demo</artifactId>
<name>Observability Kit demo application</name>
Expand Down
2 changes: 1 addition & 1 deletion observability-kit-starter-hilla/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>observability-kit</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.2-SNAPSHOT</version>
</parent>

<groupId>dev.hilla</groupId>
Expand Down
2 changes: 1 addition & 1 deletion observability-kit-starter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>observability-kit</artifactId>
<groupId>com.vaadin</groupId>
<version>2.1-SNAPSHOT</version>
<version>2.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion observability-kit-test/observability-kit-agent-it/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>observability-kit-test</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.2-SNAPSHOT</version>
</parent>

<artifactId>observability-kit-agent-it</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion observability-kit-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.vaadin</groupId>
<artifactId>observability-kit</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.2-SNAPSHOT</version>
</parent>
<artifactId>observability-kit-test</artifactId>
<packaging>pom</packaging>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</parent>

<artifactId>observability-kit</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.2-SNAPSHOT</version>
<packaging>pom</packaging>

<licenses>
Expand Down Expand Up @@ -56,8 +56,8 @@
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<flow.version>24.1-SNAPSHOT</flow.version>
<hilla.version>2.1-SNAPSHOT</hilla.version>
<flow.version>24.2-SNAPSHOT</flow.version>
<hilla.version>2.2-SNAPSHOT</hilla.version>
<servlet.api.version>6.0.0</servlet.api.version>
<annotation.api.version>2.1.1</annotation.api.version>
<opentelemetry.version>1.23.0</opentelemetry.version>
Expand Down