Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/metainf-services/, dev-java/metainf-services/files/
Date: Sat, 29 May 2021 16:11:25
Message-Id: 1622304677.647fa7911389f192d351feec4e651c6895266335.fordfrog@gentoo
1 commit: 647fa7911389f192d351feec4e651c6895266335
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 29 16:10:44 2021 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Sat May 29 16:11:17 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=647fa791
7
8 dev-java/metainf-services: removed obsolete 1.6
9
10 Package-Manager: Portage-3.0.19, Repoman-3.0.3
11 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
12
13 dev-java/metainf-services/Manifest | 1 -
14 .../files/metainf-services-1.6-build.xml | 192 ---------------------
15 .../metainf-services/metainf-services-1.6.ebuild | 27 ---
16 3 files changed, 220 deletions(-)
17
18 diff --git a/dev-java/metainf-services/Manifest b/dev-java/metainf-services/Manifest
19 index 4393862d1a3..6788adb48ee 100644
20 --- a/dev-java/metainf-services/Manifest
21 +++ b/dev-java/metainf-services/Manifest
22 @@ -1,2 +1 @@
23 -DIST metainf-services-1.6.tar.gz 5282 BLAKE2B e5d0231bb90e72200780eef67a631146d10281f4a29e61a09c0cabd5a00205974f351445a7cfd88146862c3d84ad5340e2e259f469374a3d4942a4c33744b5fb SHA512 237f37b8eaa384dfd7df6d0a31fa7e5d086c6923c5eb2435317701402b14ba472839d0e49b9ce9da25c265d6e128679f7d637d41439756242ae591d3b15e1108
24 DIST metainf-services-1.7.tar.gz 5301 BLAKE2B dabb2229e5123b535c81f5796d92365eba609e696c0c513666c105534eb1430420b71768436ed53078dc72a2261ed821010ffea0098a4a65f81c5f1c2c118a6e SHA512 d6162e94ff5efcf61e56e0c1e1d22c51854fa7f98662b6ac0cc7d230b7f11b0d3c7c7238b640693d8d6f5e6e6f508bf5116ea22e73487d00145cd5a87853b3df
25
26 diff --git a/dev-java/metainf-services/files/metainf-services-1.6-build.xml b/dev-java/metainf-services/files/metainf-services-1.6-build.xml
27 deleted file mode 100644
28 index 98e53f439d2..00000000000
29 --- a/dev-java/metainf-services/files/metainf-services-1.6-build.xml
30 +++ /dev/null
31 @@ -1,192 +0,0 @@
32 -<?xml version="1.0" encoding="UTF-8"?>
33 -
34 -<!-- ====================================================================== -->
35 -<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
36 -<!-- ====================================================================== -->
37 -
38 -<!-- ====================================================================== -->
39 -<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
40 -<!-- ====================================================================== -->
41 -<!-- -->
42 -<!-- Any modifications will be overwritten. -->
43 -<!-- -->
44 -<!-- Generated by Maven Ant Plugin on 7/13/13 1:12 PM -->
45 -<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
46 -<!-- -->
47 -<!-- ====================================================================== -->
48 -
49 -<project name="metainf-services-from-maven" default="package" basedir=".">
50 -
51 - <!-- ====================================================================== -->
52 - <!-- Build environment properties -->
53 - <!-- ====================================================================== -->
54 -
55 - <property file="${user.home}/.m2/maven.properties"/>
56 - <property file="maven-build.properties"/>
57 -
58 - <property name="maven.build.finalName" value="metainf-services-1.6"/>
59 - <property name="maven.build.dir" value="target"/>
60 - <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
61 - <property name="maven.build.srcDir.0" value="src/main/java"/>
62 - <property name="maven.build.resourceDir.0" value="src/main/resources"/>
63 - <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
64 - <property name="maven.build.testDir.0" value="src/test/java"/>
65 - <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
66 - <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
67 - <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
68 -
69 - <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
70 - <property name="maven.settings.offline" value="false"/>
71 - <property name="maven.settings.interactiveMode" value="true"/>
72 -
73 - <!-- ====================================================================== -->
74 - <!-- Defining classpaths -->
75 - <!-- ====================================================================== -->
76 -
77 - <path id="build.classpath"/>
78 - <path id="build.test.classpath"/>
79 -
80 - <!-- ====================================================================== -->
81 - <!-- Cleaning up target -->
82 - <!-- ====================================================================== -->
83 -
84 - <target name="clean" description="Clean the output directory">
85 - <delete dir="${maven.build.dir}"/>
86 - </target>
87 -
88 - <!-- ====================================================================== -->
89 - <!-- Compilation target -->
90 - <!-- ====================================================================== -->
91 -
92 - <target name="compile" depends="get-deps" description="Compile the code">
93 - <mkdir dir="${maven.build.outputDir}"/>
94 - <javac destdir="${maven.build.outputDir}"
95 - nowarn="false"
96 - debug="true"
97 - optimize="false"
98 - deprecation="true"
99 - target="1.6"
100 - verbose="false"
101 - fork="false"
102 - source="1.6">
103 - <src>
104 - <pathelement location="${maven.build.srcDir.0}"/>
105 - </src>
106 - <classpath refid="build.classpath"/>
107 - </javac>
108 - <copy todir="${maven.build.outputDir}">
109 - <fileset dir="${maven.build.resourceDir.0}"/>
110 - </copy>
111 - </target>
112 -
113 - <!-- ====================================================================== -->
114 - <!-- Test-compilation target -->
115 - <!-- ====================================================================== -->
116 -
117 - <target name="compile-tests"
118 - depends="compile"
119 - description="Compile the test code"
120 - unless="maven.test.skip">
121 - <mkdir dir="${maven.build.testOutputDir}"/>
122 - </target>
123 -
124 - <!-- ====================================================================== -->
125 - <!-- Run all tests -->
126 - <!-- ====================================================================== -->
127 -
128 - <target name="test"
129 - depends="compile-tests, junit-missing"
130 - unless="junit.skipped"
131 - description="Run the test cases"/>
132 -
133 - <target name="test-junit-present">
134 - <available classname="junit.framework.Test" property="junit.present"/>
135 - </target>
136 -
137 - <target name="test-junit-status"
138 - depends="test-junit-present">
139 - <condition property="junit.missing">
140 - <and>
141 - <isfalse value="${junit.present}"/>
142 - <isfalse value="${maven.test.skip}"/>
143 - </and>
144 - </condition>
145 - <condition property="junit.skipped">
146 - <or>
147 - <isfalse value="${junit.present}"/>
148 - <istrue value="${maven.test.skip}"/>
149 - </or>
150 - </condition>
151 - </target>
152 -
153 - <target name="junit-missing"
154 - depends="test-junit-status"
155 - if="junit.missing">
156 - <echo>=================================== WARNING ===================================</echo>
157 - <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
158 - <echo>===============================================================================</echo>
159 - </target>
160 -
161 - <!-- ====================================================================== -->
162 - <!-- Javadoc target -->
163 - <!-- ====================================================================== -->
164 -
165 - <target name="javadoc" description="Generates the Javadoc of the application">
166 - <javadoc sourcepath="${maven.build.srcDir.0}"
167 - packagenames="*"
168 - destdir="${maven.reporting.outputDirectory}/apidocs"
169 - access="protected"
170 - old="false"
171 - verbose="false"
172 - version="true"
173 - use="true"
174 - author="true"
175 - splitindex="false"
176 - nodeprecated="false"
177 - nodeprecatedlist="false"
178 - notree="false"
179 - noindex="false"
180 - nohelp="false"
181 - nonavbar="false"
182 - serialwarn="false"
183 - charset="ISO-8859-1"
184 - linksource="false"
185 - breakiterator="false"/>
186 - </target>
187 -
188 - <!-- ====================================================================== -->
189 - <!-- Package target -->
190 - <!-- ====================================================================== -->
191 -
192 - <target name="package" depends="compile,test" description="Package the application">
193 - <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
194 - compress="true"
195 - index="false"
196 - basedir="${maven.build.outputDir}"
197 - excludes="**/package.html"/>
198 - </target>
199 -
200 - <!-- ====================================================================== -->
201 - <!-- A dummy target for the package named after the type it creates -->
202 - <!-- ====================================================================== -->
203 -
204 - <target name="jar" depends="package" description="Builds the jar for the application"/>
205 -
206 - <!-- ====================================================================== -->
207 - <!-- Download dependencies target -->
208 - <!-- ====================================================================== -->
209 -
210 - <target name="test-offline">
211 - <condition property="maven.mode.offline">
212 - <equals arg1="${maven.settings.offline}" arg2="true"/>
213 - </condition>
214 - </target>
215 -
216 - <target name="get-deps"
217 - depends="test-offline"
218 - description="Download all dependencies"
219 - unless="maven.mode.offline">
220 - <mkdir dir="${maven.repo.local}"/>
221 - </target>
222 -
223 -</project>
224
225 diff --git a/dev-java/metainf-services/metainf-services-1.6.ebuild b/dev-java/metainf-services/metainf-services-1.6.ebuild
226 deleted file mode 100644
227 index bb7d68cfe2f..00000000000
228 --- a/dev-java/metainf-services/metainf-services-1.6.ebuild
229 +++ /dev/null
230 @@ -1,27 +0,0 @@
231 -# Copyright 1999-2021 Gentoo Authors
232 -# Distributed under the terms of the GNU General Public License v2
233 -
234 -EAPI=5
235 -
236 -inherit java-pkg-2 java-ant-2
237 -
238 -DESCRIPTION="Generates META-INF/services files automatically"
239 -HOMEPAGE="http://metainf-services.kohsuke.org/"
240 -SRC_URI="https://github.com/kohsuke/${PN}/archive/${P}.tar.gz"
241 -
242 -LICENSE="MIT"
243 -SLOT="0"
244 -KEYWORDS="amd64 x86"
245 -
246 -RDEPEND=">=virtual/jre-1.6"
247 -DEPEND=">=virtual/jdk-1.6"
248 -
249 -S="${WORKDIR}/${PN}-${P}"
250 -
251 -java_prepare() {
252 - cp "${FILESDIR}"/${P}-build.xml build.xml || die
253 -}
254 -
255 -src_install() {
256 - java-pkg_newjar target/${P}.jar
257 -}