Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Jakov Smolić" <jsmolic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, dev-java/felix-gogo-runtime/, dev-java/felix-gogo-runtime/files/
Date: Wed, 23 Feb 2022 09:40:46
Message-Id: 1645609208.4cf9212aa53d4bcc97d0a6e3896957fde8044515.jsmolic@gentoo
1 commit: 4cf9212aa53d4bcc97d0a6e3896957fde8044515
2 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 23 09:39:15 2022 +0000
4 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 23 09:40:08 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cf9212a
7
8 dev-java/felix-gogo-runtime: treeclean
9
10 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
11
12 dev-java/felix-gogo-runtime/Manifest | 1 -
13 .../felix-gogo-runtime-0.10.0.ebuild | 42 ---
14 .../files/felix-gogo-runtime-0.10.0-build.xml | 294 ---------------------
15 ...go-runtime-0.10.0-event-properties-to-map.patch | 22 --
16 dev-java/felix-gogo-runtime/metadata.xml | 8 -
17 profiles/package.mask | 1 -
18 6 files changed, 368 deletions(-)
19
20 diff --git a/dev-java/felix-gogo-runtime/Manifest b/dev-java/felix-gogo-runtime/Manifest
21 deleted file mode 100644
22 index 43680c468573..000000000000
23 --- a/dev-java/felix-gogo-runtime/Manifest
24 +++ /dev/null
25 @@ -1 +0,0 @@
26 -DIST org.apache.felix.gogo.runtime-0.10.0-project.tar.gz 69837 BLAKE2B 3ffd6cc308b3125ee8cd467945ca58a9fcf3125d32b23f68065fa7a9266210d186ebf3aba354f64a9d2c38a176ac7a5767e4349707a56dcbd77831eb24df928c SHA512 a71100796e400103cf9d46fcdb7bf45b5d1d180328db27900915c1771650297c9135589dc91e4c2194634b4312ea7c064b71496a7e11e9a3393bdc6eeb70e03d
27
28 diff --git a/dev-java/felix-gogo-runtime/felix-gogo-runtime-0.10.0.ebuild b/dev-java/felix-gogo-runtime/felix-gogo-runtime-0.10.0.ebuild
29 deleted file mode 100644
30 index f6a9d2f071d3..000000000000
31 --- a/dev-java/felix-gogo-runtime/felix-gogo-runtime-0.10.0.ebuild
32 +++ /dev/null
33 @@ -1,42 +0,0 @@
34 -# Copyright 1999-2015 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI="5"
38 -
39 -inherit java-pkg-2 java-ant-2 java-osgi
40 -
41 -DESCRIPTION="Felix Gogo Runtime"
42 -HOMEPAGE="http://felix.apache.org/site/apache-felix-gogo.html"
43 -LICENSE="Apache-2.0"
44 -
45 -MY_PN="org.apache.felix.gogo.runtime"
46 -MY_P="${MY_PN}-${PV}"
47 -SRC_URI="mirror://apache/felix/${MY_P}-project.tar.gz"
48 -SLOT="0"
49 -KEYWORDS="amd64"
50 -
51 -DEPEND=">=virtual/jdk-1.6
52 - dev-java/osgi-compendium:0
53 - dev-java/osgi-core-api:0"
54 -
55 -RDEPEND=">=virtual/jre-1.6"
56 -
57 -S="${WORKDIR}/${MY_P}"
58 -
59 -java_prepare() {
60 - cp "${FILESDIR}"/${P}-build.xml build.xml || die
61 -
62 - epatch "${FILESDIR}"/${P}-event-properties-to-map.patch
63 -}
64 -
65 -JAVA_ANT_REWRITE_CLASSPATH="true"
66 -
67 -src_compile() {
68 - EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only osgi-core-api osgi-core-api.jar):$(java-pkg_getjar --build-only osgi-compendium osgi-compendium.jar)"
69 -
70 - java-pkg-2_src_compile
71 -}
72 -
73 -src_install() {
74 - java-osgi_newjar "${S}"/target/${MY_P}.jar ${MY_PN} ${MY_PN} "Export-Package: ${MY_PN}"
75 -}
76
77 diff --git a/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-build.xml b/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-build.xml
78 deleted file mode 100644
79 index 4bcd4c42ad62..000000000000
80 --- a/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-build.xml
81 +++ /dev/null
82 @@ -1,294 +0,0 @@
83 -<?xml version="1.0" encoding="UTF-8"?>
84 -
85 -<!-- ====================================================================== -->
86 -<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
87 -<!-- ====================================================================== -->
88 -
89 -<!-- ====================================================================== -->
90 -<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
91 -<!-- ====================================================================== -->
92 -<!-- -->
93 -<!-- Any modifications will be overwritten. -->
94 -<!-- -->
95 -<!-- Generated by Maven Ant Plugin on 5/13/13 1:33 PM -->
96 -<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
97 -<!-- -->
98 -<!-- ====================================================================== -->
99 -
100 -<project name="org.apache.felix.gogo.runtime-from-maven" default="package" basedir=".">
101 -
102 - <!-- ====================================================================== -->
103 - <!-- Build environment properties -->
104 - <!-- ====================================================================== -->
105 -
106 - <property file="${user.home}/.m2/maven.properties"/>
107 - <property file="maven-build.properties"/>
108 -
109 - <property name="maven.build.finalName" value="org.apache.felix.gogo.runtime-0.10.0"/>
110 - <property name="maven.build.dir" value="target"/>
111 - <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
112 - <property name="maven.build.srcDir.0" value="src/main/java"/>
113 - <property name="maven.build.resourceDir.0" value="src/main/resources"/>
114 - <property name="maven.build.resourceDir.1" value="."/>
115 - <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
116 - <property name="maven.build.testDir.0" value="src/test/java"/>
117 - <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
118 - <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
119 - <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
120 -
121 - <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
122 - <property name="maven.settings.offline" value="false"/>
123 - <property name="maven.settings.interactiveMode" value="true"/>
124 -
125 - <!-- ====================================================================== -->
126 - <!-- Defining classpaths -->
127 - <!-- ====================================================================== -->
128 -
129 - <path id="build.classpath">
130 - <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"/>
131 - <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
132 - </path>
133 - <path id="build.test.classpath">
134 - <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"/>
135 - <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
136 - <pathelement location="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar"/>
137 - <pathelement location="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"/>
138 - <pathelement location="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"/>
139 - </path>
140 -
141 - <!-- ====================================================================== -->
142 - <!-- Cleaning up target -->
143 - <!-- ====================================================================== -->
144 -
145 - <target name="clean" description="Clean the output directory">
146 - <delete dir="${maven.build.dir}"/>
147 - </target>
148 -
149 - <!-- ====================================================================== -->
150 - <!-- Compilation target -->
151 - <!-- ====================================================================== -->
152 -
153 - <target name="compile" depends="get-deps" description="Compile the code">
154 - <mkdir dir="${maven.build.outputDir}"/>
155 - <javac destdir="${maven.build.outputDir}"
156 - nowarn="false"
157 - debug="true"
158 - optimize="false"
159 - deprecation="true"
160 - target="1.5"
161 - verbose="false"
162 - fork="false"
163 - source="1.5">
164 - <src>
165 - <pathelement location="${maven.build.srcDir.0}"/>
166 - </src>
167 - <classpath refid="build.classpath"/>
168 - </javac>
169 - <mkdir dir="${maven.build.outputDir}/META-INF"/>
170 - <copy todir="${maven.build.outputDir}/META-INF">
171 - <fileset dir="${maven.build.resourceDir.1}">
172 - <include name="LICENSE*"/>
173 - <include name="NOTICE*"/>
174 - </fileset>
175 - </copy>
176 - </target>
177 -
178 - <!-- ====================================================================== -->
179 - <!-- Test-compilation target -->
180 - <!-- ====================================================================== -->
181 -
182 - <target name="compile-tests"
183 - depends="compile"
184 - description="Compile the test code"
185 - unless="maven.test.skip">
186 - <mkdir dir="${maven.build.testOutputDir}"/>
187 - <javac destdir="${maven.build.testOutputDir}"
188 - nowarn="false"
189 - debug="true"
190 - optimize="false"
191 - deprecation="true"
192 - target="1.5"
193 - verbose="false"
194 - fork="false"
195 - source="1.5">
196 - <src>
197 - <pathelement location="${maven.build.testDir.0}"/>
198 - </src>
199 - <classpath>
200 - <path refid="build.test.classpath"/>
201 - <pathelement location="${maven.build.outputDir}"/>
202 - </classpath>
203 - </javac>
204 - </target>
205 -
206 - <!-- ====================================================================== -->
207 - <!-- Run all tests -->
208 - <!-- ====================================================================== -->
209 -
210 - <target name="test"
211 - depends="compile-tests, junit-missing"
212 - unless="junit.skipped"
213 - description="Run the test cases">
214 - <mkdir dir="${maven.test.reports}"/>
215 - <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
216 - <sysproperty key="basedir" value="."/>
217 - <formatter type="xml"/>
218 - <formatter type="plain" usefile="false"/>
219 - <classpath>
220 - <path refid="build.test.classpath"/>
221 - <pathelement location="${maven.build.outputDir}"/>
222 - <pathelement location="${maven.build.testOutputDir}"/>
223 - </classpath>
224 - <batchtest todir="${maven.test.reports}" unless="test">
225 - <fileset dir="${maven.build.testDir.0}">
226 - <include name="**/Test*.java"/>
227 - <include name="**/*Test.java"/>
228 - <include name="**/*TestCase.java"/>
229 - <exclude name="**/*Abstract*Test.java"/>
230 - </fileset>
231 - </batchtest>
232 - <batchtest todir="${maven.test.reports}" if="test">
233 - <fileset dir="${maven.build.testDir.0}">
234 - <include name="**/${test}.java"/>
235 - <exclude name="**/*Abstract*Test.java"/>
236 - </fileset>
237 - </batchtest>
238 - </junit>
239 - </target>
240 -
241 - <target name="test-junit-present">
242 - <available classname="junit.framework.Test" property="junit.present"/>
243 - </target>
244 -
245 - <target name="test-junit-status"
246 - depends="test-junit-present">
247 - <condition property="junit.missing">
248 - <and>
249 - <isfalse value="${junit.present}"/>
250 - <isfalse value="${maven.test.skip}"/>
251 - </and>
252 - </condition>
253 - <condition property="junit.skipped">
254 - <or>
255 - <isfalse value="${junit.present}"/>
256 - <istrue value="${maven.test.skip}"/>
257 - </or>
258 - </condition>
259 - </target>
260 -
261 - <target name="junit-missing"
262 - depends="test-junit-status"
263 - if="junit.missing">
264 - <echo>=================================== WARNING ===================================</echo>
265 - <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
266 - <echo>===============================================================================</echo>
267 - </target>
268 -
269 - <!-- ====================================================================== -->
270 - <!-- Javadoc target -->
271 - <!-- ====================================================================== -->
272 -
273 - <target name="javadoc" description="Generates the Javadoc of the application">
274 - <javadoc sourcepath="${maven.build.srcDir.0}"
275 - packagenames="*"
276 - destdir="${maven.reporting.outputDirectory}/apidocs"
277 - access="protected"
278 - old="false"
279 - verbose="false"
280 - version="true"
281 - use="true"
282 - author="true"
283 - splitindex="false"
284 - nodeprecated="false"
285 - nodeprecatedlist="false"
286 - notree="false"
287 - noindex="false"
288 - nohelp="false"
289 - nonavbar="false"
290 - serialwarn="false"
291 - charset="ISO-8859-1"
292 - linksource="false"
293 - breakiterator="false"/>
294 - </target>
295 -
296 - <!-- ====================================================================== -->
297 - <!-- Package target -->
298 - <!-- ====================================================================== -->
299 -
300 - <target name="package" depends="compile,test" description="Package the application">
301 - <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
302 - compress="true"
303 - index="false"
304 - basedir="${maven.build.outputDir}"
305 - excludes="**/package.html"/>
306 - </target>
307 -
308 - <!-- ====================================================================== -->
309 - <!-- A dummy target for the package named after the type it creates -->
310 - <!-- ====================================================================== -->
311 -
312 - <target name="jar" depends="package" description="Builds the jar for the application"/>
313 -
314 - <!-- ====================================================================== -->
315 - <!-- Download dependencies target -->
316 - <!-- ====================================================================== -->
317 -
318 - <target name="test-offline">
319 - <condition property="maven.mode.offline">
320 - <equals arg1="${maven.settings.offline}" arg2="true"/>
321 - </condition>
322 - </target>
323 -
324 - <target name="get-deps"
325 - depends="test-offline"
326 - description="Download all dependencies"
327 - unless="maven.mode.offline">
328 - <mkdir dir="${maven.repo.local}"/>
329 - <mkdir dir="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0"/>
330 - <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"
331 - dest="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"
332 - usetimestamp="false"
333 - ignoreerrors="true"/>
334 - <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"
335 - dest="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"
336 - usetimestamp="false"
337 - ignoreerrors="true"/>
338 - <mkdir dir="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0"/>
339 - <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
340 - dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
341 - usetimestamp="false"
342 - ignoreerrors="true"/>
343 - <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
344 - dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
345 - usetimestamp="false"
346 - ignoreerrors="true"/>
347 - <mkdir dir="${maven.repo.local}/junit/junit/4.5"/>
348 - <get src="http://repository.apache.org/snapshots/junit/junit/4.5/junit-4.5.jar"
349 - dest="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar"
350 - usetimestamp="false"
351 - ignoreerrors="true"/>
352 - <get src="http://repo.maven.apache.org/maven2/junit/junit/4.5/junit-4.5.jar"
353 - dest="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar"
354 - usetimestamp="false"
355 - ignoreerrors="true"/>
356 - <mkdir dir="${maven.repo.local}/org/easymock/easymock/2.4"/>
357 - <get src="http://repository.apache.org/snapshots/org/easymock/easymock/2.4/easymock-2.4.jar"
358 - dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"
359 - usetimestamp="false"
360 - ignoreerrors="true"/>
361 - <get src="http://repo.maven.apache.org/maven2/org/easymock/easymock/2.4/easymock-2.4.jar"
362 - dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"
363 - usetimestamp="false"
364 - ignoreerrors="true"/>
365 - <mkdir dir="${maven.repo.local}/org/mockito/mockito-all/1.7"/>
366 - <get src="http://repository.apache.org/snapshots/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
367 - dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
368 - usetimestamp="false"
369 - ignoreerrors="true"/>
370 - <get src="http://repo.maven.apache.org/maven2/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
371 - dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
372 - usetimestamp="false"
373 - ignoreerrors="true"/>
374 - </target>
375 -
376 -</project>
377
378 diff --git a/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-event-properties-to-map.patch b/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-event-properties-to-map.patch
379 deleted file mode 100644
380 index ae2e67cf3abe..000000000000
381 --- a/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-event-properties-to-map.patch
382 +++ /dev/null
383 @@ -1,22 +0,0 @@
384 ---- src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java 2013-05-13 13:40:57.071766332 +0200
385 -+++ src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java.2 2013-05-13 13:41:30.725096685 +0200
386 -@@ -18,7 +18,7 @@
387 - */
388 - package org.apache.felix.gogo.runtime.activator;
389 -
390 --import java.util.Properties;
391 -+import java.util.HashMap;
392 -
393 - import org.apache.felix.gogo.api.CommandSessionListener;
394 - import org.apache.felix.service.command.CommandSession;
395 -@@ -43,8 +43,8 @@
396 - public void beforeExecute(CommandSession session, CharSequence command) {
397 - EventAdmin admin = (EventAdmin) tracker.getService();
398 - if (admin != null) {
399 -- Properties props = new Properties();
400 -- props.setProperty("command", command.toString());
401 -+ HashMap<String, String> props = new HashMap<String, String>();
402 -+ props.put(new String("command"), command.toString());
403 - Event event = new Event("org/apache/felix/service/command/EXECUTING", props);
404 - admin.postEvent(event);
405 - }
406
407 diff --git a/dev-java/felix-gogo-runtime/metadata.xml b/dev-java/felix-gogo-runtime/metadata.xml
408 deleted file mode 100644
409 index 6021501589e0..000000000000
410 --- a/dev-java/felix-gogo-runtime/metadata.xml
411 +++ /dev/null
412 @@ -1,8 +0,0 @@
413 -<?xml version="1.0" encoding="UTF-8"?>
414 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
415 -<pkgmetadata>
416 -<maintainer type="project">
417 - <email>java@g.o</email>
418 - <name>Java</name>
419 -</maintainer>
420 -</pkgmetadata>
421
422 diff --git a/profiles/package.mask b/profiles/package.mask
423 index 265d10c3fff6..c85cf0571020 100644
424 --- a/profiles/package.mask
425 +++ b/profiles/package.mask
426 @@ -164,7 +164,6 @@ dev-java/jsr223
427 # Removal in 30 days.
428 dev-java/yanfs
429 dev-java/xp
430 -dev-java/felix-gogo-runtime
431
432 # Eray Aslan <eras@g.o> (2022-01-24)
433 # Mask experimental software
Report Message
Find on MARC Find on Google Groups