diff --git a/0007-update-java-target.patch b/0007-update-java-target.patch index 37f3b6d..b2a8b56 100644 --- a/0007-update-java-target.patch +++ b/0007-update-java-target.patch @@ -11,82 +11,3 @@ src ---- a/pom.xml -+++ b/pom.xml -@@ -52,12 +52,10 @@ - --> - - UTF-8 -- ${env.JAVA5_HOME} -- ${env.JAVA6_HOME} -- ${java5.home}/lib/rt.jar -- ${java6.home}/lib/rt.jar -- ${bootclasspath.java5} -- ${bootclasspath.java6} -+ ${env.JAVA_HOME} -+ ${java.home}/lib/rt.jar -+ ${bootclasspath.java} -+ ${bootclasspath.java} - - - -@@ -145,8 +143,8 @@ - - default-compile - -- 1.5 -- 1.5 -+ 1.8 -+ 1.8 - - -Xlint - -Xlint:-serial -@@ -158,8 +156,8 @@ - - default-testCompile - -- 1.6 -- 1.6 -+ 1.8 -+ 1.8 - - -Xlint - -Xlint:-serial -@@ -235,15 +233,15 @@ - - default-compile - -- 1.5 -- 1.5 -+ 1.8 -+ 1.8 - - - - default-testCompile - -- 1.6 -- 1.6 -+ 1.8 -+ 1.8 - - - -@@ -290,6 +288,7 @@ - - 2.9.1 - -+ 8 - true - - -@@ -311,6 +310,9 @@ - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 -+ -+ 8 -+ - - - diff --git a/0008-unconst-cyclicdfa-gcc-14.patch b/0008-unconst-cyclicdfa-gcc-14.patch new file mode 100644 index 0000000..1a78820 --- /dev/null +++ b/0008-unconst-cyclicdfa-gcc-14.patch @@ -0,0 +1,29 @@ +--- a/runtime/Cpp/include/antlr3cyclicdfa.hpp.orig 2024-02-01 14:13:33.243312124 +0200 ++++ b/runtime/Cpp/include/antlr3cyclicdfa.hpp 2024-02-01 14:12:28.493542243 +0200 +@@ -61,18 +61,18 @@ + /// Decision number that a particular static structure + /// represents. + /// ++ ANTLR_INT32 m_decisionNumber; +- const ANTLR_INT32 m_decisionNumber; + + /// What this decision represents + /// + const ANTLR_UCHAR* m_description; ++ const ANTLR_INT32* m_eot; ++ const ANTLR_INT32* m_eof; ++ const ANTLR_INT32* m_min; ++ const ANTLR_INT32* m_max; ++ const ANTLR_INT32* m_accept; ++ const ANTLR_INT32* m_special; ++ const ANTLR_INT32* const * m_transition; +- const ANTLR_INT32* const m_eot; +- const ANTLR_INT32* const m_eof; +- const ANTLR_INT32* const m_min; +- const ANTLR_INT32* const m_max; +- const ANTLR_INT32* const m_accept; +- const ANTLR_INT32* const m_special; +- const ANTLR_INT32* const *const m_transition; + + public: + CyclicDFA( ANTLR_INT32 decisionNumber diff --git a/README.md b/README.md new file mode 100644 index 0000000..d572416 --- /dev/null +++ b/README.md @@ -0,0 +1,6 @@ +# antlr3 + +[ANTLR version 3](https://www.antlr3.org/), ANother Tool for Language +Recognition, is a language tool that provides a framework for constructing +recognizers, interpreters, compilers, and translators from grammatical +descriptions containing actions in a variety of target languages. diff --git a/antlr3.spec b/antlr3.spec index a938e3b..6837262 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -1,155 +1,209 @@ -%global antlr_version 3.5.2 +%global antlr_version 3.5.3 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 -%global baserelease 31 +%global baserelease 16 -Summary: ANother Tool for Language Recognition -Name: antlr3 -Epoch: 1 -Version: %{antlr_version} -Release: %{baserelease}%{?dist} -License: BSD -URL: http://www.antlr3.org/ +# This package needs itself to build. Use this to bootstrap on a new system. +%bcond bootstrap 0 -Source0: https://github.com/antlr/antlr3/archive/%{antlr_version}/%{name}-%{antlr_version}.tar.gz -#Source2: http://www.antlr3.org/download/Python/antlr_python_runtime-%{python_runtime_version}.tar.gz -Source3: http://www.antlr3.org/download/antlr-javascript-runtime-%{javascript_runtime_version}.zip +# Component versions to use when bootstrapping +%global antlr2_version 2.7.7 +%global bootstrap_version 3.5 +%global ST4ver1 4.0.7 +%global ST4ver2 4.0.8 +%global stringtemplatever 3.2.1 -Patch0: 0001-java8-fix.patch +%global giturl https://github.com/antlr/antlr3 + +Summary: ANother Tool for Language Recognition +Name: antlr3 +Epoch: 1 +Version: %{antlr_version} +Release: %{baserelease}%{?dist} +License: BSD-3-Clause +URL: https://www.antlr3.org/ +VCS: git:%{giturl}.git + +Source0: %{giturl}/archive/%{antlr_version}/%{name}-%{antlr_version}.tar.gz +Source1: http://www.antlr3.org/download/antlr-javascript-runtime-%{javascript_runtime_version}.zip +%if %{with bootstrap} +# Get prebuilt versions to bootstrap +Source2: https://repo1.maven.org/maven2/org/antlr/ST4/%{ST4ver1}/ST4-%{ST4ver1}.jar +Source3: https://repo1.maven.org/maven2/org/antlr/ST4/%{ST4ver1}/ST4-%{ST4ver1}.pom +Source4: https://repo1.maven.org/maven2/org/antlr/ST4/%{ST4ver2}/ST4-%{ST4ver2}.jar +Source5: https://repo1.maven.org/maven2/org/antlr/ST4/%{ST4ver2}/ST4-%{ST4ver2}.pom +Source6: https://repo1.maven.org/maven2/org/antlr/antlr/%{bootstrap_version}/antlr-%{bootstrap_version}.jar +Source7: https://repo1.maven.org/maven2/org/antlr/antlr/%{bootstrap_version}/antlr-%{bootstrap_version}.pom +Source8: https://repo1.maven.org/maven2/org/antlr/antlr-master/%{bootstrap_version}/antlr-master-%{bootstrap_version}.pom +Source9: https://repo1.maven.org/maven2/org/antlr/antlr-runtime/%{bootstrap_version}/antlr-runtime-%{bootstrap_version}.jar +Source10: https://repo1.maven.org/maven2/org/antlr/antlr-runtime/%{bootstrap_version}/antlr-runtime-%{bootstrap_version}.pom +Source11: https://repo1.maven.org/maven2/org/antlr/antlr3-maven-plugin/%{bootstrap_version}/antlr3-maven-plugin-%{bootstrap_version}.jar +Source12: https://repo1.maven.org/maven2/org/antlr/antlr3-maven-plugin/%{bootstrap_version}/antlr3-maven-plugin-%{bootstrap_version}.pom +Source13: https://repo1.maven.org/maven2/org/antlr/stringtemplate/%{stringtemplatever}/stringtemplate-%{stringtemplatever}.jar +Source14: https://repo1.maven.org/maven2/org/antlr/stringtemplate/%{stringtemplatever}/stringtemplate-%{stringtemplatever}.pom +Source15: https://repo1.maven.org/maven2/antlr/antlr/%{antlr2_version}/antlr-%{antlr2_version}.jar +Source16: https://repo1.maven.org/maven2/antlr/antlr/%{antlr2_version}/antlr-%{antlr2_version}.pom +%endif + +Patch: 0001-java8-fix.patch # Generate OSGi metadata -Patch1: osgi-manifest.patch +Patch: osgi-manifest.patch # Increase the default conversion timeout to avoid build failures when complex # grammars are processed on slow architectures. Patch from Debian. -Patch2: 0002-conversion-timeout.patch +Patch: 0002-conversion-timeout.patch # Fix problems with the C template. Patch from Debian. -Patch3: 0003-fix-c-template.patch +Patch: 0003-fix-c-template.patch # Keep Token.EOF_TOKEN for backwards compatibility. Patch from Debian. -Patch4: 0004-eof-token.patch +Patch: 0004-eof-token.patch # Make parsers reproducible. Patch from Debian. -Patch5: 0005-reproducible-parsers.patch +Patch: 0005-reproducible-parsers.patch # Fix for C++20 -Patch6: 0006-antlr3memory.hpp-fix-for-C-20-mode.patch +Patch: 0006-antlr3memory.hpp-fix-for-C-20-mode.patch # Compile for target 1.8 to fix build with JDK 11 -Patch7: 0007-update-java-target.patch +Patch: 0007-update-java-target.patch +# Fix source for tighter gcc template checks +Patch: 0008-unconst-cyclicdfa-gcc-14.patch -BuildRequires: ant +BuildRequires: ant-openjdk25 BuildRequires: make -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 +%if %{without bootstrap} BuildRequires: mvn(org.antlr:antlr) BuildRequires: mvn(org.antlr:antlr3-maven-plugin) BuildRequires: mvn(org.antlr:ST4) BuildRequires: mvn(org.antlr:stringtemplate) +%endif BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven:maven-project) -BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-api) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) +BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-api) -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool -# we don't build it now -Obsoletes: antlr3-gunit < 3.2-15 +# https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs +ExclusiveArch: %{java_arches} %description -ANother Tool for Language Recognition, is a language tool -that provides a framework for constructing recognizers, -interpreters, compilers, and translators from grammatical -descriptions containing actions in a variety of target languages. +ANother Tool for Language Recognition, is a language tool that provides a +framework for constructing recognizers, interpreters, compilers, and +translators from grammatical descriptions containing actions in a variety of +target languages. -%package tool -Summary: ANother Tool for Language Recognition -BuildArch: noarch -Provides: %{name} = %{epoch}:%{antlr_version}-%{release} -Obsoletes: %{name} < %{epoch}:%{antlr_version}-%{release} -Requires: %{name}-java = %{epoch}:%{antlr_version}-%{release} +%package tool +Summary: ANother Tool for Language Recognition +License: BSD-3-Clause AND Apache-2.0 +BuildArch: noarch +Provides: %{name} = %{epoch}:%{antlr_version}-%{release} +Obsoletes: %{name} < %{epoch}:%{antlr_version}-%{release} +Requires: %{name}-java = %{epoch}:%{antlr_version}-%{release} # Explicit requires for javapackages-tools since antlr3-script # uses /usr/share/java-utils/java-functions -Requires: javapackages-tools +Requires: javapackages-tools +%description tool +ANother Tool for Language Recognition, is a language tool that provides a +framework for constructing recognizers, interpreters, compilers, and +translators from grammatical descriptions containing actions in a variety of +target languages. -Provides: ant-antlr3 = %{epoch}:%{antlr_version}-%{release} -Obsoletes: ant-antlr3 < %{epoch}:%{antlr_version}-%{release} +%package java +Summary: Java run-time support for ANTLR-generated parsers +BuildArch: noarch -%description tool -ANother Tool for Language Recognition, is a language tool -that provides a framework for constructing recognizers, -interpreters, compilers, and translators from grammatical -descriptions containing actions in a variety of target languages. - -%package java -Summary: Java run-time support for ANTLR-generated parsers -BuildArch: noarch - -%description java +%description java Java run-time support for ANTLR-generated parsers -%package javadoc +%package javadoc Summary: API documentation for %{name} BuildArch: noarch -%description javadoc +%description javadoc %{summary}. -%package javascript -Summary: Javascript run-time support for ANTLR-generated parsers -Version: %{javascript_runtime_version} -Release: %{antlr_version}.%{baserelease}%{?dist} -BuildArch: noarch +%package javascript +Summary: Javascript run-time support for ANTLR-generated parsers +Version: %{javascript_runtime_version} +Release: %{antlr_version}.%{baserelease}%{?dist} +BuildArch: noarch -%description javascript +%description javascript Javascript run-time support for ANTLR-generated parsers -%package C -Summary: C run-time support for ANTLR-generated parsers -Version: %{c_runtime_version} -Release: %{antlr_version}.%{baserelease}%{?dist} +%package C +Summary: C run-time support for ANTLR-generated parsers +Version: %{c_runtime_version} +Release: %{antlr_version}.%{baserelease}%{?dist} -%description C +%description C C run-time support for ANTLR-generated parsers -%package C-devel -Summary: Header files for the C bindings for ANTLR-generated parsers -Requires: %{name}-C = %{epoch}:%{c_runtime_version}-%{release} -Version: %{c_runtime_version} -Release: %{antlr_version}.%{baserelease}%{?dist} +%package C-devel +Summary: Header files for the C bindings for ANTLR-generated parsers +Requires: %{name}-C = %{epoch}:%{c_runtime_version}-%{release} +Version: %{c_runtime_version} +Release: %{antlr_version}.%{baserelease}%{?dist} -%description C-devel +%description C-devel Header files for the C bindings for ANTLR-generated parsers %package C-docs +# The content is BSD-3-Clause. Other licenses are due to files installed by +# doxygen. +# api/bc_s.png: GPL-1.0-or-later +# api/bdwn.png: GPL-1.0-or-later +# api/closed.png: GPL-1.0-or-later +# api/doc.png: GPL-1.0-or-later +# api/doxygen.css: GPL-1.0-or-later +# api/doxygen.svg: GPL-1.0-or-later +# api/dynsections.js: MIT +# api/folderclosed.png: GPL-1.0-or-later +# api/folderopen.png: GPL-1.0-or-later +# api/jquery.js: MIT +# api/menu.js: MIT +# api/menudata.js: MIT +# api/nav_f.png: GPL-1.0-or-later +# api/nav_g.png: GPL-1.0-or-later +# api/nav_h.png: GPL-1.0-or-later +# api/navtree.css: GPL-1.0-or-later +# api/navtree.js: MIT +# api/open.png: GPL-1.0-or-later +# api/resize.js: MIT +# api/splitbar.png: GPL-1.0-or-later +# api/sync_off.png: GPL-1.0-or-later +# api/sync_on.png: GPL-1.0-or-later +# api/tab_a.png: GPL-1.0-or-later +# api/tab_b.png: GPL-1.0-or-later +# api/tab_h.png: GPL-1.0-or-later +# api/tab_s.png: GPL-1.0-or-later +# api/tabs.css: GPL-1.0-or-later +License: BSD-3-Clause AND GPL-1.0-or-later AND MIT Summary: API documentation for the C run-time support for ANTLR-generated parsers BuildArch: noarch BuildRequires: graphviz BuildRequires: doxygen Requires: %{name}-C = %{epoch}:%{c_runtime_version}-%{release} -Version: %{c_runtime_version} -Release: %{antlr_version}.%{baserelease}%{?dist} +Version: %{c_runtime_version} +Release: %{antlr_version}.%{baserelease}%{?dist} %description C-docs -This package contains doxygen documentation with instruction -on how to use the C target in ANTLR and complete API description of the -C run-time support for ANTLR-generated parsers. +This package contains doxygen documentation with instruction on how to use the +C target in ANTLR and complete API description of the C run-time support for +ANTLR-generated parsers. -%package C++-devel +%package C++-devel Summary: C++ runtime support for ANTLR-generated parsers -%description C++-devel +%description C++-devel C++ runtime support for ANTLR-generated parsers. %prep -%setup -q -n antlr3-%{antlr_version} -a 3 +%autosetup -p1 -n antlr3-%{antlr_version} -a 1 + +%conf sed -i "s,\${buildNumber},`cat %{_sysconfdir}/fedora-release` `date`," tool/src/main/resources/org/antlr/antlr.properties -%patch0 -p1 -%patch1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 # remove pre-built artifacts find -type f -a -name *.jar -delete @@ -163,7 +217,8 @@ find -type f -a -name *.class -delete %pom_disable_module antlr-complete %pom_remove_plugin :maven-source-plugin -%pom_remove_plugin :maven-javadoc-plugin +%pom_remove_plugin :maven-enforcer-plugin +%pom_remove_plugin -r :maven-javadoc-plugin # workarounds bug in filtering (Mark invalid) %pom_xpath_remove pom:resource/pom:filtering @@ -175,6 +230,31 @@ find -type f -a -name *.class -delete %mvn_file :antlr-runtime antlr3-runtime %mvn_file :antlr-maven-plugin antlr3-maven-plugin +%if %{with bootstrap} +# Make the bootstrap JARs and POMs available +mkdir -p .m2/org/antlr/ST4/%{ST4ver1} +cp -p %{SOURCE2} %{SOURCE3} .m2/org/antlr/ST4/%{ST4ver1} +mkdir -p .m2/org/antlr/ST4/%{ST4ver2} +cp -p %{SOURCE4} %{SOURCE5} .m2/org/antlr/ST4/%{ST4ver2} +mkdir -p .m2/org/antlr/antlr/%{bootstrap_version} +cp -p %{SOURCE6} %{SOURCE7} .m2/org/antlr/antlr/%{bootstrap_version} +mkdir -p .m2/org/antlr/antlr-master/%{bootstrap_version} +cp -p %{SOURCE8} .m2/org/antlr/antlr-master/%{bootstrap_version} +mkdir -p .m2/org/antlr/antlr-runtime/%{bootstrap_version} +cp -p %{SOURCE9} %{SOURCE10} .m2/org/antlr/antlr-runtime/%{bootstrap_version} +mkdir -p .m2/org/antlr/antlr3-maven-plugin/%{bootstrap_version} +cp -p %{SOURCE11} %{SOURCE12} .m2/org/antlr/antlr3-maven-plugin/%{bootstrap_version} +mkdir -p .m2/org/antlr/stringtemplate/%{stringtemplatever} +cp -p %{SOURCE13} %{SOURCE14} .m2/org/antlr/stringtemplate/%{stringtemplatever} +mkdir -p .m2/antlr/antlr/%{antlr2_version} +cp -p %{SOURCE15} %{SOURCE16} .m2/antlr/antlr/%{antlr2_version} + +# We don't need the parent POM +%pom_remove_parent .m2/org/antlr/ST4/%{ST4ver1}/ST4-%{ST4ver1}.pom +%pom_remove_parent .m2/org/antlr/ST4/%{ST4ver2}/ST4-%{ST4ver2}.pom +%pom_remove_parent .m2/org/antlr/antlr-master/%{bootstrap_version}/antlr-master-%{bootstrap_version}.pom +%endif + %build %mvn_build -f @@ -188,7 +268,7 @@ autoreconf -i %{nil} %endif -sed -i "s#CFLAGS = .*#CFLAGS = $RPM_OPT_FLAGS#" Makefile +sed -i 's#CFLAGS = .*#CFLAGS = %{build_cflags}#' Makefile %make_build doxygen -u # update doxygen configuration file doxygen # build doxygen documentation @@ -255,16 +335,17 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %{_libdir}/libantlr3c.so %files C-devel -%{_mandir}/man3/* -%{_includedir}/*.h +%{_mandir}/man3/ANTLR3* +%{_mandir}/man3/antlr3* +%{_includedir}/antlr3*.h %files C-docs %doc runtime/C/api %files C++-devel %doc tool/LICENSE.txt -%{_includedir}/*.hpp -%{_includedir}/*.inl +%{_includedir}/antlr3*.hpp +%{_includedir}/antlr3*.inl %files java -f .mfiles-java %doc tool/LICENSE.txt @@ -277,6 +358,75 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 1:3.5.3-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Tue Sep 23 2025 Jerry James - 1:3.5.3-15 +- Remove build dependency on maven-enforcer-plugin + +* Tue Jul 29 2025 jiri vanek - 1:3.5.3-14 +- Rebuilt for java-25-openjdk as preffered jdk + +* Wed Jul 23 2025 Fedora Release Engineering - 1:3.5.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Thu Jan 16 2025 Fedora Release Engineering - 1:3.5.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Mon Jan 13 2025 Jerry James - 1:3.5.3-11 +- Clarify license of the tool subpackage +- Move configuration actions to %%conf + +* Wed Jul 17 2024 Fedora Release Engineering - 1:3.5.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 1:3.5.3-10 +- Rebuilt for java-21-openjdk as system jdk + +* Thu Feb 1 2024 Avi Kivity - 1:3.5.3-9 +- Remove const specifiers in templates that are now flagged by gcc 14. + +* Mon Jan 22 2024 Fedora Release Engineering - 1:3.5.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1:3.5.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 1:3.5.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sun Jun 11 2023 Jerry James - 1:3.5.3-5 +- Remove unneeded maven 2 dependency + +* Wed Jan 18 2023 Fedora Release Engineering - 1:3.5.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Aug 11 2022 Jerry James - 1:3.5.3-3 +- Convert License tag to SPDX + +* Wed Jul 20 2022 Fedora Release Engineering - 1:3.5.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jul 19 2022 Jerry James - 1:3.5.3-2 +- Remove i686 support (https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs) + +* Sun Apr 10 2022 Jerry James - 1:3.5.3-1 +- Version 3.5.3 +- Drop ancient obsoletes +- Minor spec file cleanups + +* Sat Feb 05 2022 Jiri Vanek - 1:3.5.2-35 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 1:3.5.2-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 1:3.5.2-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Mar 12 2021 Jerry James - 1:3.5.2-32 +- Add bootstrap conditional (bz 1847093) + * Tue Jan 26 2021 Fedora Release Engineering - 1:3.5.2-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/osgi-manifest.patch b/osgi-manifest.patch index 9c68224..ff9bceb 100644 --- a/osgi-manifest.patch +++ b/osgi-manifest.patch @@ -1,25 +1,38 @@ ---- runtime/Java/pom.xml.orig 2015-11-24 22:48:17.908747868 +0000 -+++ runtime/Java/pom.xml 2015-11-24 22:48:37.201489113 +0000 -@@ -64,4 +64,22 @@ - - - -+ -+ -+ -+ org.apache.felixmaven-bundle-plugin -+ bundle-manifestprocess-classesmanifest -+ -+ ${project.build.directory}/osgi -+ org.antlr.runtime!org.antlr.stringtemplate,* -+ -+ -+ -+ org.apache.maven.pluginsmaven-jar-plugin -+ -+ ${project.build.directory}/osgi/MANIFEST.MF -+ -+ -+ -+ +--- a/runtime/Java/pom.xml 2022-04-10 17:09:47.418531841 -0600 ++++ b/runtime/Java/pom.xml 2022-04-10 17:16:58.890381092 -0600 +@@ -81,6 +81,35 @@ + + + ++ ++ org.apache.felix ++ maven-bundle-plugin ++ ++ ++ bundle-manifest ++ process-classes ++ ++ manifest ++ ++ ++ ++ ++ ${project.build.directory}/osgi ++ ++ org.antlr.runtime ++ !org.antlr.stringtemplate,* ++ ++ ++ ++ ++ org.apache.maven.plugins ++ maven-jar-plugin ++ ++ ++ ${project.build.directory}/osgi/MANIFEST.MF ++ ++ ++ + + diff --git a/sources b/sources index 22cdbe2..b2ec866 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (antlr3-3.5.2.tar.gz) = 796150c569320793614b9cab45f507e9e22947314c38eb8f8601823cd0e6fe1ac08f4433c7600d511bf822e46f5e8a21d193633192ae68f1bb64b8354eec250e +SHA512 (antlr3-3.5.3.tar.gz) = c565e1ade7a62bb127df707015afded9a9cea54cbf5488730a327671c57e8718f93f76c4fa28edd856810cb9c7ccbcb27b53a7c8f7e3efc8169e64cfcc535a4c SHA512 (antlr-javascript-runtime-3.1.zip) = 4bc7129d3eb1d864c05d91bf33d02f0fa03362ddb1b750157be04e5279891272d34b3fb18b421631b74dfafa48723e080b213a9acb993c6f17cec4c9e94f10ed