Merge pull request OpenLiberty#11 from utle/FIPSwork

Removve com.ibm.ws.common.crypto
utle · Nov 4, 2024 · d6c428f · d6c428f
2 parents 86573ad + 3958c32
commit d6c428f
Show file tree

Hide file tree

Showing 16 changed files with 11 additions and 488 deletions.
diff --git a/dev/com.ibm.ws.common.crypto/.classpath b/dev/com.ibm.ws.common.crypto/.classpath
diff --git a/dev/com.ibm.ws.common.crypto/.gitignore b/dev/com.ibm.ws.common.crypto/.gitignore
diff --git a/dev/com.ibm.ws.common.crypto/.project b/dev/com.ibm.ws.common.crypto/.project
diff --git a/dev/com.ibm.ws.common.crypto/.settings/bndtools.core.prefs b/dev/com.ibm.ws.common.crypto/.settings/bndtools.core.prefs
diff --git a/dev/com.ibm.ws.common.crypto/.settings/org.eclipse.core.resources.prefs b/dev/com.ibm.ws.common.crypto/.settings/org.eclipse.core.resources.prefs
diff --git a/dev/com.ibm.ws.common.crypto/.settings/org.eclipse.jdt.core.prefs b/dev/com.ibm.ws.common.crypto/.settings/org.eclipse.jdt.core.prefs
diff --git a/dev/com.ibm.ws.common.crypto/.settings/org.eclipse.jdt.ui.prefs b/dev/com.ibm.ws.common.crypto/.settings/org.eclipse.jdt.ui.prefs
diff --git a/dev/com.ibm.ws.common.crypto/bnd.bnd b/dev/com.ibm.ws.common.crypto/bnd.bnd
diff --git a/dev/com.ibm.ws.crypto.ltpakeyutil/bnd.bnd b/dev/com.ibm.ws.crypto.ltpakeyutil/bnd.bnd
@@ -37,8 +37,7 @@ Service-Component:\
 	com.ibm.ws.logging;version=latest, \
 	com.ibm.ws.kernel.service;version=latest, \
 	com.ibm.ws.kernel.boot.core;version=latest, \
-	com.ibm.ws.org.osgi.annotation.versioning;version=latest, \
-	com.ibm.ws.common.crypto;version=latest
+	com.ibm.ws.org.osgi.annotation.versioning;version=latest
 
 -testpath: \
 	../build.sharedResources/lib/junit/old/junit.jar;version=file, \

diff --git a/dev/com.ibm.ws.kernel.service/src/com/ibm/ws/common/crypto/package-info.java b/dev/com.ibm.ws.kernel.service/src/com/ibm/ws/common/crypto/package-info.java
@@ -16,7 +16,7 @@
  * included by several different bundles.
  */
 /**
- * @version 1.0
+ * @version 1.0.0
  */
-@org.osgi.annotation.versioning.Version("1.0")
+@org.osgi.annotation.versioning.Version("1.0.0")
 package com.ibm.ws.common.crypto;
diff --git a/dev/com.ibm.ws.security.acme/bnd.bnd b/dev/com.ibm.ws.security.acme/bnd.bnd
@@ -107,6 +107,7 @@ instrument.classesExcludes: com/ibm/ws/security/acme/resources/*.class
 
 
 -testpath: \
+	com.ibm.ws.kernel.boot;version=latest,\
 	com.ibm.ws.kernel.service;version=latest,\
 	org.hamcrest:hamcrest-all;version=1.3, \
 	../build.sharedResources/lib/junit/old/junit.jar;version=file, \

diff --git a/dev/com.ibm.ws.security.fat.common/bnd.bnd b/dev/com.ibm.ws.security.fat.common/bnd.bnd
@@ -70,9 +70,8 @@ generate.replacement: true
 	com.ibm.json4j;version=latest,\
 	org.bitbucket.b_c.jose4j,\
 	com.unboundid.ldap.sdk,\
-    com.ibm.ws.kernel.boot;version=latest, \
-    com.ibm.ws.kernel.service;version=latest,\
-    com.ibm.ws.common.crypto;version=latest,\
+  com.ibm.ws.kernel.boot;version=latest, \
+  com.ibm.ws.kernel.service;version=latest,\
 	com.ibm.ws.com.unboundid
 -testpath: \
     ../build.sharedResources/lib/junit/old/junit.jar;version=file, \

diff --git a/dev/com.ibm.ws.security.saml.websso.2.0/bnd.bnd b/dev/com.ibm.ws.security.saml.websso.2.0/bnd.bnd
@@ -160,7 +160,7 @@ Service-Component: \
 	com.ibm.ws.org.osgi.annotation.versioning;version=latest,\
 	io.openliberty.org.apache.commons.codec;version=latest,\
 	com.ibm.ws.com.google.guava;version=latest,\
-	com.ibm.ws.common.crypto;version=latest,\
+	com.ibm.ws.kernel.service;version=latest,\
 	osgi.cmpn
 
 instrument.classesExcludes: com/ibm/ws/security/saml/sso20/internal/resources/SamlSso20Messages*.class

diff --git a/dev/com.ibm.ws.security.token.ltpa/bnd.bnd b/dev/com.ibm.ws.security.token.ltpa/bnd.bnd
@@ -96,7 +96,7 @@ instrument.classesExcludes: com/ibm/ws/security/token/ltpa/internal/resources/*.
 	com.ibm.ws.logging;version=latest,\
 	com.ibm.ws.org.osgi.annotation.versioning;version=latest,\
 	com.ibm.ws.config;version=latest, \
-  com.ibm.ws.common.crypto;version=latest
+  com.ibm.ws.kernel.service;version=latest
 
 -testpath: \
 	../build.sharedResources/lib/junit/old/junit.jar;version=file, \
@@ -110,4 +110,4 @@ instrument.classesExcludes: com/ibm/ws/security/token/ltpa/internal/resources/*.
 	org.jmock:jmock-legacy;version=2.5.0, \
 	com.ibm.ws.kernel.boot;version=latest, \
 	com.ibm.ws.crypto.passwordutil;version=latest, \
-  com.ibm.ws.common.crypto;version=latest
+  com.ibm.ws.kernel.service;version=latest
diff --git a/dev/com.ibm.ws.ssl/bnd.bnd b/dev/com.ibm.ws.ssl/bnd.bnd
@@ -79,7 +79,7 @@ instrument.disabled: true
 	com.ibm.ws.org.osgi.annotation.versioning;version=latest,\
 	com.ibm.ws.kernel.boot.core;version=latest,\
 	com.ibm.ws.kernel.boot.common;version=latest,\
-	com.ibm.ws.common.crypto;version=latest
+	com.ibm.ws.kernel.service;version=latest
 
 -testpath: \
 	org.hamcrest:hamcrest-all;version=1.3, \

diff --git a/dev/com.ibm.ws.wssecurity.3.4.1/bnd.bnd b/dev/com.ibm.ws.wssecurity.3.4.1/bnd.bnd
@@ -98,7 +98,7 @@ instrument.classesExcludes: com/ibm/ws/wssecurity/resources/*.class
 	com.ibm.ws.artifact.overlay;version=latest,\
 	com.ibm.ws.artifact;version=latest,\
 	com.ibm.ws.container.service;version=latest,\
-	com.ibm.ws.common.crypto;version=latest,\
+	com.ibm.ws.kernel.service;version=latest,\
 	com.ibm.ws.crypto.passwordutil;version=latest,\
 	com.ibm.ws.injection;version=latest,\
 	com.ibm.ws.javaee.dd.common;version=latest,\