Update container test for telemetry java8 compatibility

dev/build.depScanner/src/io/openliberty/depScanner/Repository.java

@@ -56,7 +56,15 @@ public class Repository {
  "com.ibm.ws:xalan:1.0.2",
  "io.netty:netty-codec-http:4.1.107.Final",
  "io.netty:netty-codec-http:4.1.94.Final",
- "org.bouncycastle:bcprov-jdk18on:1.77");
+ "io.netty:netty-codec-http:4.1.90.Final",
+ "org.bouncycastle:bcprov-jdk18on:1.77",
+ "org.apache.cxf:cxf-rt-frontend-jaxrs:3.1.16",
+ "org.apache.cxf:cxf-rt-rs-client:3.1.16",
+ "org.apache.cxf:cxf-rt-rs-service-description:3.1.16",
+ "org.apache.cxf:cxf-rt-transports-http:3.1.16",
+ "org.apache.cxf:cxf-tools-common:3.1.16",
+ "org.apache.cxf:cxf-tools-wadlto-jaxrs:3.1.16",
+ "org.eclipse.parsson:parsson:1.1.0");
 
  private final Map<String, List<Module>> moduleMap = new HashMap<>();
 

dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml

@@ -676,6 +676,11 @@
  <artifactId>opentelemetry-instrumentation-api</artifactId>
  <version>2.1.0</version>
  </dependency>
+ <dependency>
+ <groupId>io.opentelemetry.instrumentation</groupId>
+ <artifactId>opentelemetry-resources</artifactId>
+ <version>2.1.0-alpha</version>
+ </dependency>
  <dependency>
  <groupId>io.opentelemetry.instrumentation</groupId>
  <artifactId>opentelemetry-runtime-telemetry-java8</artifactId>

dev/cnf/oss_dependencies.maven

@@ -131,6 +131,7 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:1.32.
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.19.0
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.29.0
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.1.0
+io.opentelemetry.instrumentation:opentelemetry-resources:2.1.0-alpha
 io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8:2.4.0-alpha
 io.opentelemetry.semconv:opentelemetry-semconv:1.23.1-alpha
 io.opentelemetry.semconv:opentelemetry-semconv:1.25.0-alpha

dev/cnf/resources/bnd/liberty-release.props

@@ -14,12 +14,12 @@
 releaseTypeGA=true
 
 libertyBaseVersion=24.0.0
-libertyFixpackVersion=8
+libertyFixpackVersion=9
 libertyServiceVersion=${libertyBaseVersion}.${libertyFixpackVersion}
-libertyBetaVersion=2024.8.0.0
+libertyBetaVersion=2024.9.0.0
 libertyRelease=${if;${releaseTypeGA};${libertyServiceVersion};${libertyBetaVersion}}
 
-libertyBundleMicroVersion=92
+libertyBundleMicroVersion=93
 copyrightBuildYear=2024
 buildID=${libertyRelease}-${def;buildLabel}
 productEdition=BASE_ILAN

dev/com.ibm.websphere.appserver.features/.classpath

@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
- <classpathentry kind="src" path="visibility/auto"/>
- <classpathentry kind="src" path="visibility/private"/>
- <classpathentry kind="src" path="visibility/protected"/>
- <classpathentry kind="src" path="visibility/public"/>
  <classpathentry kind="src" output="bin_test" path="test/src"/>
  <classpathentry kind="con" path="aQute.bnd.classpath.container"/>
  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

dev/com.ibm.websphere.appserver.features/build.gradle

@@ -362,10 +362,16 @@ publishing {
  }
 }
 
