regeneration to be based on latest generation, and for lyoVersion="5.0.1-SNAPSHOT" #281

jadelkhoury · 2022-10-02T11:15:22Z

Description

regeneration to be based on latest generation, and for lyoVersion="5.0.1-SNAPSHOT"

Checklist

This PR adds an entry to the CHANGELOG. See https://keepachangelog.com/en/1.0.0/ for instructions. Minor edits are exempt.
This PR was tested on at least one Lyo OSLC server or adds unit/integration tests.
This PR does NOT break the API

lyoVersion="5.0.1-SNAPSHOT"

jadelkhoury · 2022-10-02T11:18:26Z

@berezovskyi Can you please check the changes to the pom.xml file?
domains/oslc-domains/pom.xml

What is committed is exactly what is generated! What do we need to keep manually? What userblocks can we add to avoid this in future?

berezovskyi

I don't think any of the POM file changes should be made (maybe adding the dependencies_final user block is good for consistency).

berezovskyi · 2022-10-02T12:20:28Z

domains/oslc-domains/pom.xml

@@ -20,12 +20,34 @@
    <packaging>jar</packaging>
    <name>Lyo :: Domains</name>
    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>


All of these properties are already set by the parent. It will be hard to debug when we update a parent property and nothing changes because these properties override the parent ones.

berezovskyi · 2022-10-02T12:20:39Z

domains/oslc-domains/pom.xml

+        <!-- TODO: Add additional repositories here to avoid them be overridden upon future re-generation -->
+        <!-- End of user code
+        -->
+        <repository>


same here, defined in the parent

berezovskyi · 2022-10-02T12:21:18Z

domains/oslc-domains/pom.xml

@@ -38,23 +60,35 @@
                <!-- End of user code
        -->
        <!-- General dependencies -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>


the libraries shall NEVER specify a logging backend, only the end user app does this (simple or log4j etc.)

berezovskyi · 2022-10-02T12:22:43Z

domains/oslc-domains/pom.xml

-            <scope>provided</scope>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.2</version>


We only want to depend on the API here, not on the implementation. Adaptors can depend on implementations if they wish.

berezovskyi · 2022-10-02T12:22:52Z

domains/oslc-domains/pom.xml

        <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>


The version is <dependencyManagement> versioned uniformly for all Lyo projects.

berezovskyi · 2022-10-02T12:22:56Z

domains/oslc-domains/pom.xml

        <!-- Lyo dependencies -->
        <dependency>
            <groupId>org.eclipse.lyo.oslc4j.core</groupId>
            <artifactId>oslc4j-core</artifactId>
+            <version>${version.lyo}</version>


Again, the version is <dependencyManagement> versioned uniformly for all Lyo projects.

berezovskyi · 2022-10-02T12:25:34Z

I also think we can check This PR does NOT break the API because constants are only added, not removed.

jadelkhoury · 2022-10-02T14:16:46Z

I reverted the pom changes. Merging.

berezovskyi · 2022-10-02T14:28:06Z

Jenkins complains:

