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

[WIP] provide guice 7 #1

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions maven/org.eclipse.oomph.maven.generator/report/egit/REPORT.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
- [net.bytebuddy](https://repo1.maven.org/maven2/net/bytebuddy/)
- [byte-buddy](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/) **[1.12.18](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.12.18)** < [1.14.5](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.14.5/)
- [byte-buddy-agent](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/) **[1.12.18](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.12.18)** < [1.14.5](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.5/)
- [org.bouncycastle](https://repo1.maven.org/maven2/org/bouncycastle/)
- [bcpg-jdk18on](https://repo1.maven.org/maven2/org/bouncycastle/bcpg-jdk18on/) **[1.73](https://repo1.maven.org/maven2/org/bouncycastle/bcpg-jdk18on/1.73)** < [1.74](https://repo1.maven.org/maven2/org/bouncycastle/bcpg-jdk18on/1.74/)
- [bcpkix-jdk18on](https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-jdk18on/) **[1.73](https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-jdk18on/1.73)** < [1.74](https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-jdk18on/1.74/)
- [bcprov-jdk18on](https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk18on/) **[1.73](https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk18on/1.73)** < [1.74](https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk18on/1.74/)
- [bcutil-jdk18on](https://repo1.maven.org/maven2/org/bouncycastle/bcutil-jdk18on/) **[1.73](https://repo1.maven.org/maven2/org/bouncycastle/bcutil-jdk18on/1.73)** < [1.74](https://repo1.maven.org/maven2/org/bouncycastle/bcutil-jdk18on/1.74/)

## Major Updates
- [jakarta.servlet](https://repo1.maven.org/maven2/jakarta/servlet/)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,25 +261,25 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk18on</artifactId>
<version>1.73</version>
<version>1.74</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<version>1.73</version>
<version>1.74</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
<version>1.73</version>
<version>1.74</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk18on</artifactId>
<version>1.73</version>
<version>1.74</version>
Copy link
Author

Choose a reason for hiding this comment

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

somehow this is automatically popping up...
ping me when you are done with the github mig

<type>jar</type>
</dependency>
</dependencies>
Expand Down
12 changes: 11 additions & 1 deletion maven/org.eclipse.oomph.maven.generator/report/m2e/REPORT.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
- [biz.aQute.bnd.util](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.util/) **[6.4.0](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.util/6.4.0)** < [6.4.1](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.util/6.4.1/)
- [biz.aQute.bndlib](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/) **[6.4.0](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.4.0)** < [6.4.1](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.4.1/)
- [ch.qos.logback](https://repo1.maven.org/maven2/ch/qos/logback/)
- [logback-classic](https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/) **[1.2.12](https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/1.2.12)** < [1.4.6](https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/1.4.6/)
- [logback-classic](https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/) **[1.2.12](https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/1.2.12)** < [1.4.8](https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/1.4.8/)
- [com.google.guava](https://repo1.maven.org/maven2/com/google/guava/)
- [guava](https://repo1.maven.org/maven2/com/google/guava/guava/) **[31.1-jre](https://repo1.maven.org/maven2/com/google/guava/guava/31.1-jre)** < [32.0.1-jre](https://repo1.maven.org/maven2/com/google/guava/guava/32.0.1-jre/)
- [org.jdom](https://repo1.maven.org/maven2/org/jdom/)
- [jdom2](https://repo1.maven.org/maven2/org/jdom/jdom2/) **[2.0.6](https://repo1.maven.org/maven2/org/jdom/jdom2/2.0.6)** < [2.0.6.1](https://repo1.maven.org/maven2/org/jdom/jdom2/2.0.6.1/)
- [org.mockito](https://repo1.maven.org/maven2/org/mockito/)
- [mockito-core](https://repo1.maven.org/maven2/org/mockito/mockito-core/) **[5.3.0](https://repo1.maven.org/maven2/org/mockito/mockito-core/5.3.0)** < [5.3.1](https://repo1.maven.org/maven2/org/mockito/mockito-core/5.3.1/)

Expand All @@ -33,6 +35,14 @@
- [commons-cli](https://repo1.maven.org/maven2/commons-cli/commons-cli/) **[1.5.0](https://repo1.maven.org/maven2/commons-cli/commons-cli/1.5.0)**
- [io.takari.m2e.workspace](https://repo1.maven.org/maven2/io/takari/m2e/workspace/)
- [org.eclipse.m2e.workspace.cli](https://repo1.maven.org/maven2/io/takari/m2e/workspace/org.eclipse.m2e.workspace.cli/) **[0.3.1](https://repo1.maven.org/maven2/io/takari/m2e/workspace/org.eclipse.m2e.workspace.cli/0.3.1)**
- [org.apache.maven.archetype](https://repo1.maven.org/maven2/org/apache/maven/archetype/)
- [archetype-catalog](https://repo1.maven.org/maven2/org/apache/maven/archetype/archetype-catalog/) **[3.2.1](https://repo1.maven.org/maven2/org/apache/maven/archetype/archetype-catalog/3.2.1)**
- [archetype-common](https://repo1.maven.org/maven2/org/apache/maven/archetype/archetype-common/) **[3.2.1](https://repo1.maven.org/maven2/org/apache/maven/archetype/archetype-common/3.2.1)**
- [archetype-descriptor](https://repo1.maven.org/maven2/org/apache/maven/archetype/archetype-descriptor/) **[3.2.1](https://repo1.maven.org/maven2/org/apache/maven/archetype/archetype-descriptor/3.2.1)**
- [org.apache.maven.shared](https://repo1.maven.org/maven2/org/apache/maven/shared/)
- [maven-artifact-transfer](https://repo1.maven.org/maven2/org/apache/maven/shared/maven-artifact-transfer/) **[0.13.1](https://repo1.maven.org/maven2/org/apache/maven/shared/maven-artifact-transfer/0.13.1)**
- [org.jdom](https://repo1.maven.org/maven2/org/jdom/)
- [jdom2](https://repo1.maven.org/maven2/org/jdom/jdom2/) **[2.0.6](https://repo1.maven.org/maven2/org/jdom/jdom2/2.0.6)**
- [org.mockito](https://repo1.maven.org/maven2/org/mockito/)
- [mockito-core](https://repo1.maven.org/maven2/org/mockito/mockito-core/) **[5.3.0](https://repo1.maven.org/maven2/org/mockito/mockito-core/5.3.0)**
- [org.osgi](https://repo1.maven.org/maven2/org/osgi/)
Expand Down
44 changes: 44 additions & 0 deletions maven/org.eclipse.oomph.maven.generator/report/m2e/original.target
Original file line number Diff line number Diff line change
Expand Up @@ -121,5 +121,49 @@
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="maven-archetype" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-catalog</artifactId>
<version>3.2.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-common</artifactId>
<version>3.2.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-descriptor</artifactId>
<version>3.2.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
<version>0.13.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
<version>2.0.6</version>
<type>jar</type>
</dependency>
</dependencies>
<instructions><![CDATA[
Bundle-Name: M2Eclipse supplement fragment for ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
version: ${version_cleanup;${mvnVersion}}
Bundle-SymbolicName: org.eclipse.m2e.archetype.${mvnArtifactId}
Bundle-Version: ${version}
Export-Package: *;version="${version}";-noimport:=true
Fragment-Host: org.eclipse.m2e.archetype.common;bundle-version="[3,4)"
-exportcontents: META-INF.plexus;-noimport:=true;x-internal:=true,org.apache.maven.archetype.*;provider=m2e;mandatory:=provider;version="${version}";x-friends:="org.eclipse.m2e.core.ui"
Import-Package: !*
]]></instructions>
</location>
</locations>
</target>
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.4.6</version>
<version>1.4.8</version>
<type>jar</type>
</dependency>
<dependency>
Expand Down Expand Up @@ -121,5 +121,49 @@
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="maven-archetype" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-catalog</artifactId>
<version>3.2.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-common</artifactId>
<version>3.2.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-descriptor</artifactId>
<version>3.2.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
<version>0.13.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
<version>2.0.6.1</version>
<type>jar</type>
</dependency>
</dependencies>
<instructions><![CDATA[
Bundle-Name: M2Eclipse supplement fragment for ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
version: ${version_cleanup;${mvnVersion}}
Bundle-SymbolicName: org.eclipse.m2e.archetype.${mvnArtifactId}
Bundle-Version: ${version}
Export-Package: *;version="${version}";-noimport:=true
Fragment-Host: org.eclipse.m2e.archetype.common;bundle-version="[3,4)"
-exportcontents: META-INF.plexus;-noimport:=true;x-internal:=true,org.apache.maven.archetype.*;provider=m2e;mandatory:=provider;version="${version}";x-friends:="org.eclipse.m2e.core.ui"
Import-Package: !*
]]></instructions>
</location>
Comment on lines +124 to +167

Choose a reason for hiding this comment

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

These maven archetype artifacts are not fully functional and are stripped down to whats necessary to make them work only for the use case of M2E. They are tightly coupled to m2e and are not general purpose wrappings.
Therefore I think they should be included here.

Copy link
Contributor

Choose a reason for hiding this comment

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

This is where I've been doing the BND wrapping:

https:/eclipse-oomph/oomph.incubator/blob/master/maven-bnd/tp/MavenBND.target

Now that I'm one GitHub, I'm going to create proper read-mes to document everything better...

Of course this particular 'maven-bnd' is probably something people want moved to Orbit and I still need to discuss with Jonah if this m2e location approach is the best way. I tried to added poi this weekend and thrashed for the better part of a day chasing down dependencies. 😭

Choose a reason for hiding this comment

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

Of course this particular 'maven-bnd' is probably something people want moved to Orbit and I still need to discuss with Jonah if this m2e location approach is the best way.

Yes that would make sense to have that in Orbit or its (future) derivatives. Personally I'm not sure either and it probably depends on the complexity of the wrapping, e.g. if only the Manifest is generated or if the jars are even re-packed.

In case you want another participant, I would be interested about that discussion as well.

</locations>
</target>
Loading