+task cleanSingleJsonRepo {
+ doLast {
+ delete project.file('build/temp/SingleJson.json')
+ }
+}
 if (isAutomatedBuild) {
  def singleOpenLibertyJsonRepo = project.file('build/temp/SingleJson.json')
  task generateSingleJsonRepo {
  dependsOn publishFeatureResources
+ dependsOn cleanSingleJsonRepo
  inputs.dir new File(project.buildDir, 'repo')
  outputs.file singleOpenLibertyJsonRepo
  doLast {

dev/com.ibm.websphere.appserver.features/test/src/com/ibm/ws/feature/tests/VersionlessTest.java

@@ -99,9 +99,17 @@ private static void processFeatureInfo(FeatureInfo featureInfo, Set<FeatureInfo>
  System.out.println(" [ " + depName + " ** NOT FOUND ** ]");
  // Only include dependent features that do not have tolerates. If a feature depends on particular version it will have been
  // included in the convenience feature due to how tolerates works to not be transitive.
- } else if (!attr.containsKey("ibm.tolerates:") || depName.startsWith("com.ibm.websphere.appserver.jdbc-") || !depInfo.getKind().equals("ga")) {
+ } else if (!attr.containsKey("ibm.tolerates:") || depName.startsWith("com.ibm.websphere.appserver.jdbc-")) {
  if (depInfo.isPublic()) {
  publicDepFeatures.add(depInfo);
+ // Check for a Container feature and add it to the list of features
+ String possibleContainerFeature = depInfo.getBaseName() + "Container-" + depInfo.getVersion();
+ FeatureInfo containerFeatureInfo = getFeature(possibleContainerFeature);
+ if (containerFeatureInfo != null) {
+ if (processedDepFeatures.add(containerFeatureInfo.getName())) {
+ publicDepFeatures.add(containerFeatureInfo);
+ }
+ }
  }
  processFeatureInfo(depInfo, publicDepFeatures, processedDepFeatures);
  }
@@ -428,42 +436,39 @@ public void listSelectorDetails() {
  //each feature dependency of the platform
  Set<FeatureInfo> publicDepFeatures = getAllPublicDependentFeatures(featureInfo);
  for (FeatureInfo depInfo : publicDepFeatures) {
- //Only process features in "ga"
- if (depInfo.getKind().equals("ga")) {
- System.out.println(" [ " + depInfo.getBaseName() + " - " + depInfo.getVersion() + " ]");
+ System.out.println(" [ " + depInfo.getBaseName() + " - " + depInfo.getVersion() + " ]");
 
-  if (depInfo.isAlsoKnownAsSet()) {
-  System.out.println(" [ AKA: " + depInfo.getAlsoKnownAs() + " ]");
-  }
+ if (depInfo.isAlsoKnownAsSet()) {
+ System.out.println(" [ AKA: " + depInfo.getAlsoKnownAs() + " ]");
+ }
 
-  //
-  String featureTitle = depInfo.getShortName().split("-")[0]; //Just the name not the version
+ //
+ String featureTitle = depInfo.getShortName().split("-")[0]; //Just the name not the version
 
-  //add features to our map and add data on its platform-version link
-  if (versionlessFeatures.containsKey(featureTitle)) {
-  versionlessFeatures.get(featureTitle)
-  .addFeaturePlatform(new String[] { depInfo.getShortName(), baseName.replace("javaee", "jakartaee") + "-" + version,
- depInfo.getName() });
-  } else {
-  versionlessFeatures.put(featureTitle,
-  new VersionlessFeatureDefinition(featureTitle, featureTitle,
-  new String[] { depInfo.getShortName(),
-  baseName.replace("javaee", "jakartaee") + "-" + version,
-  depInfo.getName() },
- depInfo.getEdition(),
-  depInfo.getKind()));
-  }
+ //add features to our map and add data on its platform-version link
+ if (versionlessFeatures.containsKey(featureTitle)) {
+ versionlessFeatures.get(featureTitle)
+ .addFeaturePlatformAndKind(new String[] { depInfo.getShortName(), baseName.replace("javaee", "jakartaee") + "-" + version,
+  depInfo.getName(), depInfo.getKind() });
+ } else {
+ versionlessFeatures.put(featureTitle,
+ new VersionlessFeatureDefinition(featureTitle, featureTitle,
+ new String[] { depInfo.getShortName(),
+ baseName.replace("javaee", "jakartaee") + "-" + version,
+ depInfo.getName(),
+  depInfo.getKind() },
+ depInfo.getEdition()));
+ }
 
- //Keep track of features with updated names via the alsoknownas metadata
- if (depInfo.isAlsoKnownAsSet()) {
- String aka = depInfo.getAlsoKnownAs().split("-")[0];
- if (!aka.equals(featureTitle)) {
- if (versionlessFeatures.get(featureTitle).getAlsoKnownAs() == null) {
- versionlessFeatures.get(featureTitle).setAlsoKnownAs(aka);
- }
- if (versionlessFeatures.containsKey(aka)) {
- versionlessFeatures.get(aka).setAKAFutureFeature(featureTitle);
- }
+ //Keep track of features with updated names via the alsoknownas metadata
+ if (depInfo.isAlsoKnownAsSet()) {
+ String aka = depInfo.getAlsoKnownAs().split("-")[0];
+ if (!aka.equals(featureTitle)) {
+ if (versionlessFeatures.get(featureTitle).getAlsoKnownAs() == null) {
+ versionlessFeatures.get(featureTitle).setAlsoKnownAs(aka);
+ }
+ if (versionlessFeatures.containsKey(aka)) {
+ versionlessFeatures.get(aka).setAKAFutureFeature(featureTitle);
  }
  }
  }
@@ -559,9 +564,7 @@ public Map<String, List<String>> getSelectorCohorts() {
  "opentracing",
  "jndi",
  "restConnector", // restConnector-2.0 was erroneously added to jakartaee-9.1
- "jpaContainer", // jpa depends on jpaContainer
- "persistenceContainer" // persistence depends on persistenceContainer.
- ));
+ "bells"));
 
  private static Map<String, int[]> versions = new HashMap<>();
 

dev/com.ibm.websphere.appserver.features/test/src/com/ibm/ws/feature/utils/VersionlessFeatureCreator.java

@@ -34,9 +34,9 @@ public boolean createFeatureFiles(VersionlessFeatureDefinition feature, Versionl
  // this feature is the older version of an newer feature
  // ex. ejb
  // in this scenario we add the future feature versions
- ArrayList<String[]> temp = akaFeature.getFeaturesAndPlatform();
+ ArrayList<String[]> temp = akaFeature.getFeaturesAndPlatformAndKind();
  for (String[] featAndPlat : temp) {
- feature.addFeaturePlatform(featAndPlat);
+ feature.addFeaturePlatformAndKind(featAndPlat);
  }
  } else {
  if (feature.getAKAFutureFeature() != null) {
@@ -54,7 +54,7 @@ public boolean createFeatureFiles(VersionlessFeatureDefinition feature, Versionl
  // features[1] == the name of the platform it depends on ex. jakartaPlatform-8.0
  // features[2] == the full name of the feature ex. com.ibm.ws.servlet-4.0
  if (feature.getAlsoKnownAs() == null) {
- for (String[] features : feature.getFeaturesAndPlatform()) {
+ for (String[] features : feature.getFeaturesAndPlatformAndKind()) {
  //Code for utilizing the ee/mp versions to add within the private feature defs
  String[] dependencyVersions = feature.getAllDependencyVersions(features[0], features[1].split("-")[0]);
 
@@ -70,7 +70,7 @@ public boolean createFeatureFiles(VersionlessFeatureDefinition feature, Versionl
  }
 
  if (createPrivateVersionedFeature(feature.getFeatureName(), akaFeature == null ? null : akaFeature.getFeatureName(), features[0].split("-")[1], x, y,
- features[2], feature.getEdition(), feature.getKind())) {
+ features[2], feature.getEdition(), features[3])) {
  generatedNewFile = true;
  }
  }
@@ -109,6 +109,10 @@ private boolean createPrivateVersionedFeature(String featureName, String akaFeat
  writer.newLine();
  writer.append("-features= \\");
  writer.newLine();
+ if ("noship".equals(kind)) {
+ writer.append(" io.openliberty.noShip-1.0, \\");
+ writer.newLine();
+ }
  if (x != null && y != null) {
  writer.append(" " + x + "-" + y + ", \\");
  writer.newLine();
@@ -117,7 +121,7 @@ private boolean createPrivateVersionedFeature(String featureName, String akaFeat
  writer.newLine();
  writer.append("kind=" + kind);
  writer.newLine();
- writer.append("edition=" + edition);
+ writer.append("edition=" + ("noship".equals(kind) ? "full" : edition));
  writer.newLine();
 
  writer.close();

dev/com.ibm.websphere.appserver.features/test/src/com/ibm/ws/feature/utils/VersionlessFeatureDefinition.java

@@ -6,27 +6,24 @@ public class VersionlessFeatureDefinition {
 
  private final String featureName;
  private final String subsystemName;
- private final ArrayList<String[]> featuresAndPlatform;
+ private final ArrayList<String[]> featuresAndPlatformAndKind;
  private String alsoKnownAs;
  private String akaFutureFeature;
  private final String edition;
- private final String kind;
 
- public VersionlessFeatureDefinition(String featureName, String subsystemName, ArrayList<String[]> featuresAndPlatform, String editon, String kind) {
+ public VersionlessFeatureDefinition(String featureName, String subsystemName, ArrayList<String[]> featuresAndPlatformAndKind, String editon) {
  this.featureName = featureName;
  this.subsystemName = subsystemName;
- this.featuresAndPlatform = featuresAndPlatform;
+ this.featuresAndPlatformAndKind = featuresAndPlatformAndKind;
  this.edition = editon;
- this.kind = kind;
  }
 
- public VersionlessFeatureDefinition(String featureName, String subsystemName, String[] featureAndPlatform, String edition, String kind) {
+ public VersionlessFeatureDefinition(String featureName, String subsystemName, String[] featureAndPlatformAndKind, String edition) {
  this.featureName = featureName;
  this.subsystemName = subsystemName;
- this.featuresAndPlatform = new ArrayList<String[]>();
- featuresAndPlatform.add(featureAndPlatform);
+ this.featuresAndPlatformAndKind = new ArrayList<String[]>();
+ featuresAndPlatformAndKind.add(featureAndPlatformAndKind);
  this.edition = edition;
- this.kind = kind;
  }
 
  /**
@@ -70,21 +67,21 @@ public void setAKAFutureFeature(String futureFeature) {
  /**
  * Get the features mapped to their platform dependency
  * EX:
- * jpa-2.2, jakartaPlatform-8.0
- * persistence-3.0, JakartaPlatform-9.1
+ * jpa-2.2, jakartaPlatform-8.0, ga
+ * persistence-3.0, JakartaPlatform-9.1, ga
  *
  * @return
  */
- public ArrayList<String[]> getFeaturesAndPlatform() {
- return this.featuresAndPlatform;
+ public ArrayList<String[]> getFeaturesAndPlatformAndKind() {
+ return this.featuresAndPlatformAndKind;
  }
 
- public void addFeaturePlatform(String[] featurePlatform) {
- featuresAndPlatform.add(featurePlatform);
+ public void addFeaturePlatformAndKind(String[] featurePlatformAndKind) {
+ featuresAndPlatformAndKind.add(featurePlatformAndKind);
  }
 
- public void addFeaturePlatform(String feature, String platform) {
- featuresAndPlatform.add(new String[] { feature, platform });
+ public void addFeaturePlatformAndKind(String feature, String platform, String kind) {
+ featuresAndPlatformAndKind.add(new String[] { feature, platform, kind });
  }
 
  /**
@@ -95,7 +92,7 @@ public void addFeaturePlatform(String feature, String platform) {
  public String[] getPreferredAndTolerates() {
  ArrayList<String> versions = new ArrayList<String>();
 
- for (String[] featAndPlat : featuresAndPlatform) {
+ for (String[] featAndPlat : featuresAndPlatformAndKind) {
  if (!versions.contains(featAndPlat[0].split("-")[1])) {
  versions.add(featAndPlat[0].split("-")[1]);
  }
@@ -127,7 +124,7 @@ public String[] getPreferredAndTolerates(ArrayList<String> versions) {
  public ArrayList<String> getAllVersions() {
  ArrayList<String> versions = new ArrayList<String>();
 
- for (String[] featAndPlat : featuresAndPlatform) {
+ for (String[] featAndPlat : featuresAndPlatformAndKind) {
  if (!versions.contains(featAndPlat[0].split("-")[1])) {
  versions.add(featAndPlat[0].split("-")[1]);
  }
@@ -149,8 +146,8 @@ public String[] getAllDependencyVersions(String versionedFeature, String depende
  String result = "";
  String currentLow = "" + Double.MAX_VALUE;
 
- for (int i = 0; i < featuresAndPlatform.size(); i++) {
- String[] fnp = featuresAndPlatform.get(i);
+ for (int i = 0; i < featuresAndPlatformAndKind.size(); i++) {
+ String[] fnp = featuresAndPlatformAndKind.get(i);
  if (fnp[0].equals(versionedFeature)) {
  if (fnp[1].contains(dependency + "-")) {
  //Should leave you with "(version number).feature" ex. "1.2"
@@ -196,6 +193,19 @@ public static int compareVersions(String version1, String version2) {
  * @return the kind
  */
  public String getKind() {
+ String kind = "noship";
+ for (int i = 0; i < featuresAndPlatformAndKind.size(); i++) {
+ if ("ga".equals(kind)) {
+ break;
+ }
+ String[] fnp = featuresAndPlatformAndKind.get(i);
+ String versionKind = fnp[3];
+ // If current kind is noship, then just set it to what versionKind is. It is going to either be noship, beta or ga
+ // If version kind is ga, then set kind to version kind. Otherwise leave it be beta or ga because it wouldn't change
+ if ("noship".equals(kind) || "ga".equals(versionKind)) {
+ kind = versionKind;
+ }
+ }
  return kind;
  }
 }