SLFO-pool/plexus-languages
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main plexus-languages revision d223532d64eba1fb96c2388e2f0cad98

Browse Source
This commit is contained in:
Adrian Schröter 2024-05-31 14:57:55 +02:00
parent e06eadc946
commit 0e0a61d4a2
7 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_service
View File

@ -2,7 +2,7 @@
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">https://github.com/codehaus-plexus/plexus-languages.git</param>
<param name="revision">plexus-languages-1.1.1</param>
<param name="revision">plexus-languages-1.2.0</param>
<param name="match-tag">plexus-languages-*</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">plexus-languages-(.*)</param>

10
plexus-java-build.xml
View File

@ -10,9 +10,10 @@
<property name="project.groupId" value="org.codehaus.plexus"/>
<property name="project.artifactId" value="plexus-java"/>
<property name="project.version" value="1.1.1"/>
<property name="project.version" value="1.2.0"/>
<property name="compiler.source" value="1.8"/>
<property name="compiler.release" value="8"/>
<property name="compiler.source" value="1.${compiler.release}"/>
<property name="compiler.target" value="${compiler.source}"/>
<property name="build.finalName" value="${project.artifactId}-${project.version}"/>
@ -34,16 +35,11 @@
<path id="build.classpath">
<fileset dir="../lib">
<!-- asm-6.2 qdox-2.0-M8 javax.inject-1 plexus-component-annotations-1.7.1 -->
<include name="**/*.jar"/>
</fileset>
</path>
<path id="build.test.classpath">
<fileset dir="../lib">
<!-- asm-6.2 qdox-2.0-M8 javax.inject-1 plexus-component-annotations-1.7.1
junit-4.12 hamcrest-core-1.3 mockito-core-2.18.3 byte-buddy-1.8.5
byte-buddy-agent-1.8.5 objenesis-2.6 guice-4.1.0 aopalliance-1.0
guava-19.0.jar -->
<include name="**/*.jar"/>
</fileset>
</path>

BIN
plexus-languages-1.1.1.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

BIN
plexus-languages-1.2.0.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

10
plexus-languages-atinject.patch Normal file
View File

@ -0,0 +1,10 @@
--- plexus-languages-1.1.1/plexus-java/src/main/java9/module-info.java 2024-04-10 11:00:25.596880353 +0200
+++ plexus-languages-1.1.1/plexus-java/src/main/java9/module-info.java 2024-04-10 11:00:57.827095904 +0200
@@ -20,6 +20,7 @@
{
requires com.thoughtworks.qdox;
requires org.objectweb.asm;
+ requires java.inject;
exports org.codehaus.plexus.languages.java.jpms;
exports org.codehaus.plexus.languages.java.version;

24
plexus-languages.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Mon Apr 29 11:45:22 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- The binaries are compatible with java 1.8
-------------------------------------------------------------------
Wed Apr 10 09:14:52 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream version 1.2.0
* Changes:
+ Fail on duplicate modules on the module path
+ Add java bytecode class file version detection
+ Fix badge in README
* Documentation updates
+ Fix typo module (#125) @Thihup
+ Fix scm protocol
-------------------------------------------------------------------
Wed Apr 10 09:07:44 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* plexus-languages-atinject.patch
+ Fix against multirelease version of atinject
-------------------------------------------------------------------
Sat Mar 12 07:26:31 UTC 2022 - Fridrich Strba <fstrba@suse.com>

19
plexus-languages.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package plexus-languages
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,8 +16,11 @@
#
# The automatic requires would be java-headless >= 9, but the
# binaries are java 8 compatible
%define __requires_exclude java-headless
Name: plexus-languages
Version: 1.1.1
Version: 1.2.0
Release: 0
Summary: Plexus Languages
License: Apache-2.0
@ -26,18 +29,17 @@ URL: https://github.com/codehaus-plexus/plexus-languages
Source0: %{name}-%{version}.tar.xz
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
Source100: plexus-java-build.xml
Patch0: plexus-languages-atinject.patch
BuildRequires: ant
BuildRequires: atinject
BuildRequires: fdupes
BuildRequires: java-devel >= 9
BuildRequires: javapackages-local
BuildRequires: javapackages-local >= 6
BuildRequires: objectweb-asm
BuildRequires: plexus-containers-component-annotations
BuildRequires: qdox >= 2
BuildRequires: sisu-inject
Requires: java >= 1.7
Requires: mvn(com.thoughtworks.qdox:qdox)
Requires: mvn(org.ow2.asm:asm)
Requires: java-headless >= 1.8
BuildArch: noarch
%description
@ -53,6 +55,7 @@ API documentation for %{name}.
%prep
%setup -q
%patch -P 0 -p1
cp %{SOURCE1} .
cp %{SOURCE100} plexus-java/build.xml
@ -74,9 +77,7 @@ install -dm 0755 %{buildroot}%{_javadir}/%{name}
install -pm 0644 plexus-java/target/plexus-java-%{version}.jar %{buildroot}%{_javadir}/%{name}/plexus-java.jar
# pom
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
%add_maven_depmap %{name}/%{name}.pom
install -pm 0644 plexus-java/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/plexus-java.pom
%{mvn_install_pom} plexus-java/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/plexus-java.pom
%add_maven_depmap %{name}/plexus-java.pom %{name}/plexus-java.jar
# javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/plexus-java