Skip to content

Commit

Permalink
Upgrade all servers to LyoD 4.2.0.q and Lyo 5.0.0-S (#83)
Browse files Browse the repository at this point in the history
  • Loading branch information
@berezovskyi
berezovskyi authored Jan 4, 2022
1 parent e6fffd5 commit 82c7cce
Show file tree
Hide file tree
Showing 137 changed files with 6,098 additions and 4,087 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ cd server-rm/
mvn clean jetty:run-exploded

cd ../server-cm/
mvn clean jetty:run-exploded
mvn clean jetty:run-war

cd ../server-qm/
mvn clean jetty:run-exploded
mvn clean jetty:run-war

cd ../server-am/
mvn clean jetty:run-exploded
mvn clean jetty:run-war
```

After following these steps, proceed to the steps listed in the next section _Navigating OSLC servers_.
Expand Down
2,635 changes: 1,999 additions & 636 deletions model/representations.aird
View file

Large diffs are not rendered by default.

532 changes: 266 additions & 266 deletions model/toolchain.xml
View file

Large diffs are not rendered by default.

83 changes: 55 additions & 28 deletions src/client-toolchain/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,67 @@
<artifactId>client-toolchain</artifactId>

<properties>
<kotlin.version>1.5.32</kotlin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>

<v.kotlin>1.6.10</v.kotlin>
<v.lyo>5.0.0-SNAPSHOT</v.lyo>
<!-- <v.lyo.oslc-ui>${v.lyo}</v.lyo.oslc-ui>-->
<v.jersey>2.25.1</v.jersey>
<v.kotlin.coroutines>1.6.0</v.kotlin.coroutines>
</properties>

<repositories>
<repository>
<id>lyo-snapshots</id>
<name>Eclipse Lyo Snapshots</name>
<url>https://repo.eclipse.org/content/repositories/lyo-snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>com.github.javafaker</groupId>
<artifactId>javafaker</artifactId>
<version>1.0.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
</dependency>
<dependency>
<groupId>com.xenomachina</groupId>
<artifactId>kotlin-argparser</artifactId>
<version>2.0.7</version>
</dependency>

<dependency>
<groupId>org.eclipse.lyo.clients</groupId>
<artifactId>oslc-client</artifactId>
<version>${v.lyo}</version>
</dependency>
<dependency>
<groupId>org.eclipse.lyo</groupId>
<artifactId>oslc-domains</artifactId>
<version>${v.lyo}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.32</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>2.25.1</version>
<version>${v.jersey}</version>
<exclusions>
<exclusion>
<!-- Jakarta API is used in Lyo Client -->
Expand All @@ -43,42 +83,31 @@
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-apache-connector</artifactId>
<version>2.25.1</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
</dependency>


<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>runtime</scope>
<version>${v.jersey}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version>
<artifactId>kotlin-stdlib</artifactId>
<version>${v.kotlin}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines-core</artifactId>
<version>1.5.2</version>
<version>${v.kotlin.coroutines}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines-core-jvm</artifactId>
<version>${v.kotlin.coroutines}</version>
</dependency>


<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test</artifactId>
<version>${kotlin.version}</version>
<version>${v.kotlin}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.xenomachina</groupId>
<artifactId>kotlin-argparser</artifactId>
<version>2.0.7</version>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -129,8 +158,7 @@
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>

<version>${v.kotlin}</version>
<executions>
<execution>
<id>compile</id>
Expand All @@ -139,7 +167,6 @@
<goal>compile</goal>
</goals>
</execution>

<execution>
<id>test-compile</id>
<phase>test-compile</phase>
Expand Down
38 changes: 31 additions & 7 deletions src/lib-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,41 +12,66 @@
<packaging>jar</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>

<version.lyo>5.0.0-SNAPSHOT</version.lyo>
<version.jersey>2.25.1</version.jersey>
</properties>

<repositories>
<repository>
<id>lyo-snapshots</id>
<name>Eclipse Lyo Snapshots</name>
<url>https://repo.eclipse.org/content/repositories/lyo-snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.32</version>
<scope>runtime</scope>
</dependency>

<!-- Lyo dependencies -->
<dependency>
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
<artifactId>oslc4j-core</artifactId>
<version>${version.lyo}</version>
</dependency>
<dependency>
<groupId>org.eclipse.lyo</groupId>
<artifactId>oslc-domains</artifactId>
<version>${version.lyo}</version>
</dependency>
<dependency>
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
<artifactId>oslc4j-jena-provider</artifactId>
<version>${version.lyo}</version>
</dependency>
<dependency>
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
<artifactId>oslc4j-json4j-provider</artifactId>
<version>${version.lyo}</version>
</dependency>
<dependency>
<groupId>org.eclipse.lyo.clients</groupId>
<artifactId>oslc-client</artifactId>
<version>${version.lyo}</version>
</dependency>

<!-- Servlet-related dependencies -->
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
<version>${version.jersey}</version>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
Expand All @@ -57,6 +82,7 @@
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
<version>${version.jersey}</version>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
Expand All @@ -67,11 +93,13 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>javax.servlet.jsp.jstl-api</artifactId>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<version>1.2.7</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -86,12 +114,8 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
</plugins>
</build>
</project>
Loading

0 comments on commit 82c7cce

Please sign in to comment.