An error has occurred in Javadoc report generation: 
[ERROR] Exit code: 1 - /home/jenkins/agent/workspace/Lyo_multibranch_master/domains/oslc-domains/src/main/java/org/eclipse/lyo/oslc4j/core/model/package-info.java:26: warning: a package-info.java file has already been seen for package org.eclipse.lyo.oslc4j.core.model
[ERROR] package org.eclipse.lyo.oslc4j.core.model;
[ERROR]                                    ^
[ERROR] /home/jenkins/agent/workspace/Lyo_multibranch_master/domains/oslc-domains/src/main/java/org/eclipse/lyo/oslc4j/core/model/package-info.java:18: error: package org.eclipse.lyo.oslc4j.core.model has already been annotated
[ERROR] @OslcSchema ({
[ERROR] ^
[ERROR] 
[ERROR] Command line was: /opt/tools/java/temurin/jdk-11/11.0.13+8/bin/javadoc @options @packages
[ERROR]

jadelkhoury · 2022-10-02T15:10:52Z

Jenkins complains:

An error has occurred in Javadoc report generation: 
[ERROR] Exit code: 1 - /home/jenkins/agent/workspace/Lyo_multibranch_master/domains/oslc-domains/src/main/java/org/eclipse/lyo/oslc4j/core/model/package-info.java:26: warning: a package-info.java file has already been seen for package org.eclipse.lyo.oslc4j.core.model
[ERROR] package org.eclipse.lyo.oslc4j.core.model;

What do you think about removing Discussion from the model? It's the only resource from the Core model we have.

https://github.com/eclipse/lyo/tree/master/domains/oslc-domains/src/main/java/org/eclipse/lyo/oslc4j/core/model

berezovskyi · 2022-10-02T15:16:04Z

Happy to do that but only in Lyo 6.0. Can we mark them deprecated and fix the problem manually for now?

berezovskyi · 2022-10-02T15:35:05Z

The conflict is between domains/oslc-domains/src/main/java/org/eclipse/lyo/oslc4j/core/model/package-info.java and core/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/core/model/package-info.java.

I would actually prefer for 6.0 to:

separate lyo-core into lyo-core-base and lyo-core-model, maybe with a backward compat lyo-core POM package to import the two
remove org.eclipse.lyo.oslc4j.core.model package from oslc-domains, either by moving the Discussion into lyo-core-model, or removing it altogether.

For now, I think we can just remove the @OslcSchema annotation from domains/oslc-domains/src/main/java/org/eclipse/lyo/oslc4j/core/model/package-info.java and (if we plan to remove the Discussion instead of moving it, mark everything in domains/oslc-domains/src/main/java/org/eclipse/lyo/oslc4j/core/model @Deprecated)?

jadelkhoury · 2022-10-02T20:56:56Z

remove the package-info.java class from model.

jadelkhoury added 2 commits October 2, 2022 13:14

regeneration to be based on latest generation, and for

a7bc155

lyoVersion="5.0.1-SNAPSHOT"

changelog

6926c67

jadelkhoury requested a review from berezovskyi October 2, 2022 11:16

berezovskyi requested changes Oct 2, 2022

View reviewed changes

revert pom

7a4b046

jadelkhoury merged commit cd4380e into master Oct 2, 2022

jadelkhoury deleted the pacakges branch October 2, 2022 14:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

regeneration to be based on latest generation, and for lyoVersion="5.0.1-SNAPSHOT" #281

regeneration to be based on latest generation, and for lyoVersion="5.0.1-SNAPSHOT" #281

jadelkhoury commented Oct 2, 2022 •

edited

Loading

jadelkhoury commented Oct 2, 2022

berezovskyi left a comment

berezovskyi Oct 2, 2022

berezovskyi Oct 2, 2022

berezovskyi Oct 2, 2022

berezovskyi Oct 2, 2022

berezovskyi Oct 2, 2022

berezovskyi Oct 2, 2022

berezovskyi commented Oct 2, 2022

jadelkhoury commented Oct 2, 2022

berezovskyi commented Oct 2, 2022

jadelkhoury commented Oct 2, 2022

berezovskyi commented Oct 2, 2022 •

edited

Loading

berezovskyi commented Oct 2, 2022

jadelkhoury commented Oct 2, 2022

regeneration to be based on latest generation, and for lyoVersion="5.0.1-SNAPSHOT" #281

regeneration to be based on latest generation, and for lyoVersion="5.0.1-SNAPSHOT" #281

Conversation

jadelkhoury commented Oct 2, 2022 • edited Loading

Description

Checklist

jadelkhoury commented Oct 2, 2022

berezovskyi left a comment

Choose a reason for hiding this comment

berezovskyi Oct 2, 2022

Choose a reason for hiding this comment

berezovskyi Oct 2, 2022

Choose a reason for hiding this comment

berezovskyi Oct 2, 2022

Choose a reason for hiding this comment

berezovskyi Oct 2, 2022

Choose a reason for hiding this comment

berezovskyi Oct 2, 2022

Choose a reason for hiding this comment

berezovskyi Oct 2, 2022

Choose a reason for hiding this comment

berezovskyi commented Oct 2, 2022

jadelkhoury commented Oct 2, 2022

berezovskyi commented Oct 2, 2022

jadelkhoury commented Oct 2, 2022

berezovskyi commented Oct 2, 2022 • edited Loading

berezovskyi commented Oct 2, 2022

jadelkhoury commented Oct 2, 2022

jadelkhoury commented Oct 2, 2022 •

edited

Loading

berezovskyi commented Oct 2, 2022 •

edited

Loading