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.

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

jetty 11 #550

Closed
wants to merge 2 commits into from
Closed

jetty 11 #550

wants to merge 2 commits into from

Conversation

dev-mlb
Copy link
Collaborator

@dev-mlb dev-mlb commented Sep 1, 2023

No description provided.

@dev-mlb
Copy link
Collaborator Author

dev-mlb commented Sep 1, 2023

Still working on this:

[INFO] --- duplicate-finder-maven-plugin:1.5.1:check (default) @ emissary ---
[INFO] Checking compile classpath
[INFO] Checking runtime classpath
[INFO] Checking test classpath
[WARNING] Found duplicate and different resources in [org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.3, org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty:3.1.3]:
[WARNING]   org/glassfish/jersey/jetty/internal/localization.properties
[WARNING] Found duplicate classes/resources in test classpath.

@dev-mlb dev-mlb force-pushed the jetty11 branch 2 times, most recently from 84de927 to 30bb6f2 Compare September 1, 2023 19:15
@dev-mlb dev-mlb marked this pull request as draft September 2, 2023 11:40
@dev-mlb dev-mlb force-pushed the jetty11 branch 2 times, most recently from d51ad1d to f34efb1 Compare September 2, 2023 12:11
@dev-mlb dev-mlb added the integration A breaking change where effort will be required downstream to resolve label Sep 2, 2023
@dev-mlb dev-mlb force-pushed the jetty11 branch 2 times, most recently from cda034d to fb80f2d Compare September 2, 2023 17:23
@dev-mlb dev-mlb mentioned this pull request Sep 2, 2023
@dev-mlb
Copy link
Collaborator Author

dev-mlb commented Sep 2, 2023

Still working on this:

[INFO] --- duplicate-finder-maven-plugin:1.5.1:check (default) @ emissary ---
[INFO] Checking compile classpath
[INFO] Checking runtime classpath
[INFO] Checking test classpath
[WARNING] Found duplicate and different resources in [org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.3, org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty:3.1.3]:
[WARNING]   org/glassfish/jersey/jetty/internal/localization.properties
[WARNING] Found duplicate classes/resources in test classpath.

@jpdahlke @fbruton Added <ignoredResourcePatterns> to the pom for localization.properties, not sure if this is the correct way to handle this or not.

@dev-mlb dev-mlb marked this pull request as ready for review September 2, 2023 19:17
@dev-mlb dev-mlb force-pushed the jetty11 branch 2 times, most recently from 23e73df to 0166ea6 Compare September 5, 2023 18:29
@jpdahlke
Copy link
Collaborator

jpdahlke commented Sep 5, 2023

Still working on this:

[INFO] --- duplicate-finder-maven-plugin:1.5.1:check (default) @ emissary ---
[INFO] Checking compile classpath
[INFO] Checking runtime classpath
[INFO] Checking test classpath
[WARNING] Found duplicate and different resources in [org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.3, org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty:3.1.3]:
[WARNING]   org/glassfish/jersey/jetty/internal/localization.properties
[WARNING] Found duplicate classes/resources in test classpath.

@jpdahlke @fbruton Added <ignoredResourcePatterns> to the pom for localization.properties, not sure if this is the correct way to handle this or not.

I think this seems reasonable. We might need to do that for some of our other resources as well.

@fbruton
Copy link
Collaborator

fbruton commented Sep 6, 2023

Still working on this:

[INFO] --- duplicate-finder-maven-plugin:1.5.1:check (default) @ emissary ---
[INFO] Checking compile classpath
[INFO] Checking runtime classpath
[INFO] Checking test classpath
[WARNING] Found duplicate and different resources in [org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.3, org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty:3.1.3]:
[WARNING]   org/glassfish/jersey/jetty/internal/localization.properties
[WARNING] Found duplicate classes/resources in test classpath.

@jpdahlke @fbruton Added <ignoredResourcePatterns> to the pom for localization.properties, not sure if this is the correct way to handle this or not.

I recommend the following approach instead that will scope the exclusion to the current conflicting dependencies.

        <plugin>
          <groupId>org.basepom.maven</groupId>
          <artifactId>duplicate-finder-maven-plugin</artifactId>
          <version>1.5.1</version>
          <configuration>
            <exceptions>
              <exception>
                <conflictingDependencies>
                  <dependency>
                    <groupId>org.glassfish.jersey.containers</groupId>
                    <artifactId>jersey-container-jetty-http</artifactId>
                    <version>${dep.jersey.version}</version>
                  </dependency>
                  <dependency>
                    <groupId>org.glassfish.jersey.test-framework.providers</groupId>
                    <artifactId>jersey-test-framework-provider-jetty</artifactId>
                    <version>${dep.jersey.version}</version>
                  </dependency>
                </conflictingDependencies>
                <resources>
                  <resource>org/glassfish/jersey/jetty/internal/localization.properties</resource>
                </resources>
              </exception>
            </exceptions>
            ```

Copy link
Collaborator

@fbruton fbruton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Limit the scope of resource conflict exclusion.

@dev-mlb dev-mlb requested a review from fbruton September 6, 2023 13:52
fbruton
fbruton previously approved these changes Sep 6, 2023
@dev-mlb dev-mlb force-pushed the jetty11 branch 2 times, most recently from 2de1991 to 8dab475 Compare September 9, 2023 12:52
@jpdahlke jpdahlke added the rebase Things have happened and now a rebase is needed label Sep 15, 2023
@dev-mlb dev-mlb requested a review from fbruton September 18, 2023 12:46
@dev-mlb dev-mlb removed the rebase Things have happened and now a rebase is needed label Sep 18, 2023
@dev-mlb dev-mlb force-pushed the jetty11 branch 2 times, most recently from 3fc0112 to 5c7556b Compare October 3, 2023 23:21
@jpdahlke jpdahlke added this to the v8.0.0-M11 milestone Oct 11, 2023
@jpdahlke jpdahlke modified the milestones: v8.0.0-M11, v8.0.0-M12 Nov 14, 2023
@jpdahlke jpdahlke modified the milestones: v8.0.0-M12, v8.0.0-M13 Nov 29, 2023
@jpdahlke jpdahlke modified the milestones: v8.0.0-M13, v8.0.0-M12 Dec 27, 2023
@jpdahlke jpdahlke mentioned this pull request Dec 29, 2023
@jpdahlke jpdahlke closed this Jan 2, 2024
@jpdahlke jpdahlke removed this from the v8.0.0-M12 milestone Jan 2, 2024
@dev-mlb dev-mlb deleted the jetty11 branch January 25, 2024 13:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integration A breaking change where effort will be required downstream to resolve
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants