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.

Sign up for GitHub

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

Jump to bottom

Abandoning JDK8 + updates + fix #34

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Abandoning JDK8 + updates + fix #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc2a11f
Fixed package name in module-info
dmatej Aug 16, 2024
239fb7f
Fixed osgi values in manifest - included SNAPSHOT
dmatej Aug 21, 2024
0bf7ddf
Upgrades: base JDK to 11, parent, compiler plugin
dmatej Aug 21, 2024
f10f51b
Dependency on snapshots
dmatej Aug 21, 2024
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
7 changes: 2 additions & 5 deletions api-only/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.name}</Bundle-Name>
<Bundle-Version>${project.version}</Bundle-Version>
<Export-Package>org.glassfish.gmbal,org.glassfish.pfl.tf.timer.spi</Export-Package>
</instructions>
</configuration>
<executions>
Expand All @@ -55,8 +52,8 @@
</execution>
</executions>
</plugin>
<plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
Expand Down
24 changes: 9 additions & 15 deletions impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,27 +126,21 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Export-Package>org.glassfish.gmbal, org.glassfish.gmbal.impl.trace</Export-Package>
<Private-Package>
org.glassfish.gmbal.util, org.glassfish.gmbal.impl, org.glassfish.gmbal.typelib
</Private-Package>
</instructions>
</configuration>
<executions>
<execution>
<id>generate-manifest</id>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.name}</Bundle-Name>
<Bundle-Version>${project.version}</Bundle-Version>
<Export-Package>org.glassfish.gmbal, org.glassfish.gmbal.impl.trace</Export-Package>
<Private-Package>
org.glassfish.gmbal.util, org.glassfish.gmbal.impl, org.glassfish.gmbal.typelib
</Private-Package>
<!-- Include-Resource>
TODO: Use PFL ExceptionResourceGenerator to automatically generate resource files
under src/main/resources. See build.xml for sample usage.
</Include-Resource -->
</instructions>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion impl/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
requires java.logging;
requires transitive org.glassfish.external.management.api;

exports org.glassfish.gmbal;
exports org.glassfish.gmbal.impl;
exports org.glassfish.gmbal.impl.trace;
}
38 changes: 9 additions & 29 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.8</version>
<version>1.0.9</version>
<relativePath/>
</parent>

Expand Down Expand Up @@ -83,9 +83,9 @@
</mailingLists>

<properties>
<jdkVersion>8</jdkVersion>
<pfl.version>4.1.2</pfl.version>
<gmbal.commons.version>3.2.3</gmbal.commons.version>
<jdkVersion>11</jdkVersion>
<pfl.version>5.0.1-SNAPSHOT</pfl.version>
<gmbal.commons.version>3.3.0-SNAPSHOT</gmbal.commons.version>
<legal.doc.source>${project.basedir}/..</legal.doc.source>
</properties>

Expand Down Expand Up @@ -150,7 +150,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.13.0</version>
<configuration>
<release>11</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
Expand All @@ -160,7 +163,6 @@
<niceManifest>true</niceManifest>
</configuration>
</plugin>
<!-- override default "built-by" entry, which points to a developer's user id -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down Expand Up @@ -210,30 +212,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<release>9</release>
<release>11</release>
</configuration>
<executions>
<execution>
<id>default-compile</id>
<configuration>
<compilerArgs>
<arg>-Xlint:all</arg>
</compilerArgs>
</configuration>
</execution>
<execution>
<id>base-compile</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<release>${jdkVersion}</release>
<excludes>
<exclude>module-info.java</exclude>
</excludes>
</configuration>
</execution>
</executions>
</plugin>

<!-- prevent the site plugin from deploying to the scm url -->
Expand Down