Exclude com.ethlo.time:itu:1.11.0 for the time being

- Revisit the issue next time there is a new version. ethlo/itu#40
eclipse-orbit · Feb 11, 2025 · 9ef1af2 · 9ef1af2
1 parent cbfd9b6
commit 9ef1af2
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 5 deletions.
diff --git a/maven-osgi/dependency-analyzer-arg.txt b/maven-osgi/dependency-analyzer-arg.txt
@@ -63,7 +63,7 @@ org.bouncycastle:.*:1.78  // Broken https://github.com/bcgit/bc-java/issues/1621
 org.apache.sshd:.*:2\.13\.0
 org\.slf4j:slf4j-.*:2\.0\.14 // Broken exported package versions
 org.mozilla:rhino:1\.8\.0 // This version is not an OSGI bundle https://github.com/mozilla/rhino/discussions/1788
-com.google.code.gson:gson:2\.12\.0 // This version as strange new annotations dependencies.
+com.ethlo.time:itu:1\.11\.0 // Not an OSGi bundle
 
 -keep
 commons-logging:commons-logging:1.2
diff --git a/maven-osgi/org.eclipse.orbit.maven.generator/MavenBNDDependencyAnalyzer.launch b/maven-osgi/org.eclipse.orbit.maven.generator/MavenBNDDependencyAnalyzer.launch
@@ -17,7 +17,7 @@
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.orbit.maven.generator.DependencyAnalyzer"/>
     <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.eclipse.orbit.maven.generator"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-targets&#13;&#10;maven-bnd=https://raw.githubusercontent.com/eclipse-orbit/orbit-simrel/main/maven-bnd/tp/MavenBND.target&#13;&#10;&#13;&#10;-exclude&#13;&#10;&#13;&#10;-ignore&#13;&#10;org.hamcrest:hamcrest.*:3.*&#13;&#10;org.jdom:jdom:2.*&#13;&#10;org\.slf4j:slf4j-.*:2\.0\.14 // Broken exported package versions&#13;&#10;&#13;&#10;xalan:.*:2.7.3  // Does not provide source artifacts&#13;&#10;org.antlr:antlr-runtime:(3.3|3.4|3.5|3.5.1|3.5.2|3.5.3)&#13;&#10;&#13;&#10;-report&#13;&#10;${project_loc:/org.eclipse.orbit.simrel}/report/maven-bnd&#13;&#10;&#13;&#10;-cache&#13;&#10;${project_loc:/org.eclipse.orbit.maven.generator}/cache&#13;&#10;&#13;&#10;-merge&#13;&#10;${resource_loc:/org.eclipse.orbit.simrel/maven-bnd/tp/MavenBND.target}&#13;&#10;&#13;&#10;-merge-uri&#13;&#10;https://github.com/eclipse-orbit/orbit-simrel/blob/main/maven-bnd/tp/MavenBND.target&#13;&#10;&#13;&#10;-update"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-targets&#13;&#10;maven-bnd=https://raw.githubusercontent.com/eclipse-orbit/orbit-simrel/main/maven-bnd/tp/MavenBND.target&#13;&#10;&#13;&#10;-exclude&#13;&#10;&#13;&#10;-ignore&#13;&#10;org.hamcrest:hamcrest.*:3.*&#13;&#10;org.jdom:jdom:2.*&#13;&#10;org\.slf4j:slf4j-.*:2\.0\.14 // Broken exported package versions&#13;&#10;&#13;&#10;xalan:.*:2.7.3  // Does not provide source artifacts&#13;&#10;org.antlr:antlr-runtime:(3.3|3.4|3.5|3.5.1|3.5.2|3.5.3)&#13;&#10;&#13;&#10;com.ethlo.time:itu:1\.11\.0 // Not an OSGi bundle&#13;&#10;&#13;&#10;-report&#13;&#10;${project_loc:/org.eclipse.orbit.simrel}/report/maven-bnd&#13;&#10;&#13;&#10;-cache&#13;&#10;${project_loc:/org.eclipse.orbit.maven.generator}/cache&#13;&#10;&#13;&#10;-merge&#13;&#10;${resource_loc:/org.eclipse.orbit.simrel/maven-bnd/tp/MavenBND.target}&#13;&#10;&#13;&#10;-merge-uri&#13;&#10;https://github.com/eclipse-orbit/orbit-simrel/blob/main/maven-bnd/tp/MavenBND.target&#13;&#10;&#13;&#10;-update"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.orbit.maven.generator"/>
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.orbit.maven.generator.redirection.maven-bnd=https://raw.githubusercontent.com/eclipse-orbit/orbit-simrel/main/maven-bnd/tp/MavenBND.target-&gt;local:${resource_loc:/org.eclipse.orbit.simrel/maven-bnd/tp/MavenBND.target}"/>
 </launchConfiguration>
