Skip to content

Commit

Permalink
Merge pull request #360 from eclipse-basyx/development
Browse files Browse the repository at this point in the history
Updates Version to 1.5.0
  • Loading branch information
FrankSchnicke authored Oct 4, 2023
2 parents 81d0013 + ccb5a36 commit 265974d
Show file tree
Hide file tree
Showing 82 changed files with 2,072 additions and 536 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/maven-publish-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
packages: write

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven-run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,5 @@ local.properties

.idea
*.iml
.moquette_uuid
file_sme.json
55 changes: 35 additions & 20 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.sdk</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<name>BaSyx SDK</name>
<description>BaSyx Software Development Kit</description>
<url>https://www.eclipse.org/basyx/</url>
Expand Down Expand Up @@ -46,7 +46,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spring-security-version>5.8.2</spring-security-version>
<spring-security-version>5.8.7</spring-security-version>
</properties>

<repositories>
Expand Down Expand Up @@ -76,7 +76,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.0</version>
<executions>
<execution>
<id>attach-sources</id>
Expand Down Expand Up @@ -110,7 +110,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.2</version>
<configuration>
<excludes>
<exclude>**/*HTTP*</exclude>
Expand All @@ -126,7 +126,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.2</version>
<configuration>
<includes>
<include>**/*HTTP*</include>
Expand All @@ -147,7 +147,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
<configuration>
<source>8</source>
</configuration>
Expand All @@ -169,9 +169,17 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.4.6</version>
<version>1.4.11</version>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.9</version>
</dependency>


<!-- JUnit 4 for running JUnit tests -->
<dependency>
<groupId>junit</groupId>
Expand All @@ -184,7 +192,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.2.0</version>
<version>5.5.0</version>
<scope>test</scope>
</dependency>

Expand All @@ -206,14 +214,14 @@
<dependency>
<groupId>org.eclipse.milo</groupId>
<artifactId>sdk-client</artifactId>
<version>0.6.8</version>
<version>0.6.11</version>
</dependency>

<!-- Eclipse Milo (for OPC-UA server) -->
<dependency>
<groupId>org.eclipse.milo</groupId>
<artifactId>sdk-server</artifactId>
<version>0.6.8</version>
<version>0.6.11</version>
</dependency>

<!-- Java Servlet API (for HTTP provider) -->
Expand All @@ -234,35 +242,42 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>2.39.1</version>
<version>2.40</version>
</dependency>

<!-- Jersey InjectionManager (for Jersey client) -->
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>2.39.1</version>
<version>2.40</version>
</dependency>

<!-- Tomcat 8 for HTTP server resource -->
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
<version>9.0.73</version>
<version>9.0.80</version>
</dependency>

<!-- Used for creating .aasx files -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>4.1.2</version>
<version>5.2.3</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.24.0</version>
</dependency>

<!-- Used by Logback to compile filter expressions from logback.xml -->
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<version>3.1.9</version>
<version>3.1.10</version>
<scope>runtime</scope>
</dependency>

<!-- Paho Java Client for MQTT -->
Expand All @@ -283,7 +298,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
<version>2.14.0</version>
</dependency>

<!-- https://mvnrepository.com/artifact/commons-fileupload/commons-fileupload -->
Expand Down Expand Up @@ -311,7 +326,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
<version>3.13.0</version>
</dependency>

<dependency>
Expand All @@ -333,7 +348,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.14.2</version>
<version>2.15.2</version>
</dependency>

<dependency>
Expand All @@ -360,7 +375,7 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>2.7.0</version>
<version>2.9.0</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -396,7 +411,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.0.1</version>
<version>3.1.0</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down
Loading

0 comments on commit 265974d

Please sign in to comment.