This is an automated email from the ASF dual-hosted git repository.
fhanik pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new caed319 Fixes OSGI bundling error
caed319 is described below
commit caed3194b48ccbbac0572417b0e60807683a8690
Author: Filip Hanik <fha...@pivotal.io>
AuthorDate: Tue Jun 23 11:53:08 2020 -0700
Fixes OSGI bundling error
add-osgi:
[echo] add-osgi
/development/pivotal/cloudfoundry/spring-projects/graal/tomcat/output/build/lib/annotations-api.jar
true
[bnd] 1 ERRORS
[bnd] Invalid value for Bundle-Version,
${version_cleanup;9.0.0-native-image-dev} does not match
[0-9]{1,9}(\.[0-9]{1,9}(\.[0-9]{1,9}(\.[0-9A-Za-z_-]+)?)?)?
[bnd]
/development/pivotal/cloudfoundry/spring-projects/graal/tomcat/res/bnd/annotations-api.jar.tmp.bnd:
bnd failed
[bnd] at
aQute.bnd.ant.BndTask.executeBackwardCompatible(BndTask.java:240)
[bnd] at aQute.bnd.ant.BndTask.execute(BndTask.java:119)
[bnd] at
org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
[bnd] at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
Source)
[bnd] at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
[bnd] at java.lang.reflect.Method.invoke(Method.java:498)
[bnd] at
org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
[bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
[bnd] at org.apache.tools.ant.Target.execute(Target.java:449)
[bnd] at
org.apache.tools.ant.Target.performTasks(Target.java:470)
[bnd] at
org.apache.tools.ant.Project.executeSortedTargets(Project.java:1391)
[bnd] at
org.apache.tools.ant.helper.SingleCheckExecutor.executeTargets(SingleCheckExecutor.java:36)
[bnd] at
org.apache.tools.ant.Project.executeTargets(Project.java:1254)
[bnd] at
org.apache.tools.ant.taskdefs.Ant.execute(Ant.java:437)
[bnd] at
org.apache.tools.ant.taskdefs.CallTarget.execute(CallTarget.java:106)
[bnd] at
org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
[bnd] at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
Source)
[bnd] at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
[bnd] at java.lang.reflect.Method.invoke(Method.java:498)
[bnd] at
org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
[bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
[bnd] at java.util.Vector.forEach(Vector.java:1249)
[bnd] at
org.apache.tools.ant.taskdefs.Sequential.execute(Sequential.java:67)
[bnd] at
org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
[bnd] at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
Source)
[bnd] at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
[bnd] at java.lang.reflect.Method.invoke(Method.java:498)
[bnd] at
org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
[bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
[bnd] at
org.apache.tools.ant.taskdefs.MacroInstance.execute(MacroInstance.java:391)
[bnd] at
org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
[bnd] at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
Source)
[bnd] at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
[bnd] at java.lang.reflect.Method.invoke(Method.java:498)
[bnd] at
org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
[bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
[bnd] at org.apache.tools.ant.Target.execute(Target.java:449)
[bnd] at
org.apache.tools.ant.Target.performTasks(Target.java:470)
[bnd] at
org.apache.tools.ant.Project.executeSortedTargets(Project.java:1391)
[bnd] at
org.apache.tools.ant.Project.executeTarget(Project.java:1364)
[bnd] at
org.apache.tools.ant.helper.DefaultExecutor.executeTargets(DefaultExecutor.java:41)
[bnd] at
org.apache.tools.ant.Project.executeTargets(Project.java:1254)
[bnd] at org.apache.tools.ant.Main.runBuild(Main.java:830)
[bnd] at org.apache.tools.ant.Main.startAnt(Main.java:223)
[bnd] at
org.apache.tools.ant.launch.Launcher.run(Launcher.java:284)
[bnd] at
org.apache.tools.ant.launch.Launcher.main(Launcher.java:101)
BUILD FAILED
/development/pivotal/cloudfoundry/spring-projects/graal/tomcat/build.xml:760:
The following error occurred while executing this line:
/development/pivotal/cloudfoundry/spring-projects/graal/tomcat/build.xml:3346:
The following error occurred while executing this line:
/development/pivotal/cloudfoundry/spring-projects/graal/tomcat/build.xml:3366:
Failed to build jar file:
---
res/bnd/build-defaults.bnd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/res/bnd/build-defaults.bnd b/res/bnd/build-defaults.bnd
index cdefb9c..a099b49 100644
--- a/res/bnd/build-defaults.bnd
+++ b/res/bnd/build-defaults.bnd
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-Bundle-Version: ${version_cleanup;${version}}
+Bundle-Version: ${version}
Specification-Title: Apache Tomcat
Specification-Version: ${version.major.minor}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