diff --git a/maven-osgi/org.eclipse.orbit.maven.generator/MavenOSGiSupplementDependencyAnalyzer.launch b/maven-osgi/org.eclipse.orbit.maven.generator/MavenOSGiSupplementDependencyAnalyzer.launch
@@ -17,7 +17,7 @@
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.orbit.maven.generator.DependencyAnalyzer"/>
     <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.eclipse.orbit.maven.generator"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-targets&#13;&#10;&#13;&#10;supplement=https://raw.githubusercontent.com/eclipse-orbit/orbit-simrel/main/maven-osgi/tp/other/MavenSupplement.target&#13;&#10;&#13;&#10;-cache&#13;&#10;${project_loc:/org.eclipse.orbit.maven.generator}/cache&#13;&#10;&#13;&#10;-merge&#13;&#10;${resource_loc:/org.eclipse.orbit.simrel/maven-osgi/tp/other/MavenSupplement.target}&#13;&#10;&#13;&#10;-merge-uri&#13;&#10;https://github.com/eclipse-orbit/orbit-simrel/blob/main/maven-osgi/tp/other/MavenSupplement.target&#13;&#10;&#13;&#10;-ignore&#13;&#10;org.mozilla:rhino:1\.8\.0 // This version is not an OSGI bundle https://github.com/mozilla/rhino/discussions/1788&#13;&#10;&#13;&#10;-keep&#13;&#10;commons-logging:commons-logging:1.2"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-targets&#13;&#10;&#13;&#10;supplement=https://raw.githubusercontent.com/eclipse-orbit/orbit-simrel/main/maven-osgi/tp/other/MavenSupplement.target&#13;&#10;&#13;&#10;-cache&#13;&#10;${project_loc:/org.eclipse.orbit.maven.generator}/cache&#13;&#10;&#13;&#10;-merge&#13;&#10;${resource_loc:/org.eclipse.orbit.simrel/maven-osgi/tp/other/MavenSupplement.target}&#13;&#10;&#13;&#10;-merge-uri&#13;&#10;https://github.com/eclipse-orbit/orbit-simrel/blob/main/maven-osgi/tp/other/MavenSupplement.target&#13;&#10;&#13;&#10;-ignore&#13;&#10;org.mozilla:rhino:1\.8\.0 // This version is not an OSGI bundle https://github.com/mozilla/rhino/discussions/1788&#13;&#10;com.ethlo.time:itu:1\.11\.0 // Not an OSGi bundle&#13;&#10;&#13;&#10;-keep&#13;&#10;commons-logging:commons-logging:1.2"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.orbit.maven.generator"/>
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.orbit.maven.generator.redirection.supplement=https://raw.githubusercontent.com/eclipse-orbit/orbit-simrel/main/maven-osgi/tp/other/MavenSupplement.target-&gt;local:${resource_loc:/org.eclipse.orbit.simrel/maven-osgi/tp/other/MavenSupplement.target}"/>
 </launchConfiguration>
diff --git a/report/maven-osgi/m2e/REPORT.md b/report/maven-osgi/m2e/REPORT.md
@@ -41,3 +41,5 @@
     - [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.eclipse.lemminx](https://repo.eclipse.org/content/repositories/lemminx-releases/org/eclipse/lemminx/)
+    - [org.eclipse.lemminx](https://repo.eclipse.org/content/repositories/lemminx-releases/org/eclipse/lemminx/org.eclipse.lemminx/) **[0.29.0](https://repo.eclipse.org/content/repositories/lemminx-releases/org/eclipse/lemminx/org.eclipse.lemminx/0.29.0)** - *uber*
diff --git a/report/maven-osgi/m2e/original.target b/report/maven-osgi/m2e/original.target
@@ -33,7 +33,7 @@
 			<unit id="org.eclipse.wst.xsd.core" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/wildwebdeveloper/releases/1.3.9/"/>
+			<repository location="https://download.eclipse.org/wildwebdeveloper/releases/1.3.10/"/>
 			<repository location="https://download.eclipse.org/tm4e/releases/0.14.0/"/>
 			<repository location="https://download.eclipse.org/lsp4e/releases/0.26.7/"/>
 			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.23.1/"/>
@@ -116,6 +116,23 @@
 				</dependency>
 			</dependencies>
 		</location>
+		<location includeDependencyDepth="none" includeDependencyScopes="compile" label="LemMinX" includeSource="false" missingManifest="error" type="Maven">
+			<dependencies>
+				<dependency>
+					<groupId>org.eclipse.lemminx</groupId>
+					<artifactId>org.eclipse.lemminx</artifactId>
+					<version>0.29.0</version>
+					<type>jar</type>
+					<classifier>uber</classifier>
+				</dependency>
+			</dependencies>
+			<repositories>
+				<repository>
+					<id>lemminx-releases</id>
+					<url>https://repo.eclipse.org/content/repositories/lemminx-releases/</url>
+				</repository>
+			</repositories>
+		</location>
 		<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="Maven-archetype Common" missingManifest="generate" type="Maven">
 			<dependencies>
 				<dependency>

diff --git a/report/maven-osgi/m2e/updated.target b/report/maven-osgi/m2e/updated.target
@@ -33,7 +33,7 @@
 			<unit id="org.eclipse.wst.xsd.core" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/wildwebdeveloper/releases/1.3.9/"/>
+			<repository location="https://download.eclipse.org/wildwebdeveloper/releases/1.3.10/"/>
 			<repository location="https://download.eclipse.org/tm4e/releases/0.14.0/"/>
 			<repository location="https://download.eclipse.org/lsp4e/releases/0.26.7/"/>
 			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.23.1/"/>
@@ -116,6 +116,23 @@
 				</dependency>
 			</dependencies>
 		</location>
+		<location includeDependencyDepth="none" includeDependencyScopes="compile" label="LemMinX" includeSource="false" missingManifest="error" type="Maven">
+			<dependencies>
+				<dependency>
+					<groupId>org.eclipse.lemminx</groupId>
+					<artifactId>org.eclipse.lemminx</artifactId>
+					<version>0.29.0</version>
+					<type>jar</type>
+					<classifier>uber</classifier>
+				</dependency>
+			</dependencies>
+			<repositories>
+				<repository>
+					<id>lemminx-releases</id>
+					<url>https://repo.eclipse.org/content/repositories/lemminx-releases/</url>
+				</repository>
+			</repositories>
+		</location>
 		<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="Maven-archetype Common" missingManifest="generate" type="Maven">
 			<dependencies>
 				<dependency>