Accepting request 1037089 from Java:packages

OBS-URL: https://build.opensuse.org/request/show/1037089
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/antlr3?expand=0&rev=4
This commit is contained in:
Dominique Leuenberger 2022-11-21 14:30:32 +00:00 committed by Git OBS Bridge
commit 3bad67d1ef
7 changed files with 48 additions and 36 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a66d12fd5ca052fdd2b0a64b70d0c58db40e6dec72c3f4497934203090d92808
size 6927136

3
3.5.3.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a0892bcf164573d539b930e57a87ea45333141863a0dd3a49e5d8c919c8a58ab
size 6752328

View File

@ -0,0 +1,25 @@
Index: runtime/Java/pom.xml
===================================================================
--- runtime/Java/pom.xml.orig
+++ runtime/Java/pom.xml
@@ -81,6 +81,20 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId><artifactId>maven-bundle-plugin</artifactId>
+ <executions><execution><id>bundle-manifest</id><phase>process-classes</phase><goals><goal>manifest</goal></goals></execution></executions>
+ <configuration>
+ <manifestLocation>${project.build.directory}/osgi</manifestLocation>
+ <instructions><Bundle-SymbolicName>org.antlr.runtime</Bundle-SymbolicName><Import-Package>!org.antlr.stringtemplate,*</Import-Package></instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId><artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive><manifestFile>${project.build.directory}/osgi/MANIFEST.MF</manifestFile></archive>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Nov 18 21:43:50 UTC 2022 - Pedro Monreal <pmonreal@suse.com>
- Update to 3.5.3:
* change source compatibility to 1.8 and enable github workflows
* Change Wiki URLs to theantlrguy.atlassian.net in README.txt
* Bazel support
* Modify patches:
- Rebase osgi-manifest.patch and rename to antlr3-osgi-manifest.patch
- Rename 0001-java8-fix.patch to antlr3-java8-fix.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 21 14:54:29 UTC 2022 - Fridrich Strba <fstrba@suse.com> Mon Mar 21 14:54:29 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@ -17,7 +17,7 @@
%global flavor @BUILD_FLAVOR@%{nil} %global flavor @BUILD_FLAVOR@%{nil}
%global antlr_version 3.5.2 %global antlr_version 3.5.3
%global c_runtime_version 3.4 %global c_runtime_version 3.4
%global javascript_runtime_version 3.1 %global javascript_runtime_version 3.1
%if "%{flavor}" == "bootstrap" %if "%{flavor}" == "bootstrap"
@ -34,12 +34,13 @@ Version: %{antlr_version}
Release: 0 Release: 0
URL: https://www.antlr3.org/ URL: https://www.antlr3.org/
Source0: https://github.com/antlr/antlr3/archive/%{antlr_version}.tar.gz Source0: https://github.com/antlr/antlr3/archive/%{antlr_version}.tar.gz
Patch0: 0001-java8-fix.patch Patch0: antlr3-java8-fix.patch
# Generate OSGi metadata # Generate OSGi metadata
Patch1: osgi-manifest.patch Patch1: antlr3-osgi-manifest.patch
Patch100: antlr3-generated_sources.patch Patch100: antlr3-generated_sources.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: maven-enforcer-plugin
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: unzip BuildRequires: unzip
BuildRequires: mvn(antlr:antlr) BuildRequires: mvn(antlr:antlr)
@ -154,11 +155,11 @@ find -type f -a -name *.class -delete
# compile for target 1.8 # compile for target 1.8
sed -i 's/jsr14/1.8/' antlr3-maven-archetype/src/main/resources/archetype-resources/pom.xml \ sed -i 's/jsr14/1.8/' antlr3-maven-archetype/src/main/resources/archetype-resources/pom.xml \
antlr3-maven-plugin/pom.xml \ antlr3-maven-plugin/pom.xml \
gunit/pom.xml \ gunit/pom.xml \
gunit-maven-plugin/pom.xml \ gunit-maven-plugin/pom.xml \
pom.xml \ pom.xml \
runtime/Java/pom.xml \ runtime/Java/pom.xml \
tool/pom.xml tool/pom.xml
# workarounds bug in filtering (Mark invalid) # workarounds bug in filtering (Mark invalid)
%pom_xpath_remove pom:resource/pom:filtering %pom_xpath_remove pom:resource/pom:filtering

View File

@ -1,25 +0,0 @@
--- 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 @@
</dependencies>
+<build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId><artifactId>maven-bundle-plugin</artifactId>
+ <executions><execution><id>bundle-manifest</id><phase>process-classes</phase><goals><goal>manifest</goal></goals></execution></executions>
+ <configuration>
+ <manifestLocation>${project.build.directory}/osgi</manifestLocation>
+ <instructions><Bundle-SymbolicName>org.antlr.runtime</Bundle-SymbolicName><Import-Package>!org.antlr.stringtemplate,*</Import-Package></instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId><artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive><manifestFile>${project.build.directory}/osgi/MANIFEST.MF</manifestFile></archive>
+ </configuration>
+ </plugin>
+ </plugins>
+</build>
</project>