mirror of https://github.com/apache/ant-ivy
Compare commits
4 Commits
7331966fb4
...
31589848a7
| Author | SHA1 | Date |
|---|---|---|
twogee
|
31589848a7 | |
|
Stefan Bodewig
|
6546134471 | |
|
Stefan Bodewig
|
eb29656412 | |
|
twogee
|
aaf37db10b |
|
|
@ -0,0 +1,94 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Licensed to the Apache Software Foundation (ASF) under one
|
||||
or more contributor license agreements. See the NOTICE file
|
||||
distributed with this work for additional information
|
||||
regarding copyright ownership. The ASF licenses this file
|
||||
to you under the Apache License, Version 2.0 (the
|
||||
"License"); you may not use this file except in compliance
|
||||
with the License. You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing,
|
||||
software distributed under the License is distributed on an
|
||||
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
KIND, either express or implied. See the License for the
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 496.711 350.535" xml:space="preserve">
|
||||
<g>
|
||||
<path fill="#6E9244" d="M35.696,151.511h26.396c-4.127-3.129-9.725-7.471-9.771-11.101c-0.022-0.832-0.048-1.993-0.118-3.393
|
||||
c-3.201,1.826-15.321,4.34-22.627-2.182c-7.446-6.666-8.729-15.017-6.379-18.951c2.348-3.914,8.87-4.008,8.87-4.008l0.31-3.131
|
||||
c0,0-9.892-5.173-15.844-17.576C10.58,78.766,6.453,63.87,6.453,63.87s6.9-4.363,16.674-2.822c9.771,1.52,14.35,5.504,16.696,4.697
|
||||
C42.955,54.288,70.421,3.413,75.046-0.003C89.633,6.281,89.941,43.307,90.107,46.13s0,23.695,0,26.518
|
||||
c0,2.823,1.873,4.15,5.812,4.555c3.914,0.402,30.785-16.315,37.546-18.522c0,23.767-14.8,45.256-22.318,53.508
|
||||
c-4.625,8.398-1.162,10.011-0.096,13.947c1.066,3.938,1.114,12.547,0.498,14.185c-4.127,1.162-21.252,1.639-27.537-0.521
|
||||
c-6.284-2.158-6.546-5.621-8.441-7.021c-0.166-0.116-11.504-1.541-18.855,1.328l-0.143,6.381
|
||||
c4.222,3.892,7.377,5.455,10.673,11.007h87.496l31.145,90.27l32.921-90.27h98.548l34.893,93.332l30.978-93.332h50.709
|
||||
c0.285-12.265,9.867-10.744,12.713-10.814c-0.616-0.948-3.297-2.895-2.396-5.812c0.902-2.896,7.807-1.99,7.807-1.99
|
||||
s2.252-5.361,3.318-7.875c1.065-2.516,5.146-3.107,5.146-3.107s-2.467,9.894,1.897,9.894h20.658c0,0-7.565,7.279-10.77,7.853
|
||||
c-3.203,0.592-9.321,3.793-7.424,4.957c1.896,1.162,6.995,4.602,6.115,6.901c-0.875,2.302-13.256-2.303-13.256,0
|
||||
c0,2.302-7.521,5.857-7.142,2.562c0.381-3.297,0.854-9.652-0.643-10.887c-1.518-1.232-5.717-0.9-9.105-0.476
|
||||
c-3.395,0.428-3.203,8.801-3.203,8.801h6.595l-2.086,4.979c17.574,0.688,20.16,18.287,20.896,16.604
|
||||
c0.829-1.922,3.745-8.159,4.34-8.871c2.205-2.682,7.944-2.348,9.319-1.327c2.351,1.729,0.403,5.432,5.054,8.157
|
||||
c7.756,3.345,13.446,2.351,14.941,4.625c-1.33,3.513-7.398,11.338-10.98,12.854c-2.634,1.115-2.896,5.289-2.421,6.264
|
||||
c5.029,10.578,3.728,17.764,2.277,27.418c-12.263-9.416-20.873-20.113-24.81-18.691c-3.938,1.425-18.572,2.517-18.572,2.517
|
||||
s3.818,13.26,2.088,19.662c-1.092,4.031,3.843,3.133,3.843,3.133s4.293-5.075,7.067-6.549c2.774-1.445,6.119-2.396,10.603-1.279
|
||||
c4.556,1.564,5.339,9.062,9.679,11.572c3.201,1.875,17.268,17.125,17.268,17.125s-6.809,3.396-12.567,3.654
|
||||
c-5.767,0.26-14.043-0.05-16.648,0.688c-3.727,1.045-7.662,29.224-14.066,35.271c-7.825-9.252-9.227-21.8-12.002-33.373
|
||||
c-0.877-3.629-3.58-4.554-4.885-4.554s-4.625,2.017-10.674,4.175c-6.05,2.184-14.655-0.9-14.655-0.9l16.48-21.25
|
||||
c0,0-1.562-9.084-0.427-12.073c5.435-5.193,12.855-1.232,12.855-1.232l6.664,6.166c0.235-7.445-2.42-16.246-7.709-20.895
|
||||
c-3.486-3.062-8.562-4.06-11.621-4.365l-46.203,109.813c-21.156,50.281-76.16,40.584-110.955,35.316l-4.149-35.222
|
||||
c13.211,1.685,51.657,8.871,58.487-17.194l-53.53-109.814l-56.282,109.814h-51.775l-61.479-122.08v35.77
|
||||
c0.973,0.068,1.729,0.427,2.373,0.996c1.562,1.425,8.633,6.5,10.032,8.541c3.746,5.404,9.153,4.72,8.323,9.513
|
||||
c-2.11,3.059-5.336,1.09-6.735,0.473c-1.423-0.617-6.119-9.012-7.685-10.271c-1.281-1.021-4.033-4.08-6.285-4.315v18.762
|
||||
c9.535,9.629,22.438,22.318,24.002,23.576c2.515,2.039,5.953,4.078,8.468,4.695c2.515,0.616,5.812,0.78,6.734,1.729
|
||||
c3.297,3.297,2.135,5.979-1.423,6.285c-1.874,0.168-12.404-1.803-14.111-4.008c-1.729-2.205-12.713-14.519-12.713-14.519
|
||||
s-7.067-7.992-9.56-9.416c-0.451-0.26-0.949-0.688-1.424-1.229v55.479H49.293c0.783,1.611,2.586,5.691,1.092,5.834
|
||||
c-1.875,0.166-2.987-0.096-4.08-2.275c-0.332-0.664-0.545-2.02-0.664-3.534h-9.844v-57.47h-0.022
|
||||
c-0.401,0.117-0.782,0.234-1.14,0.354c-2.939,0.098-5.812-0.31-7.377-0.166c-3.485,0.354-15.393,12.664-17.338,16.152
|
||||
c-0.783,1.424-3.771,4.243-5.336,4.694c-1.563,0.476-5.502-2.516-4.388-4.555c1.091-2.041,5.953-4.695,7.065-5.027
|
||||
c1.093-0.311,2.517-4.391,4.246-5.952c1.732-1.564,11.147-7.853,12.713-9.728c1.565-1.873,10.199-1.729,10.199-1.729l1.424,0.143
|
||||
v-25.76c-0.567-0.641-0.974-1.09-1.092-1.281c-1.256-1.969-2.752,1.188-2.275,5.338c0.477,4.148-1.092,11.717-1.092,13.424
|
||||
c0,2.207,5.74,5.408,2.351,7.425c-0.688,0.403-3.394-0.213-5.573-4.293c-2.207-4.078,0-19.306,0-19.306s0.426-8.729,4.056-9.037
|
||||
c1.686-0.145,2.87-0.145,3.651-0.071v-45.443L35.696,151.511z M440.661,160.026l-14.588,34.627
|
||||
c8.684,3.133,15.516,10.293,15.562,10.271c1.803-0.83,2.584-1.303,2.584-3.486c0-2.205,1.092-5.904,1.756-9.463
|
||||
c1.094-5.787-2.467-4.77-3.152-9.463c-0.996-6.879,9.152-10.01,13.066-7.496c1.021,0.641,0.569,2.205,1.686,2.846
|
||||
c1.092,0.617,2.869,0.332,3.227-0.236c1.826-3.084,0.095-3.368-1.896-7.045c-3.561-11.241-14.896-10.08-18.268-10.555H440.661
|
||||
L440.661,160.026z"/>
|
||||
<path fill="#FFFFFF" d="M35.72,196.954c0.854,0.07,1.21,0.166,1.21,0.166s1.257,0.168,4.08,3.914
|
||||
c2.823,3.771,4.08,7.142,6.595,9.894c2.516,2.752,4.936,1.021,4.936,1.021s-2.111-11.599-0.546-16.011
|
||||
c1.563-4.387,3.104-5.336,4.672-6.594c1.565-1.258,3.89-3.272,1.687-5.312c-2.207-2.041-3.867-11.388-0.877-17.979
|
||||
c2.986-6.594,9.013-8.42,9.013-8.42s2.134-0.736-1.21-3.629c-0.783-0.688-1.945-1.541-3.229-2.539h5.146l2.704,3.203
|
||||
c8.752-4.224,17.883-0.382,17.883,8.254c1.257,0.946,7.638,3.012,10.604,3.012h15.367c1.566,0,15.371-7.971,17.41-8.113
|
||||
c2.039-0.166,2.11-3.483,9.652-2.465s7.447-0.262,8.539,1.826c1.091,2.108-1.803,4.223-3.534,4.86
|
||||
c-1.729,0.617-11.385-0.354-12.95-0.354c-1.562,0-13.188,5.764-16.861,7.565c-3.678,1.804-11.527,2.441-14.353,0.947
|
||||
c-2.821-1.494-8.491-2.606-8.491-2.606l-4.908-1.4c0,0-0.236,10.604-2.109,15.019c-1.897,4.387-10.127,10.268-12.619,10.268
|
||||
c-2.514,0-1.352,1.994-1.352,1.994c2.537,5.027,1.091,11.787-5.076,16.887c2.585,7.162,14.16-12.76,17.102-12.76
|
||||
c2.656,0,3.201,1.209,2.774,4.031l-9.914,10.861c0,0-3.416,2.274-6.119,2.11c-0.783-0.047-1.494,1.162-1.257,2.894
|
||||
c0.309,2.205-0.402,4.012,0.854,5.102c1.26,1.092,6.168-1.613,7.758-3.486c1.563-1.873,9.105-8.041,13.377-10.127
|
||||
c2.515-1.209,4.34-1.684,5.738-1.588l0.024,4.935c-0.521-0.049-1.044,0.049-1.494,0.381c-2.349,1.73-8.847,6.521-8.847,7.445
|
||||
c0,0.354,2.963,2.351,10.314,10.91v7.143c-2.135-2.371-4.389-6.832-6.167-7.854c-2.183-1.259-4.315-5.336-4.935-6.736
|
||||
c-0.615-1.422-2.987-0.615-3.463,1.094c-0.477,1.73-1.162,3.463-2.608,5.765c-3.463,5.551-9.983,6.047-10.958,7.021
|
||||
c-1.091,1.092,2.585,3.676,3.534,4.791c0.949,1.092,8.373,3.062,10.91,12.478c2.515,9.416,0.022,16.555-1.375,20.325
|
||||
c-3.062,8.185-8.608,8.896-18.287,4.058c-1.115-0.57-9.132-9.466-10.839-13.402c-1.73-3.912,0.166-16.697,0.166-16.697
|
||||
s2.986-4.076,1.562-4.242c-0.592-0.072-0.143-1.826-1.707-1.115c-2.16,0.996-6.355,4.554-6.355,4.554l-0.236,32.473
|
||||
c0,0,1.873-0.098,2.205,2.396c0.309,2.468,0,9.961,0,9.961l0.332,0.664H45.54c-0.285-3.51-0.119-8.041-0.119-8.041
|
||||
s-1.896-3.2-3.012-4.604c-1.092-1.422-1.066-30.287,0.498-34.533c1.564-4.244,2.656-5.881,4.861-5.574
|
||||
c2.206,0.312,5.502-0.166,5.502-0.166s0.783-10.741-0.477-11.383c-1.256-0.617-6.428,2.822-7.209,4.078
|
||||
c-0.711,1.139-6.07,1.66-9.916,2.775l0.072-5.767l3.415,0.332c0,0,3.676-2.514,5.574-3.629c1.874-1.09,7.21-0.897,7.685-2.562
|
||||
c0.477-1.662,0.545-6.998,0.166-7.827c-0.4-0.83-2.562,1.305-4.08-0.119l-12.784-11.953v-7.809h0.023h-0.021L35.72,196.954
|
||||
L35.72,196.954z M52.18,136.687c-0.31-6.664-1.021-17.739-1.139-18.643c-0.166-1.091-6.593-8.941-6.593-11.123
|
||||
c0-2.207-1.709-6.429,2.537-5.17c4.246,1.258,6.595,5.502,6.595,5.502s3.534,5.952,3.534,7.52c0,1.043-0.236,11.884-0.403,19.164
|
||||
l-4.529,2.775v-0.025H52.18z"/>
|
||||
</g>
|
||||
<g>
|
||||
<path fill="#6E9244" stroke="#6E9243" stroke-miterlimit="10" d="M389.699,316.176h18.773v4.547h-6.68v14.555h-5.508v-14.555
|
||||
h-6.586V316.176z M410.652,316.176h8.367l2.648,10.43l2.789-10.43h8.109v19.102h-5.18v-13.5l-3.586,13.5h-4.336l-3.539-13.5v13.5
|
||||
h-5.273V316.176z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 8.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.6 KiB |
|
|
@ -655,7 +655,7 @@
|
|||
</generate-tagsdoc>
|
||||
</target>
|
||||
|
||||
<target name="define-cyclonedx-components">
|
||||
<target name="define-cyclonedx-components" if="jdk9+">
|
||||
<ivy:cachepath organisation="org.apache.ant"
|
||||
module="ant-cyclonedx"
|
||||
revision="${ant-cyclonedx.version}"
|
||||
|
|
@ -744,7 +744,7 @@
|
|||
</cdx:externalreferenceset>
|
||||
</target>
|
||||
|
||||
<target name="jar-sbom" depends="define-cyclonedx-components,jar">
|
||||
<target name="jar-sbom" depends="define-cyclonedx-components,jar" if="jdk9+">
|
||||
<cdx:componentbom
|
||||
bomName="ivy-${build.version}.cdx"
|
||||
outputdirectory="${artifacts.build.dir}/jars"
|
||||
|
|
@ -937,7 +937,9 @@
|
|||
</cdx:componentbom>
|
||||
</target>
|
||||
|
||||
<target name="prepare-distribution-sboms" depends="define-cyclonedx-components">
|
||||
<target name="prepare-distribution-sboms"
|
||||
depends="define-cyclonedx-components"
|
||||
if="jdk9+">
|
||||
<macrodef name="create-tarball-bom">
|
||||
<attribute name="binsrc"/>
|
||||
<attribute name="binarysource"/>
|
||||
|
|
@ -1010,12 +1012,14 @@
|
|||
</target>
|
||||
|
||||
<target name="src-tarball-sboms"
|
||||
depends="snapshot-src,prepare-distribution-sboms">
|
||||
depends="snapshot-src,prepare-distribution-sboms"
|
||||
if="jdk9+">
|
||||
<create-tarball-boms binsrc="src" binarysource="Source Distribution"/>
|
||||
</target>
|
||||
|
||||
<target name="bin-tarball-sboms"
|
||||
depends="snapshot-bin,prepare-distribution-sboms">
|
||||
depends="snapshot-bin,prepare-distribution-sboms"
|
||||
if="jdk9+">
|
||||
<create-tarball-boms binsrc="bin"
|
||||
binarysource="Binary Distribution">
|
||||
<component>
|
||||
|
|
|
|||
|
|
@ -24,6 +24,10 @@
|
|||
|
||||
<property name="final.name" value="ivy.jar"/>
|
||||
|
||||
<condition property="jdk9+">
|
||||
<javaversion atleast="9"/>
|
||||
</condition>
|
||||
|
||||
<target name="init-ivy-user-home" unless="ivy.use.local.home">
|
||||
<condition property="ivy.home" value="${env.IVY_HOME}">
|
||||
<isset property="env.IVY_HOME"/>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,94 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Licensed to the Apache Software Foundation (ASF) under one
|
||||
or more contributor license agreements. See the NOTICE file
|
||||
distributed with this work for additional information
|
||||
regarding copyright ownership. The ASF licenses this file
|
||||
to you under the Apache License, Version 2.0 (the
|
||||
"License"); you may not use this file except in compliance
|
||||
with the License. You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing,
|
||||
software distributed under the License is distributed on an
|
||||
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
KIND, either express or implied. See the License for the
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 496.711 350.535" xml:space="preserve">
|
||||
<g>
|
||||
<path fill="#6E9244" d="M35.696,151.511h26.396c-4.127-3.129-9.725-7.471-9.771-11.101c-0.022-0.832-0.048-1.993-0.118-3.393
|
||||
c-3.201,1.826-15.321,4.34-22.627-2.182c-7.446-6.666-8.729-15.017-6.379-18.951c2.348-3.914,8.87-4.008,8.87-4.008l0.31-3.131
|
||||
c0,0-9.892-5.173-15.844-17.576C10.58,78.766,6.453,63.87,6.453,63.87s6.9-4.363,16.674-2.822c9.771,1.52,14.35,5.504,16.696,4.697
|
||||
C42.955,54.288,70.421,3.413,75.046-0.003C89.633,6.281,89.941,43.307,90.107,46.13s0,23.695,0,26.518
|
||||
c0,2.823,1.873,4.15,5.812,4.555c3.914,0.402,30.785-16.315,37.546-18.522c0,23.767-14.8,45.256-22.318,53.508
|
||||
c-4.625,8.398-1.162,10.011-0.096,13.947c1.066,3.938,1.114,12.547,0.498,14.185c-4.127,1.162-21.252,1.639-27.537-0.521
|
||||
c-6.284-2.158-6.546-5.621-8.441-7.021c-0.166-0.116-11.504-1.541-18.855,1.328l-0.143,6.381
|
||||
c4.222,3.892,7.377,5.455,10.673,11.007h87.496l31.145,90.27l32.921-90.27h98.548l34.893,93.332l30.978-93.332h50.709
|
||||
c0.285-12.265,9.867-10.744,12.713-10.814c-0.616-0.948-3.297-2.895-2.396-5.812c0.902-2.896,7.807-1.99,7.807-1.99
|
||||
s2.252-5.361,3.318-7.875c1.065-2.516,5.146-3.107,5.146-3.107s-2.467,9.894,1.897,9.894h20.658c0,0-7.565,7.279-10.77,7.853
|
||||
c-3.203,0.592-9.321,3.793-7.424,4.957c1.896,1.162,6.995,4.602,6.115,6.901c-0.875,2.302-13.256-2.303-13.256,0
|
||||
c0,2.302-7.521,5.857-7.142,2.562c0.381-3.297,0.854-9.652-0.643-10.887c-1.518-1.232-5.717-0.9-9.105-0.476
|
||||
c-3.395,0.428-3.203,8.801-3.203,8.801h6.595l-2.086,4.979c17.574,0.688,20.16,18.287,20.896,16.604
|
||||
c0.829-1.922,3.745-8.159,4.34-8.871c2.205-2.682,7.944-2.348,9.319-1.327c2.351,1.729,0.403,5.432,5.054,8.157
|
||||
c7.756,3.345,13.446,2.351,14.941,4.625c-1.33,3.513-7.398,11.338-10.98,12.854c-2.634,1.115-2.896,5.289-2.421,6.264
|
||||
c5.029,10.578,3.728,17.764,2.277,27.418c-12.263-9.416-20.873-20.113-24.81-18.691c-3.938,1.425-18.572,2.517-18.572,2.517
|
||||
s3.818,13.26,2.088,19.662c-1.092,4.031,3.843,3.133,3.843,3.133s4.293-5.075,7.067-6.549c2.774-1.445,6.119-2.396,10.603-1.279
|
||||
c4.556,1.564,5.339,9.062,9.679,11.572c3.201,1.875,17.268,17.125,17.268,17.125s-6.809,3.396-12.567,3.654
|
||||
c-5.767,0.26-14.043-0.05-16.648,0.688c-3.727,1.045-7.662,29.224-14.066,35.271c-7.825-9.252-9.227-21.8-12.002-33.373
|
||||
c-0.877-3.629-3.58-4.554-4.885-4.554s-4.625,2.017-10.674,4.175c-6.05,2.184-14.655-0.9-14.655-0.9l16.48-21.25
|
||||
c0,0-1.562-9.084-0.427-12.073c5.435-5.193,12.855-1.232,12.855-1.232l6.664,6.166c0.235-7.445-2.42-16.246-7.709-20.895
|
||||
c-3.486-3.062-8.562-4.06-11.621-4.365l-46.203,109.813c-21.156,50.281-76.16,40.584-110.955,35.316l-4.149-35.222
|
||||
c13.211,1.685,51.657,8.871,58.487-17.194l-53.53-109.814l-56.282,109.814h-51.775l-61.479-122.08v35.77
|
||||
c0.973,0.068,1.729,0.427,2.373,0.996c1.562,1.425,8.633,6.5,10.032,8.541c3.746,5.404,9.153,4.72,8.323,9.513
|
||||
c-2.11,3.059-5.336,1.09-6.735,0.473c-1.423-0.617-6.119-9.012-7.685-10.271c-1.281-1.021-4.033-4.08-6.285-4.315v18.762
|
||||
c9.535,9.629,22.438,22.318,24.002,23.576c2.515,2.039,5.953,4.078,8.468,4.695c2.515,0.616,5.812,0.78,6.734,1.729
|
||||
c3.297,3.297,2.135,5.979-1.423,6.285c-1.874,0.168-12.404-1.803-14.111-4.008c-1.729-2.205-12.713-14.519-12.713-14.519
|
||||
s-7.067-7.992-9.56-9.416c-0.451-0.26-0.949-0.688-1.424-1.229v55.479H49.293c0.783,1.611,2.586,5.691,1.092,5.834
|
||||
c-1.875,0.166-2.987-0.096-4.08-2.275c-0.332-0.664-0.545-2.02-0.664-3.534h-9.844v-57.47h-0.022
|
||||
c-0.401,0.117-0.782,0.234-1.14,0.354c-2.939,0.098-5.812-0.31-7.377-0.166c-3.485,0.354-15.393,12.664-17.338,16.152
|
||||
c-0.783,1.424-3.771,4.243-5.336,4.694c-1.563,0.476-5.502-2.516-4.388-4.555c1.091-2.041,5.953-4.695,7.065-5.027
|
||||
c1.093-0.311,2.517-4.391,4.246-5.952c1.732-1.564,11.147-7.853,12.713-9.728c1.565-1.873,10.199-1.729,10.199-1.729l1.424,0.143
|
||||
v-25.76c-0.567-0.641-0.974-1.09-1.092-1.281c-1.256-1.969-2.752,1.188-2.275,5.338c0.477,4.148-1.092,11.717-1.092,13.424
|
||||
c0,2.207,5.74,5.408,2.351,7.425c-0.688,0.403-3.394-0.213-5.573-4.293c-2.207-4.078,0-19.306,0-19.306s0.426-8.729,4.056-9.037
|
||||
c1.686-0.145,2.87-0.145,3.651-0.071v-45.443L35.696,151.511z M440.661,160.026l-14.588,34.627
|
||||
c8.684,3.133,15.516,10.293,15.562,10.271c1.803-0.83,2.584-1.303,2.584-3.486c0-2.205,1.092-5.904,1.756-9.463
|
||||
c1.094-5.787-2.467-4.77-3.152-9.463c-0.996-6.879,9.152-10.01,13.066-7.496c1.021,0.641,0.569,2.205,1.686,2.846
|
||||
c1.092,0.617,2.869,0.332,3.227-0.236c1.826-3.084,0.095-3.368-1.896-7.045c-3.561-11.241-14.896-10.08-18.268-10.555H440.661
|
||||
L440.661,160.026z"/>
|
||||
<path fill="#FFFFFF" d="M35.72,196.954c0.854,0.07,1.21,0.166,1.21,0.166s1.257,0.168,4.08,3.914
|
||||
c2.823,3.771,4.08,7.142,6.595,9.894c2.516,2.752,4.936,1.021,4.936,1.021s-2.111-11.599-0.546-16.011
|
||||
c1.563-4.387,3.104-5.336,4.672-6.594c1.565-1.258,3.89-3.272,1.687-5.312c-2.207-2.041-3.867-11.388-0.877-17.979
|
||||
c2.986-6.594,9.013-8.42,9.013-8.42s2.134-0.736-1.21-3.629c-0.783-0.688-1.945-1.541-3.229-2.539h5.146l2.704,3.203
|
||||
c8.752-4.224,17.883-0.382,17.883,8.254c1.257,0.946,7.638,3.012,10.604,3.012h15.367c1.566,0,15.371-7.971,17.41-8.113
|
||||
c2.039-0.166,2.11-3.483,9.652-2.465s7.447-0.262,8.539,1.826c1.091,2.108-1.803,4.223-3.534,4.86
|
||||
c-1.729,0.617-11.385-0.354-12.95-0.354c-1.562,0-13.188,5.764-16.861,7.565c-3.678,1.804-11.527,2.441-14.353,0.947
|
||||
c-2.821-1.494-8.491-2.606-8.491-2.606l-4.908-1.4c0,0-0.236,10.604-2.109,15.019c-1.897,4.387-10.127,10.268-12.619,10.268
|
||||
c-2.514,0-1.352,1.994-1.352,1.994c2.537,5.027,1.091,11.787-5.076,16.887c2.585,7.162,14.16-12.76,17.102-12.76
|
||||
c2.656,0,3.201,1.209,2.774,4.031l-9.914,10.861c0,0-3.416,2.274-6.119,2.11c-0.783-0.047-1.494,1.162-1.257,2.894
|
||||
c0.309,2.205-0.402,4.012,0.854,5.102c1.26,1.092,6.168-1.613,7.758-3.486c1.563-1.873,9.105-8.041,13.377-10.127
|
||||
c2.515-1.209,4.34-1.684,5.738-1.588l0.024,4.935c-0.521-0.049-1.044,0.049-1.494,0.381c-2.349,1.73-8.847,6.521-8.847,7.445
|
||||
c0,0.354,2.963,2.351,10.314,10.91v7.143c-2.135-2.371-4.389-6.832-6.167-7.854c-2.183-1.259-4.315-5.336-4.935-6.736
|
||||
c-0.615-1.422-2.987-0.615-3.463,1.094c-0.477,1.73-1.162,3.463-2.608,5.765c-3.463,5.551-9.983,6.047-10.958,7.021
|
||||
c-1.091,1.092,2.585,3.676,3.534,4.791c0.949,1.092,8.373,3.062,10.91,12.478c2.515,9.416,0.022,16.555-1.375,20.325
|
||||
c-3.062,8.185-8.608,8.896-18.287,4.058c-1.115-0.57-9.132-9.466-10.839-13.402c-1.73-3.912,0.166-16.697,0.166-16.697
|
||||
s2.986-4.076,1.562-4.242c-0.592-0.072-0.143-1.826-1.707-1.115c-2.16,0.996-6.355,4.554-6.355,4.554l-0.236,32.473
|
||||
c0,0,1.873-0.098,2.205,2.396c0.309,2.468,0,9.961,0,9.961l0.332,0.664H45.54c-0.285-3.51-0.119-8.041-0.119-8.041
|
||||
s-1.896-3.2-3.012-4.604c-1.092-1.422-1.066-30.287,0.498-34.533c1.564-4.244,2.656-5.881,4.861-5.574
|
||||
c2.206,0.312,5.502-0.166,5.502-0.166s0.783-10.741-0.477-11.383c-1.256-0.617-6.428,2.822-7.209,4.078
|
||||
c-0.711,1.139-6.07,1.66-9.916,2.775l0.072-5.767l3.415,0.332c0,0,3.676-2.514,5.574-3.629c1.874-1.09,7.21-0.897,7.685-2.562
|
||||
c0.477-1.662,0.545-6.998,0.166-7.827c-0.4-0.83-2.562,1.305-4.08-0.119l-12.784-11.953v-7.809h0.023h-0.021L35.72,196.954
|
||||
L35.72,196.954z M52.18,136.687c-0.31-6.664-1.021-17.739-1.139-18.643c-0.166-1.091-6.593-8.941-6.593-11.123
|
||||
c0-2.207-1.709-6.429,2.537-5.17c4.246,1.258,6.595,5.502,6.595,5.502s3.534,5.952,3.534,7.52c0,1.043-0.236,11.884-0.403,19.164
|
||||
l-4.529,2.775v-0.025H52.18z"/>
|
||||
</g>
|
||||
<g>
|
||||
<path fill="#6E9244" stroke="#6E9243" stroke-miterlimit="10" d="M389.699,316.176h18.773v4.547h-6.68v14.555h-5.508v-14.555
|
||||
h-6.586V316.176z M410.652,316.176h8.367l2.648,10.43l2.789-10.43h8.109v19.102h-5.18v-13.5l-3.586,13.5h-4.336l-3.539-13.5v13.5
|
||||
h-5.273V316.176z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 8.4 KiB |
2
ivy.xml
2
ivy.xml
|
|
@ -52,7 +52,7 @@
|
|||
conf="default,pack200->default,optional">
|
||||
<exclude org="com.github.luben"/>
|
||||
<exclude org="org.brotli"/>
|
||||
<exclude org="org.tikaani"/>
|
||||
<exclude org="org.tukaani"/>
|
||||
</dependency>
|
||||
<dependency org="org.apache.commons" name="commons-vfs2" rev="${commons-vfs2.version}" conf="default,vfs"/>
|
||||
<dependency org="oro" name="oro" rev="${oro.version}" conf="default,oro"/>
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 8.9 KiB |
|
|
@ -27,10 +27,7 @@ div#logo {
|
|||
padding-bottom: 10px;
|
||||
background: white;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#logo img {
|
||||
border: 0;
|
||||
width: 142px;
|
||||
}
|
||||
|
||||
div#date {
|
||||
|
|
@ -39,10 +36,8 @@ div#date {
|
|||
padding-bottom: 40px;
|
||||
}
|
||||
|
||||
|
||||
h1 {
|
||||
margin-bottom: 2px;
|
||||
|
||||
border-color: #7A9437;
|
||||
border-style: solid;
|
||||
border-width: 0 0 3px 0;
|
||||
|
|
@ -82,11 +77,6 @@ span#organisation {
|
|||
text-decoration: none;
|
||||
}
|
||||
|
||||
/*
|
||||
background: #ABAD85 #CED4BD
|
||||
background: #DEE4CD
|
||||
*/
|
||||
|
||||
#confmenu a.active {
|
||||
color: #7A9437;
|
||||
background: #DEE4CD;
|
||||
|
|
@ -125,7 +115,7 @@ background: #DEE4CD
|
|||
}
|
||||
|
||||
#content a:hover {
|
||||
background: #898B5E;
|
||||
background: #898B5E;
|
||||
}
|
||||
|
||||
h2 {
|
||||
|
|
@ -167,16 +157,18 @@ span.resolved {
|
|||
font-size: small;
|
||||
}
|
||||
|
||||
#content table {
|
||||
#content table {
|
||||
border-collapse: collapse;
|
||||
width: 90%;
|
||||
margin: auto;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
#content thead {
|
||||
background-color: #CED4BD;
|
||||
border: 1px solid #7A9437;
|
||||
}
|
||||
|
||||
#content tbody {
|
||||
border-collapse: collapse;
|
||||
background-color: #FFFFFF;
|
||||
|
|
@ -268,3 +260,10 @@ td.title:first-letter {
|
|||
color: #7A9437;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
/* Firefox seems to need this */
|
||||
|
||||
svg.icon {
|
||||
heigth: 1rem;
|
||||
width: 1rem;
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -17,6 +17,12 @@
|
|||
*/
|
||||
package org.apache.ivy.util;
|
||||
|
||||
import javax.swing.JCheckBox;
|
||||
import javax.swing.JLabel;
|
||||
import javax.swing.JOptionPane;
|
||||
import javax.swing.JPanel;
|
||||
import javax.swing.JPasswordField;
|
||||
import javax.swing.JTextField;
|
||||
import java.awt.GridBagConstraints;
|
||||
import java.awt.GridBagLayout;
|
||||
import java.awt.Insets;
|
||||
|
|
@ -26,16 +32,6 @@ import java.io.FileOutputStream;
|
|||
import java.io.IOException;
|
||||
import java.util.Properties;
|
||||
|
||||
import javax.swing.ImageIcon;
|
||||
import javax.swing.JCheckBox;
|
||||
import javax.swing.JLabel;
|
||||
import javax.swing.JOptionPane;
|
||||
import javax.swing.JPanel;
|
||||
import javax.swing.JPasswordField;
|
||||
import javax.swing.JTextField;
|
||||
|
||||
import org.apache.ivy.Ivy;
|
||||
|
||||
public final class CredentialsUtil {
|
||||
|
||||
@SuppressWarnings("serial")
|
||||
|
|
@ -103,7 +99,7 @@ public final class CredentialsUtil {
|
|||
}
|
||||
CredentialPanel credentialPanel = new CredentialPanel(c, passfile);
|
||||
if (JOptionPane.showOptionDialog(null, credentialPanel, c.getHost() + " credentials",
|
||||
JOptionPane.OK_CANCEL_OPTION, 0, new ImageIcon(Ivy.class.getResource("logo.png")),
|
||||
JOptionPane.OK_CANCEL_OPTION, 0, new IvyLogo(),
|
||||
null, JOptionPane.OK_OPTION) == JOptionPane.OK_OPTION) {
|
||||
String username = credentialPanel.userNameField.getText();
|
||||
String passwd = credentialPanel.passwordField.getText();
|
||||
|
|
|
|||
|
|
@ -0,0 +1,363 @@
|
|||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.util;
|
||||
|
||||
import javax.swing.Icon;
|
||||
import java.awt.Color;
|
||||
import java.awt.Component;
|
||||
import java.awt.Graphics;
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.RenderingHints;
|
||||
import java.awt.geom.AffineTransform;
|
||||
import java.awt.geom.GeneralPath;
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.util.LinkedList;
|
||||
|
||||
import static java.awt.Color.WHITE;
|
||||
import static java.lang.Math.min;
|
||||
|
||||
/**
|
||||
* This class has been automatically generated using
|
||||
* <a href="http://ebourg.github.io/flamingo-svg-transcoder/">Flamingo SVG transcoder</a>.
|
||||
*/
|
||||
public class IvyLogo implements Icon {
|
||||
|
||||
/** Maximum dimension of an icon in JInfoPane */
|
||||
private static final int MAX_INFO_ICON_SIZE = 128;
|
||||
|
||||
/** The colour of this icon. */
|
||||
private static final Color COLOUR = new Color(0x6E9244);
|
||||
|
||||
/** The width of this icon. */
|
||||
private int width;
|
||||
|
||||
/** The height of this icon. */
|
||||
private int height;
|
||||
|
||||
/** The rendered image. */
|
||||
private BufferedImage image;
|
||||
|
||||
/**
|
||||
* Creates a new Ivy logo transcoded from SVG image.
|
||||
*/
|
||||
public IvyLogo() {
|
||||
this(MAX_INFO_ICON_SIZE, MAX_INFO_ICON_SIZE);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a new Ivy logo transcoded from SVG image.
|
||||
*
|
||||
* @param width image dimension
|
||||
* @param height image dimension
|
||||
*/
|
||||
public IvyLogo(int width, int height) {
|
||||
this.width = width;
|
||||
this.height = height;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getIconHeight() {
|
||||
return height;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getIconWidth() {
|
||||
return width;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void paintIcon(Component c, Graphics g, int x, int y) {
|
||||
if (image == null) {
|
||||
image = new BufferedImage(getIconWidth(), getIconHeight(), BufferedImage.TYPE_INT_ARGB);
|
||||
double coef = min((double) width, (double) height);
|
||||
|
||||
Graphics2D g2d = image.createGraphics();
|
||||
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
|
||||
g2d.scale(coef, coef);
|
||||
paint(g2d);
|
||||
g2d.dispose();
|
||||
}
|
||||
|
||||
g.drawImage(image, x, y, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Paints the Ivy logo transcoded from SVG image on the specified graphics context.
|
||||
*
|
||||
* @param g Graphics context.
|
||||
*/
|
||||
private static void paint(Graphics2D g) {
|
||||
LinkedList<AffineTransform> transformations = new LinkedList<>();
|
||||
|
||||
transformations.offer(g.getTransform());
|
||||
g.transform(new AffineTransform(0.002013243f, 0, 0, 0.002013243f, 0, 0.1471439f));
|
||||
|
||||
GeneralPath shape = new GeneralPath();
|
||||
shape.moveTo(35.696, 151.511);
|
||||
shape.lineTo(62.092, 151.511);
|
||||
shape.curveTo(57.965, 148.382, 52.366997, 144.04001, 52.321, 140.41);
|
||||
shape.curveTo(52.299, 139.578, 52.273, 138.417, 52.203, 137.017);
|
||||
shape.curveTo(49.002, 138.843, 36.882, 141.357, 29.575998, 134.83499);
|
||||
shape.curveTo(22.129997, 128.16899, 20.846998, 119.81799, 23.196999, 115.88399);
|
||||
shape.curveTo(25.544998, 111.969986, 32.066998, 111.875984, 32.066998, 111.875984);
|
||||
shape.lineTo(32.377, 108.74499);
|
||||
shape.curveTo(32.377, 108.74499, 22.484999, 103.57199, 16.532999, 91.16899);
|
||||
shape.curveTo(10.58, 78.766, 6.453, 63.87, 6.453, 63.87);
|
||||
shape.curveTo(6.453, 63.87, 13.353001, 59.507, 23.126999, 61.048);
|
||||
shape.curveTo(32.898, 62.568, 37.476997, 66.552, 39.822998, 65.745);
|
||||
shape.curveTo(42.955, 54.288, 70.421, 3.413, 75.046, -0.003);
|
||||
shape.curveTo(89.633, 6.281, 89.941, 43.307, 90.107, 46.13);
|
||||
shape.curveTo(90.273, 48.953003, 90.107, 69.825, 90.107, 72.648);
|
||||
shape.curveTo(90.107, 75.471, 91.98, 76.798004, 95.919, 77.203);
|
||||
shape.curveTo(99.833, 77.605, 126.703995, 60.888, 133.465, 58.681004);
|
||||
shape.curveTo(133.465, 82.448006, 118.66499, 103.937004, 111.146996, 112.189);
|
||||
shape.curveTo(106.521996, 120.587006, 109.98499, 122.200005, 111.050995, 126.136);
|
||||
shape.curveTo(112.117, 130.074, 112.16499, 138.683, 111.548996, 140.321);
|
||||
shape.curveTo(107.422, 141.483, 90.297, 141.96, 84.01199, 139.8);
|
||||
shape.curveTo(77.728, 137.642, 77.465996, 134.179, 75.57099, 132.779);
|
||||
shape.curveTo(75.40499, 132.66301, 64.06699, 131.238, 56.715992, 134.10701);
|
||||
shape.lineTo(56.57299, 140.488);
|
||||
shape.curveTo(60.79499, 144.38, 63.94999, 145.94301, 67.24599, 151.49501);
|
||||
shape.lineTo(154.74199, 151.49501);
|
||||
shape.lineTo(185.887, 241.76501);
|
||||
shape.lineTo(218.808, 151.49503);
|
||||
shape.lineTo(317.356, 151.49503);
|
||||
shape.lineTo(352.249, 244.82703);
|
||||
shape.lineTo(383.227, 151.49503);
|
||||
shape.lineTo(433.93597, 151.49503);
|
||||
shape.curveTo(434.22098, 139.23003, 443.80298, 140.75102, 446.649, 140.68103);
|
||||
shape.curveTo(446.033, 139.73303, 443.352, 137.78603, 444.253, 134.86903);
|
||||
shape.curveTo(445.155, 131.97304, 452.06, 132.87903, 452.06, 132.87903);
|
||||
shape.curveTo(452.06, 132.87903, 454.312, 127.51803, 455.378, 125.00403);
|
||||
shape.curveTo(456.443, 122.48803, 460.524, 121.897026, 460.524, 121.897026);
|
||||
shape.curveTo(460.524, 121.897026, 458.05698, 131.79103, 462.421, 131.79103);
|
||||
shape.lineTo(483.07898, 131.79103);
|
||||
shape.curveTo(483.07898, 131.79103, 475.51398, 139.07004, 472.309, 139.64403);
|
||||
shape.curveTo(469.106, 140.23602, 462.98798, 143.43703, 464.88498, 144.60103);
|
||||
shape.curveTo(466.78098, 145.76303, 471.87997, 149.20303, 470.99997, 151.50203);
|
||||
shape.curveTo(470.12497, 153.80403, 457.74396, 149.19904, 457.74396, 151.50203);
|
||||
shape.curveTo(457.74396, 153.80403, 450.22296, 157.35902, 450.60196, 154.06403);
|
||||
shape.curveTo(450.98297, 150.76703, 451.45596, 144.41202, 449.95895, 143.17703);
|
||||
shape.curveTo(448.44095, 141.94504, 444.24194, 142.27704, 440.85394, 142.70103);
|
||||
shape.curveTo(437.45895, 143.12903, 437.65094, 151.50203, 437.65094, 151.50203);
|
||||
shape.lineTo(444.24594, 151.50203);
|
||||
shape.lineTo(442.15994, 156.48103);
|
||||
shape.curveTo(459.73395, 157.16904, 462.31995, 174.76804, 463.05594, 173.08504);
|
||||
shape.curveTo(463.88495, 171.16304, 466.80093, 164.92604, 467.39594, 164.21404);
|
||||
shape.curveTo(469.60092, 161.53203, 475.33994, 161.86603, 476.71494, 162.88704);
|
||||
shape.curveTo(479.06595, 164.61604, 477.11795, 168.31905, 481.76892, 171.04404);
|
||||
shape.curveTo(489.52493, 174.38904, 495.21494, 173.39503, 496.70993, 175.66904);
|
||||
shape.curveTo(495.37994, 179.18204, 489.31192, 187.00703, 485.72992, 188.52304);
|
||||
shape.curveTo(483.09592, 189.63805, 482.83392, 193.81204, 483.30893, 194.78705);
|
||||
shape.curveTo(488.33792, 205.36505, 487.03693, 212.55106, 485.58594, 222.20505);
|
||||
shape.curveTo(473.32294, 212.78905, 464.71295, 202.09204, 460.77594, 203.51405);
|
||||
shape.curveTo(456.83795, 204.93906, 442.20395, 206.03105, 442.20395, 206.03105);
|
||||
shape.curveTo(442.20395, 206.03105, 446.02194, 219.29105, 444.29196, 225.69305);
|
||||
shape.curveTo(443.19995, 229.72406, 448.13495, 228.82605, 448.13495, 228.82605);
|
||||
shape.curveTo(448.13495, 228.82605, 452.42795, 223.75105, 455.20193, 222.27705);
|
||||
shape.curveTo(457.97592, 220.83205, 461.32092, 219.88106, 465.80493, 220.99805);
|
||||
shape.curveTo(470.36093, 222.56204, 471.14392, 230.06004, 475.48392, 232.57005);
|
||||
shape.curveTo(478.6849, 234.44505, 492.75192, 249.69505, 492.75192, 249.69505);
|
||||
shape.curveTo(492.75192, 249.69505, 485.94293, 253.09105, 480.18494, 253.34906);
|
||||
shape.curveTo(474.41794, 253.60905, 466.14194, 253.29906, 463.53693, 254.03706);
|
||||
shape.curveTo(459.80994, 255.08206, 455.87494, 283.26108, 449.47092, 289.30807);
|
||||
shape.curveTo(441.6459, 280.05606, 440.24393, 267.5081, 437.4689, 255.93507);
|
||||
shape.curveTo(436.5919, 252.30608, 433.88892, 251.38107, 432.5839, 251.38107);
|
||||
shape.curveTo(431.27887, 251.38107, 427.9589, 253.39807, 421.90988, 255.55608);
|
||||
shape.curveTo(415.8599, 257.74008, 407.25488, 254.65608, 407.25488, 254.65608);
|
||||
shape.lineTo(423.7349, 233.40608);
|
||||
shape.curveTo(423.7349, 233.40608, 422.17288, 224.32208, 423.3079, 221.33308);
|
||||
shape.curveTo(428.7429, 216.14009, 436.1629, 220.10109, 436.1629, 220.10109);
|
||||
shape.lineTo(442.8269, 226.26709);
|
||||
shape.curveTo(443.0619, 218.82208, 440.4069, 210.02109, 435.1179, 205.37209);
|
||||
shape.curveTo(431.6319, 202.31009, 426.55588, 201.31209, 423.4969, 201.00708);
|
||||
shape.lineTo(377.29388, 310.82007);
|
||||
shape.curveTo(356.13788, 361.10107, 301.13388, 351.40405, 266.33887, 346.13608);
|
||||
shape.lineTo(262.18988, 310.91406);
|
||||
shape.curveTo(275.40088, 312.59906, 313.8469, 319.78506, 320.67688, 293.72006);
|
||||
shape.lineTo(267.14688, 183.90607);
|
||||
shape.lineTo(210.86488, 293.72006);
|
||||
shape.lineTo(159.08987, 293.72006);
|
||||
shape.lineTo(97.61087, 171.64006);
|
||||
shape.lineTo(97.61087, 207.41006);
|
||||
shape.curveTo(98.58387, 207.47806, 99.33987, 207.83707, 99.98387, 208.40607);
|
||||
shape.curveTo(101.54587, 209.83107, 108.616875, 214.90607, 110.01587, 216.94707);
|
||||
shape.curveTo(113.76187, 222.35107, 119.16887, 221.66707, 118.33887, 226.46007);
|
||||
shape.curveTo(116.22887, 229.51907, 113.00287, 227.55006, 111.60387, 226.93307);
|
||||
shape.curveTo(110.18087, 226.31607, 105.48486, 217.92108, 103.91887, 216.66208);
|
||||
shape.curveTo(102.63787, 215.64108, 99.88587, 212.58208, 97.633865, 212.34708);
|
||||
shape.lineTo(97.633865, 231.10907);
|
||||
shape.curveTo(107.16887, 240.73807, 120.07187, 253.42706, 121.635864, 254.68507);
|
||||
shape.curveTo(124.15086, 256.72406, 127.58887, 258.76306, 130.10387, 259.38007);
|
||||
shape.curveTo(132.61887, 259.99606, 135.91586, 260.16006, 136.83786, 261.10907);
|
||||
shape.curveTo(140.13486, 264.40607, 138.97285, 267.08807, 135.41486, 267.39407);
|
||||
shape.curveTo(133.54086, 267.56207, 123.01086, 265.59106, 121.303856, 263.38608);
|
||||
shape.curveTo(119.57486, 261.1811, 108.59086, 248.86708, 108.59086, 248.86708);
|
||||
shape.curveTo(108.59086, 248.86708, 101.52386, 240.87508, 99.03086, 239.45108);
|
||||
shape.curveTo(98.579865, 239.19109, 98.08186, 238.76308, 97.60686, 238.22208);
|
||||
shape.lineTo(97.60686, 293.70108);
|
||||
shape.lineTo(49.293, 293.70108);
|
||||
shape.curveTo(50.076, 295.31207, 51.878998, 299.3921, 50.385, 299.5351);
|
||||
shape.curveTo(48.51, 299.70108, 47.398, 299.4391, 46.305, 297.2601);
|
||||
shape.curveTo(45.973, 296.5961, 45.760002, 295.2401, 45.641, 293.7261);
|
||||
shape.lineTo(35.796997, 293.7261);
|
||||
shape.lineTo(35.796997, 236.2561);
|
||||
shape.lineTo(35.774998, 236.2561);
|
||||
shape.curveTo(35.373997, 236.37311, 34.992996, 236.4901, 34.635, 236.6101);
|
||||
shape.curveTo(31.696, 236.70811, 28.822998, 236.30011, 27.258, 236.4441);
|
||||
shape.curveTo(23.772999, 236.79811, 11.865, 249.10811, 9.92, 252.5961);
|
||||
shape.curveTo(9.137, 254.0201, 6.149, 256.8391, 4.584, 257.2901);
|
||||
shape.curveTo(3.0210001, 257.7661, -0.91799974, 254.7741, 0.1960001, 252.7351);
|
||||
shape.curveTo(1.2870001, 250.6941, 6.149, 248.0401, 7.261, 247.70811);
|
||||
shape.curveTo(8.354, 247.39711, 9.778, 243.31711, 11.507, 241.75612);
|
||||
shape.curveTo(13.239, 240.19212, 22.654, 233.90312, 24.220001, 232.02812);
|
||||
shape.curveTo(25.785002, 230.15512, 34.419003, 230.29912, 34.419003, 230.29912);
|
||||
shape.lineTo(35.843002, 230.44212);
|
||||
shape.lineTo(35.843002, 204.68213);
|
||||
shape.curveTo(35.276, 204.04112, 34.869003, 203.59213, 34.751003, 203.40112);
|
||||
shape.curveTo(33.495003, 201.43213, 31.999002, 204.58913, 32.476, 208.73912);
|
||||
shape.curveTo(32.953003, 212.88712, 31.384003, 220.45612, 31.384003, 222.16312);
|
||||
shape.curveTo(31.384003, 224.37012, 37.124, 227.57112, 33.735004, 229.58812);
|
||||
shape.curveTo(33.047005, 229.99112, 30.341003, 229.37512, 28.162004, 225.29512);
|
||||
shape.curveTo(25.955004, 221.21712, 28.162004, 205.98912, 28.162004, 205.98912);
|
||||
shape.curveTo(28.162004, 205.98912, 28.588005, 197.26012, 32.218006, 196.95212);
|
||||
shape.curveTo(33.904007, 196.80711, 35.088005, 196.80711, 35.869007, 196.88112);
|
||||
shape.lineTo(35.869007, 151.43811);
|
||||
shape.lineTo(35.696, 151.511);
|
||||
shape.closePath();
|
||||
shape.moveTo(440.661, 160.026);
|
||||
shape.lineTo(426.073, 194.653);
|
||||
shape.curveTo(434.757, 197.786, 441.589, 204.946, 441.635, 204.924);
|
||||
shape.curveTo(443.43802, 204.094, 444.21902, 203.621, 444.21902, 201.43799);
|
||||
shape.curveTo(444.21902, 199.23299, 445.31104, 195.53398, 445.97504, 191.97499);
|
||||
shape.curveTo(447.06903, 186.18799, 443.50803, 187.20499, 442.82303, 182.512);
|
||||
shape.curveTo(441.82703, 175.633, 451.97504, 172.502, 455.88904, 175.01599);
|
||||
shape.curveTo(456.91003, 175.657, 456.45804, 177.221, 457.57504, 177.86198);
|
||||
shape.curveTo(458.66705, 178.47899, 460.44403, 178.19398, 460.80203, 177.62599);
|
||||
shape.curveTo(462.62802, 174.54199, 460.89703, 174.258, 458.90604, 170.581);
|
||||
shape.curveTo(455.34503, 159.34, 444.01004, 160.50099, 440.63803, 160.026);
|
||||
shape.lineTo(440.661, 160.026);
|
||||
shape.lineTo(440.661, 160.026);
|
||||
shape.closePath();
|
||||
|
||||
g.setPaint(COLOUR);
|
||||
g.fill(shape);
|
||||
|
||||
shape = new GeneralPath();
|
||||
shape.moveTo(35.72, 196.954);
|
||||
shape.curveTo(36.574, 197.024, 36.93, 197.12, 36.93, 197.12);
|
||||
shape.curveTo(36.93, 197.12, 38.187, 197.288, 41.010002, 201.034);
|
||||
shape.curveTo(43.833, 204.805, 45.090004, 208.176, 47.605003, 210.928);
|
||||
shape.curveTo(50.121002, 213.68, 52.541004, 211.94899, 52.541004, 211.94899);
|
||||
shape.curveTo(52.541004, 211.94899, 50.430004, 200.34999, 51.995003, 195.93799);
|
||||
shape.curveTo(53.558002, 191.551, 55.099003, 190.60199, 56.667004, 189.344);
|
||||
shape.curveTo(58.232002, 188.086, 60.557003, 186.07199, 58.354004, 184.032);
|
||||
shape.curveTo(56.147003, 181.991, 54.487003, 172.644, 57.477005, 166.053);
|
||||
shape.curveTo(60.463005, 159.459, 66.490005, 157.633, 66.490005, 157.633);
|
||||
shape.curveTo(66.490005, 157.633, 68.62401, 156.897, 65.28001, 154.004);
|
||||
shape.curveTo(64.49701, 153.316, 63.335007, 152.463, 62.051006, 151.465);
|
||||
shape.lineTo(67.19701, 151.465);
|
||||
shape.lineTo(69.90101, 154.668);
|
||||
shape.curveTo(78.65301, 150.444, 87.78401, 154.286, 87.78401, 162.922);
|
||||
shape.curveTo(89.041016, 163.868, 95.42201, 165.93399, 98.388016, 165.93399);
|
||||
shape.lineTo(113.75501, 165.93399);
|
||||
shape.curveTo(115.321014, 165.93399, 129.126, 157.963, 131.16501, 157.82098);
|
||||
shape.curveTo(133.20401, 157.65498, 133.27501, 154.33798, 140.81702, 155.35599);
|
||||
shape.curveTo(148.35902, 156.374, 148.26402, 155.094, 149.35602, 157.18199);
|
||||
shape.curveTo(150.44702, 159.29, 147.55302, 161.405, 145.82202, 162.04199);
|
||||
shape.curveTo(144.09302, 162.659, 134.43703, 161.68799, 132.87202, 161.68799);
|
||||
shape.curveTo(131.31003, 161.68799, 119.68402, 167.452, 116.011024, 169.25299);
|
||||
shape.curveTo(112.33302, 171.05699, 104.484024, 171.69398, 101.65803, 170.2);
|
||||
shape.curveTo(98.83703, 168.706, 93.16703, 167.594, 93.16703, 167.594);
|
||||
shape.lineTo(88.25903, 166.194);
|
||||
shape.curveTo(88.25903, 166.194, 88.02303, 176.798, 86.15003, 181.213);
|
||||
shape.curveTo(84.25303, 185.59999, 76.02303, 191.481, 73.53103, 191.481);
|
||||
shape.curveTo(71.01703, 191.481, 72.17903, 193.475, 72.17903, 193.475);
|
||||
shape.curveTo(74.716034, 198.502, 73.270035, 205.26201, 67.10303, 210.362);
|
||||
shape.curveTo(69.68803, 217.524, 81.26303, 197.602, 84.205025, 197.602);
|
||||
shape.curveTo(86.86102, 197.602, 87.40602, 198.811, 86.97903, 201.63301);
|
||||
shape.lineTo(77.065025, 212.49402);
|
||||
shape.curveTo(77.065025, 212.49402, 73.649025, 214.76802, 70.94602, 214.60402);
|
||||
shape.curveTo(70.163025, 214.55702, 69.45202, 215.76602, 69.689026, 217.49802);
|
||||
shape.curveTo(69.998024, 219.70302, 69.287025, 221.51001, 70.54302, 222.60002);
|
||||
shape.curveTo(71.803024, 223.69202, 76.71102, 220.98701, 78.301025, 219.11401);
|
||||
shape.curveTo(79.86403, 217.24101, 87.40602, 211.07301, 91.678024, 208.98701);
|
||||
shape.curveTo(94.19302, 207.77802, 96.01802, 207.30301, 97.41602, 207.39902);
|
||||
shape.lineTo(97.440025, 212.33401);
|
||||
shape.curveTo(96.91902, 212.28502, 96.39603, 212.38301, 95.94602, 212.71501);
|
||||
shape.curveTo(93.59702, 214.445, 87.09902, 219.23601, 87.09902, 220.16002);
|
||||
shape.curveTo(87.09902, 220.51402, 90.06202, 222.51102, 97.413025, 231.07002);
|
||||
shape.lineTo(97.413025, 238.21303);
|
||||
shape.curveTo(95.27802, 235.84203, 93.024025, 231.38103, 91.246025, 230.35902);
|
||||
shape.curveTo(89.06303, 229.10002, 86.93102, 225.02303, 86.31103, 223.62302);
|
||||
shape.curveTo(85.69603, 222.20102, 83.32403, 223.00801, 82.84803, 224.71701);
|
||||
shape.curveTo(82.37103, 226.447, 81.68603, 228.18001, 80.24003, 230.48201);
|
||||
shape.curveTo(76.77703, 236.033, 70.25703, 236.529, 69.28203, 237.503);
|
||||
shape.curveTo(68.191025, 238.595, 71.86703, 241.179, 72.816025, 242.294);
|
||||
shape.curveTo(73.76502, 243.386, 81.189026, 245.356, 83.72603, 254.772);
|
||||
shape.curveTo(86.24103, 264.188, 83.74803, 271.327, 82.35103, 275.09702);
|
||||
shape.curveTo(79.28903, 283.282, 73.74303, 283.993, 64.064026, 279.15503);
|
||||
shape.curveTo(62.949024, 278.58502, 54.932026, 269.68903, 53.225025, 265.75302);
|
||||
shape.curveTo(51.495026, 261.84103, 53.391026, 249.05602, 53.391026, 249.05602);
|
||||
shape.curveTo(53.391026, 249.05602, 56.377026, 244.98001, 54.953026, 244.81401);
|
||||
shape.curveTo(54.361027, 244.742, 54.810024, 242.988, 53.246025, 243.699);
|
||||
shape.curveTo(51.086025, 244.695, 46.891026, 248.253, 46.891026, 248.253);
|
||||
shape.lineTo(46.655025, 280.726);
|
||||
shape.curveTo(46.655025, 280.726, 48.528027, 280.62802, 48.860023, 283.122);
|
||||
shape.curveTo(49.16902, 285.59, 48.860023, 293.083, 48.860023, 293.083);
|
||||
shape.lineTo(49.192024, 293.747);
|
||||
shape.lineTo(45.54, 293.747);
|
||||
shape.curveTo(45.255, 290.237, 45.421, 285.706, 45.421, 285.706);
|
||||
shape.curveTo(45.421, 285.706, 43.525, 282.50598, 42.409, 281.102);
|
||||
shape.curveTo(41.317, 279.68, 41.343002, 250.81499, 42.907, 246.56898);
|
||||
shape.curveTo(44.471, 242.32498, 45.563, 240.68799, 47.768, 240.99498);
|
||||
shape.curveTo(49.974003, 241.30698, 53.27, 240.82898, 53.27, 240.82898);
|
||||
shape.curveTo(53.27, 240.82898, 54.053, 230.08798, 52.793, 229.44598);
|
||||
shape.curveTo(51.537, 228.82898, 46.364998, 232.26799, 45.584, 233.52399);
|
||||
shape.curveTo(44.873, 234.663, 39.514, 235.18399, 35.668, 236.29898);
|
||||
shape.lineTo(35.739998, 230.53198);
|
||||
shape.lineTo(39.155, 230.86398);
|
||||
shape.curveTo(39.155, 230.86398, 42.830997, 228.34998, 44.729, 227.23499);
|
||||
shape.curveTo(46.603, 226.14499, 51.939, 226.33798, 52.414, 224.67299);
|
||||
shape.curveTo(52.891003, 223.01099, 52.959, 217.67499, 52.58, 216.846);
|
||||
shape.curveTo(52.18, 216.01599, 50.018, 218.15099, 48.5, 216.72699);
|
||||
shape.lineTo(35.716, 204.77399);
|
||||
shape.lineTo(35.716, 196.96498);
|
||||
shape.lineTo(35.739, 196.96498);
|
||||
shape.lineTo(35.718, 196.96498);
|
||||
shape.lineTo(35.72, 196.954);
|
||||
shape.lineTo(35.72, 196.954);
|
||||
shape.closePath();
|
||||
shape.moveTo(52.18, 136.687);
|
||||
shape.curveTo(51.87, 130.023, 51.159, 118.948, 51.041, 118.044);
|
||||
shape.curveTo(50.875, 116.952995, 44.448, 109.103, 44.448, 106.921);
|
||||
shape.curveTo(44.448, 104.714, 42.739002, 100.492, 46.985, 101.751);
|
||||
shape.curveTo(51.231, 103.009, 53.58, 107.253, 53.58, 107.253);
|
||||
shape.curveTo(53.58, 107.253, 57.114002, 113.205, 57.114002, 114.772995);
|
||||
shape.curveTo(57.114002, 115.815994, 56.878002, 126.657, 56.711002, 133.937);
|
||||
shape.lineTo(52.182003, 136.71199);
|
||||
shape.lineTo(52.182003, 136.687);
|
||||
shape.lineTo(52.18, 136.687);
|
||||
shape.closePath();
|
||||
|
||||
g.setPaint(WHITE);
|
||||
g.fill(shape);
|
||||
|
||||
g.setTransform(transformations.poll());
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue