From 08e1d1cca882f2481c70fcf3530661084f881646 Mon Sep 17 00:00:00 2001 From: Gintas Grigelionis Date: Sat, 3 Mar 2018 11:30:06 +0100 Subject: [PATCH] Checkstyle: trim trailing whitespace, replace tabs --- src/etc/checkstyle/checkstyle-suppress.xml | 6 +- src/etc/checkstyle/checkstyle-text.xsl | 1 - src/etc/checkstyle/checkstyle-xdoc.xsl | 1 - src/etc/license/license-header.xml | 2 +- .../settings/ivysettings-advanced.xml | 268 +++++++------- .../settings/ivysettings-basic.xml | 22 +- .../settings/ivysettings.xml | 6 +- .../jdbc-example/src/dev.properties | 36 +- .../jdbc-example/src/prod.properties | 36 +- .../settings/ivysettings.properties | 36 +- .../dependence/settings/ivysettings.xml | 28 +- .../commons-httpclient-ivy-2.0.2.xml | 13 +- src/example/dual/settings/ivysettings.xml | 6 +- src/example/go-ivy/build.xml | 20 +- src/example/multi-project/build.xml | 4 +- .../multi-project/common/build.properties | 36 +- .../projects/console/build.properties | 36 +- .../multi-project/projects/console/build.xml | 8 +- .../projects/find/build.properties | 36 +- .../multi-project/projects/find/build.xml | 8 +- .../projects/list/build.properties | 36 +- .../multi-project/projects/list/build.xml | 8 +- .../projects/size/build.properties | 36 +- .../multi-project/projects/size/build.xml | 8 +- .../projects/sizewhere/build.properties | 36 +- .../projects/sizewhere/build.xml | 8 +- .../projects/version/build.properties | 36 +- .../multi-project/projects/version/build.xml | 8 +- src/example/packager-resolver/ivysettings.xml | 3 +- src/java/org/apache/ivy/ant/antlib.xml | 66 ++-- .../apache/ivy/core/module/id/package.html | 38 +- .../apache/ivy/core/settings/ivy.properties | 38 +- .../ivy/core/settings/ivysettings-1.4.xml | 18 +- .../settings/ivysettings-default-chain.xml | 14 +- .../ivy/core/settings/ivysettings-local.xml | 20 +- .../core/settings/ivysettings-main-chain.xml | 14 +- .../ivy/core/settings/ivysettings-public.xml | 8 +- .../ivy/core/settings/ivysettings-shared.xml | 20 +- .../apache/ivy/core/settings/ivysettings.xml | 14 +- .../ivy/core/settings/repository.properties | 36 +- .../ivy/core/settings/typedef.properties | 106 +++--- .../ivy/osgi/core/jvm-packages.properties | 44 +-- .../circular/CircularDependencyException.java | 2 +- .../parser/m2/PomModuleDescriptorParser.java | 2 +- .../ivy/plugins/report/ivy-report-dot-all.xsl | 11 +- .../ivy/plugins/report/ivy-report-dot.xsl | 42 +-- .../plugins/report/ivy-report-graph-all.xsl | 17 +- .../ivy/plugins/report/ivy-report-graph.xsl | 19 +- .../apache/ivy/plugins/report/ivy-report.css | 259 +++++++------ .../apache/ivy/plugins/report/ivy-report.xsl | 341 +++++++++--------- .../ivy/plugins/resolver/packager/build.xml | 2 +- 51 files changed, 949 insertions(+), 970 deletions(-) diff --git a/src/etc/checkstyle/checkstyle-suppress.xml b/src/etc/checkstyle/checkstyle-suppress.xml index 2565f287..c5318263 100644 --- a/src/etc/checkstyle/checkstyle-suppress.xml +++ b/src/etc/checkstyle/checkstyle-suppress.xml @@ -18,8 +18,8 @@ "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. + under the License. --> - - \ No newline at end of file + + diff --git a/src/etc/checkstyle/checkstyle-text.xsl b/src/etc/checkstyle/checkstyle-text.xsl index 333aecff..206f92d7 100644 --- a/src/etc/checkstyle/checkstyle-text.xsl +++ b/src/etc/checkstyle/checkstyle-text.xsl @@ -30,4 +30,3 @@ - diff --git a/src/etc/checkstyle/checkstyle-xdoc.xsl b/src/etc/checkstyle/checkstyle-xdoc.xsl index 4d7ab86a..269dcc2c 100644 --- a/src/etc/checkstyle/checkstyle-xdoc.xsl +++ b/src/etc/checkstyle/checkstyle-xdoc.xsl @@ -126,4 +126,3 @@ - diff --git a/src/etc/license/license-header.xml b/src/etc/license/license-header.xml index 1c1b8cf7..674af6f6 100644 --- a/src/etc/license/license-header.xml +++ b/src/etc/license/license-header.xml @@ -14,5 +14,5 @@ "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. + under the License. --> diff --git a/src/example/build-a-ivy-repository/settings/ivysettings-advanced.xml b/src/example/build-a-ivy-repository/settings/ivysettings-advanced.xml index 09ca0d44..512fbe7b 100644 --- a/src/example/build-a-ivy-repository/settings/ivysettings-advanced.xml +++ b/src/example/build-a-ivy-repository/settings/ivysettings-advanced.xml @@ -14,148 +14,146 @@ "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. + under the License. --> - - + + - - + + - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/example/build-a-ivy-repository/settings/ivysettings-basic.xml b/src/example/build-a-ivy-repository/settings/ivysettings-basic.xml index 25389168..96a07cf9 100644 --- a/src/example/build-a-ivy-repository/settings/ivysettings-basic.xml +++ b/src/example/build-a-ivy-repository/settings/ivysettings-basic.xml @@ -14,17 +14,17 @@ "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. + under the License. --> - - - - - - - - - + + + + + + + + + diff --git a/src/example/chained-resolvers/settings/ivysettings.xml b/src/example/chained-resolvers/settings/ivysettings.xml index b5790eec..1c3adbab 100644 --- a/src/example/chained-resolvers/settings/ivysettings.xml +++ b/src/example/chained-resolvers/settings/ivysettings.xml @@ -14,16 +14,16 @@ "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. + under the License. --> - + - + diff --git a/src/example/configurations/jdbc-example/src/dev.properties b/src/example/configurations/jdbc-example/src/dev.properties index ca2146a3..77947cdd 100644 --- a/src/example/configurations/jdbc-example/src/dev.properties +++ b/src/example/configurations/jdbc-example/src/dev.properties @@ -1,19 +1,19 @@ -# *************************************************************** -# * 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. -# *************************************************************** +# *************************************************************** +# * 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. +# *************************************************************** driver.class=com.mckoi.JDBCDriver diff --git a/src/example/configurations/jdbc-example/src/prod.properties b/src/example/configurations/jdbc-example/src/prod.properties index 48c25ee5..68b69d47 100644 --- a/src/example/configurations/jdbc-example/src/prod.properties +++ b/src/example/configurations/jdbc-example/src/prod.properties @@ -1,19 +1,19 @@ -# *************************************************************** -# * 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. -# *************************************************************** +# *************************************************************** +# * 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. +# *************************************************************** driver.class=org.gjt.mm.mysql.Driver diff --git a/src/example/dependence/settings/ivysettings.properties b/src/example/dependence/settings/ivysettings.properties index f68f4157..8b5df86f 100644 --- a/src/example/dependence/settings/ivysettings.properties +++ b/src/example/dependence/settings/ivysettings.properties @@ -1,19 +1,19 @@ -# *************************************************************** -# * 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. -# *************************************************************** +# *************************************************************** +# * 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. +# *************************************************************** repository.dir=${ivy.settings.dir}/repository diff --git a/src/example/dependence/settings/ivysettings.xml b/src/example/dependence/settings/ivysettings.xml index e06d437a..3c94bd68 100644 --- a/src/example/dependence/settings/ivysettings.xml +++ b/src/example/dependence/settings/ivysettings.xml @@ -14,20 +14,20 @@ "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. + under the License. --> - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/example/dual/repository/commons-httpclient-ivy-2.0.2.xml b/src/example/dual/repository/commons-httpclient-ivy-2.0.2.xml index 0b2f32c9..c7e605ea 100644 --- a/src/example/dual/repository/commons-httpclient-ivy-2.0.2.xml +++ b/src/example/dual/repository/commons-httpclient-ivy-2.0.2.xml @@ -14,15 +14,14 @@ "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. + under the License. --> - + diff --git a/src/example/dual/settings/ivysettings.xml b/src/example/dual/settings/ivysettings.xml index 9d48a8ad..d46c9d21 100644 --- a/src/example/dual/settings/ivysettings.xml +++ b/src/example/dual/settings/ivysettings.xml @@ -14,16 +14,16 @@ "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. + under the License. --> - + - + diff --git a/src/example/go-ivy/build.xml b/src/example/go-ivy/build.xml index cd7ec17c..05ecbe55 100644 --- a/src/example/go-ivy/build.xml +++ b/src/example/go-ivy/build.xml @@ -78,25 +78,25 @@ - - - - - + + + - + We are now ready to execute our simple program with its dependency on commons-lang. Let's go! - - + + - + - + - - - + + + diff --git a/src/example/multi-project/projects/find/build.properties b/src/example/multi-project/projects/find/build.properties index 1b549258..29dc4117 100644 --- a/src/example/multi-project/projects/find/build.properties +++ b/src/example/multi-project/projects/find/build.properties @@ -1,21 +1,21 @@ -# *************************************************************** -# * 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. -# *************************************************************** +# *************************************************************** +# * 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. +# *************************************************************** projects.dir = ${basedir}/.. wkspace.dir = ${projects.dir}/.. common.dir = ${wkspace.dir}/common diff --git a/src/example/multi-project/projects/find/build.xml b/src/example/multi-project/projects/find/build.xml index 270e2cfe..cfcf3997 100644 --- a/src/example/multi-project/projects/find/build.xml +++ b/src/example/multi-project/projects/find/build.xml @@ -14,10 +14,10 @@ "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. + under the License. --> - - - + + + diff --git a/src/example/multi-project/projects/list/build.properties b/src/example/multi-project/projects/list/build.properties index 1b549258..29dc4117 100644 --- a/src/example/multi-project/projects/list/build.properties +++ b/src/example/multi-project/projects/list/build.properties @@ -1,21 +1,21 @@ -# *************************************************************** -# * 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. -# *************************************************************** +# *************************************************************** +# * 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. +# *************************************************************** projects.dir = ${basedir}/.. wkspace.dir = ${projects.dir}/.. common.dir = ${wkspace.dir}/common diff --git a/src/example/multi-project/projects/list/build.xml b/src/example/multi-project/projects/list/build.xml index e86db1a7..8edd400f 100644 --- a/src/example/multi-project/projects/list/build.xml +++ b/src/example/multi-project/projects/list/build.xml @@ -14,10 +14,10 @@ "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. + under the License. --> - - - + + + diff --git a/src/example/multi-project/projects/size/build.properties b/src/example/multi-project/projects/size/build.properties index 1b549258..29dc4117 100644 --- a/src/example/multi-project/projects/size/build.properties +++ b/src/example/multi-project/projects/size/build.properties @@ -1,21 +1,21 @@ -# *************************************************************** -# * 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. -# *************************************************************** +# *************************************************************** +# * 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. +# *************************************************************** projects.dir = ${basedir}/.. wkspace.dir = ${projects.dir}/.. common.dir = ${wkspace.dir}/common diff --git a/src/example/multi-project/projects/size/build.xml b/src/example/multi-project/projects/size/build.xml index efaacbfa..c05deb7b 100644 --- a/src/example/multi-project/projects/size/build.xml +++ b/src/example/multi-project/projects/size/build.xml @@ -14,10 +14,10 @@ "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. + under the License. --> - - - + + + diff --git a/src/example/multi-project/projects/sizewhere/build.properties b/src/example/multi-project/projects/sizewhere/build.properties index 1b549258..29dc4117 100644 --- a/src/example/multi-project/projects/sizewhere/build.properties +++ b/src/example/multi-project/projects/sizewhere/build.properties @@ -1,21 +1,21 @@ -# *************************************************************** -# * 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. -# *************************************************************** +# *************************************************************** +# * 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. +# *************************************************************** projects.dir = ${basedir}/.. wkspace.dir = ${projects.dir}/.. common.dir = ${wkspace.dir}/common diff --git a/src/example/multi-project/projects/sizewhere/build.xml b/src/example/multi-project/projects/sizewhere/build.xml index 107d1ca0..ba41d5d6 100644 --- a/src/example/multi-project/projects/sizewhere/build.xml +++ b/src/example/multi-project/projects/sizewhere/build.xml @@ -14,10 +14,10 @@ "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. + under the License. --> - - - + + + diff --git a/src/example/multi-project/projects/version/build.properties b/src/example/multi-project/projects/version/build.properties index 1b549258..29dc4117 100644 --- a/src/example/multi-project/projects/version/build.properties +++ b/src/example/multi-project/projects/version/build.properties @@ -1,21 +1,21 @@ -# *************************************************************** -# * 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. -# *************************************************************** +# *************************************************************** +# * 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. +# *************************************************************** projects.dir = ${basedir}/.. wkspace.dir = ${projects.dir}/.. common.dir = ${wkspace.dir}/common diff --git a/src/example/multi-project/projects/version/build.xml b/src/example/multi-project/projects/version/build.xml index 5200004b..003ed10c 100644 --- a/src/example/multi-project/projects/version/build.xml +++ b/src/example/multi-project/projects/version/build.xml @@ -14,10 +14,10 @@ "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. + under the License. --> - - - + + + diff --git a/src/example/packager-resolver/ivysettings.xml b/src/example/packager-resolver/ivysettings.xml index fbbaafd8..d1900af1 100644 --- a/src/example/packager-resolver/ivysettings.xml +++ b/src/example/packager-resolver/ivysettings.xml @@ -14,7 +14,7 @@ "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. + under the License. --> @@ -32,4 +32,3 @@ - diff --git a/src/java/org/apache/ivy/ant/antlib.xml b/src/java/org/apache/ivy/ant/antlib.xml index c93be30a..4cd881cd 100644 --- a/src/java/org/apache/ivy/ant/antlib.xml +++ b/src/java/org/apache/ivy/ant/antlib.xml @@ -15,39 +15,39 @@ "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. + under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/org/apache/ivy/core/module/id/package.html b/src/java/org/apache/ivy/core/module/id/package.html index 4fde8d7b..1a37e020 100644 --- a/src/java/org/apache/ivy/core/module/id/package.html +++ b/src/java/org/apache/ivy/core/module/id/package.html @@ -1,4 +1,3 @@ - @@ -28,12 +27,12 @@ This packages gathers classes used to represent identifiers of objects involved As identifiers, they do not store any information on the module content and detailed metadata (like dependencies).

Classes

-
    -
  • ModuleId
    • is used as the identifier of module, without considering its version. It's basically an organization and module name couple. -
  • ModuleRevisionId
    • is used as the identifier of a module in a particular version or version constraint. It is composed of a ModuleId, a revision, and optionally a branch and extra attributes. -
  • ArtifactId
    • identifies an artifact without considering its version. It's basically a ModuleId and an artifact name, type and extension, plus optional extra attributes. -
  • ArtifactRevisionId
    • identifies an artifact of a module in a particular version. It is composed of a ModuleRevisionId along with artifact identifier like the name type and extension. -
+
+
ModuleId
is used as the identifier of module, without considering its version. It's basically an organization and module name couple.
+
ModuleRevisionId
is used as the identifier of a module in a particular version or version constraint. It is composed of a ModuleId, a revision, and optionally a branch and extra attributes.
+
ArtifactId
identifies an artifact without considering its version. It's basically a ModuleId and an artifact name, type and extension, plus optional extra attributes.
+
ArtifactRevisionId
identifies an artifact of a module in a particular version. It is composed of a ModuleRevisionId along with artifact identifier like the name type and extension.
+

Text Representation

These classes share an homogeneous text representation, which can be easily obtained through the toString() method. @@ -44,16 +43,17 @@ The # before the branch is present only if the branch is not empty.
The type and surrounding parenthesis are present only if different from the extension.

-A textual representation can be parsed into an object (supported for ModuleRevisionId only yet), as long as a strict set of characters is used for each field (which is recommended).
+A textual representation can be parsed into an object (supported for ModuleRevisionId only yet), as long as a strict set of characters is used for each field (which is recommended). +

Allowed characters are: -
    -
  • organisation
    • a-z A-Z 0-9 - / . _ + = -
  • module
    • a-z A-Z 0-9 - / . _ + = -
  • branch
    • a-z A-Z 0-9 - / . _ + = -
  • revision
    • a-z A-Z 0-9 - / . _ + = , [ ] { } ( ) : @ -
  • artifact
    • a-z A-Z 0-9 - / . _ + = -
  • extension
    • a-z A-Z 0-9 - / . _ + = -
  • type
    • a-z A-Z 0-9 - / . _ + = -
+
+
organisation
a-z A-Z 0-9 - / . _ + =
+
module
a-z A-Z 0-9 - / . _ + =
+
branch
a-z A-Z 0-9 - / . _ + =
+
revision
a-z A-Z 0-9 - / . _ + = , [ ] { } ( ) : @
+
artifact
a-z A-Z 0-9 - / . _ + =
+
extension
a-z A-Z 0-9 - / . _ + =
+
type
a-z A-Z 0-9 - / . _ + =
+
- \ No newline at end of file + diff --git a/src/java/org/apache/ivy/core/settings/ivy.properties b/src/java/org/apache/ivy/core/settings/ivy.properties index 6dcb2196..0eb5e128 100644 --- a/src/java/org/apache/ivy/core/settings/ivy.properties +++ b/src/java/org/apache/ivy/core/settings/ivy.properties @@ -1,26 +1,26 @@ -# *************************************************************** -# * 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. -# *************************************************************** +# *************************************************************** +# * 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. +# *************************************************************** ivy.project.dir = ${basedir} ivy.lib.dir = ${ivy.project.dir}/lib ivy.build.artifacts.dir = ${ivy.project.dir}/build/artifacts ivy.distrib.dir = ${ivy.project.dir}/distrib - + ivy.resolver.default.check.modified = false ivy.default.always.check.exact.revision = false diff --git a/src/java/org/apache/ivy/core/settings/ivysettings-1.4.xml b/src/java/org/apache/ivy/core/settings/ivysettings-1.4.xml index 19985566..63ff3aa5 100644 --- a/src/java/org/apache/ivy/core/settings/ivysettings-1.4.xml +++ b/src/java/org/apache/ivy/core/settings/ivysettings-1.4.xml @@ -14,15 +14,15 @@ "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. + under the License. --> - - - - - - - - + + + + + + + + diff --git a/src/java/org/apache/ivy/core/settings/ivysettings-default-chain.xml b/src/java/org/apache/ivy/core/settings/ivysettings-default-chain.xml index 2eeefd8c..bdc52776 100644 --- a/src/java/org/apache/ivy/core/settings/ivysettings-default-chain.xml +++ b/src/java/org/apache/ivy/core/settings/ivysettings-default-chain.xml @@ -14,13 +14,13 @@ "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. + under the License. --> - - - - - - + + + + + + diff --git a/src/java/org/apache/ivy/core/settings/ivysettings-local.xml b/src/java/org/apache/ivy/core/settings/ivysettings-local.xml index acf224d7..715a2bae 100644 --- a/src/java/org/apache/ivy/core/settings/ivysettings-local.xml +++ b/src/java/org/apache/ivy/core/settings/ivysettings-local.xml @@ -14,16 +14,16 @@ "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. + under the License. --> - - - - - - - - - + + + + + + + + + diff --git a/src/java/org/apache/ivy/core/settings/ivysettings-main-chain.xml b/src/java/org/apache/ivy/core/settings/ivysettings-main-chain.xml index 8cb5cf51..3ecb2ba0 100644 --- a/src/java/org/apache/ivy/core/settings/ivysettings-main-chain.xml +++ b/src/java/org/apache/ivy/core/settings/ivysettings-main-chain.xml @@ -14,13 +14,13 @@ "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. + under the License. --> - - - - - - + + + + + + diff --git a/src/java/org/apache/ivy/core/settings/ivysettings-public.xml b/src/java/org/apache/ivy/core/settings/ivysettings-public.xml index 09d1e581..9abbc0ef 100644 --- a/src/java/org/apache/ivy/core/settings/ivysettings-public.xml +++ b/src/java/org/apache/ivy/core/settings/ivysettings-public.xml @@ -14,10 +14,10 @@ "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. + under the License. --> - - - + + + diff --git a/src/java/org/apache/ivy/core/settings/ivysettings-shared.xml b/src/java/org/apache/ivy/core/settings/ivysettings-shared.xml index b5b530cb..0e46310d 100644 --- a/src/java/org/apache/ivy/core/settings/ivysettings-shared.xml +++ b/src/java/org/apache/ivy/core/settings/ivysettings-shared.xml @@ -14,16 +14,16 @@ "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. + under the License. --> - - - - - - - - - + + + + + + + + + diff --git a/src/java/org/apache/ivy/core/settings/ivysettings.xml b/src/java/org/apache/ivy/core/settings/ivysettings.xml index 6f0beb34..1b84bf0e 100644 --- a/src/java/org/apache/ivy/core/settings/ivysettings.xml +++ b/src/java/org/apache/ivy/core/settings/ivysettings.xml @@ -14,13 +14,13 @@ "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. + under the License. --> - - - - - - + + + + + + diff --git a/src/java/org/apache/ivy/core/settings/repository.properties b/src/java/org/apache/ivy/core/settings/repository.properties index d42e3d8b..c276ad6e 100644 --- a/src/java/org/apache/ivy/core/settings/repository.properties +++ b/src/java/org/apache/ivy/core/settings/repository.properties @@ -1,21 +1,21 @@ -# *************************************************************** -# * 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. -# *************************************************************** +# *************************************************************** +# * 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. +# *************************************************************** ivy.ibiblio.default.artifact.root = http://www.ibiblio.org/maven/ ivy.ibiblio.default.artifact.pattern = [module]/[type]s/[artifact]-[revision].[ext] diff --git a/src/java/org/apache/ivy/core/settings/typedef.properties b/src/java/org/apache/ivy/core/settings/typedef.properties index b843ff4d..e87af8fb 100644 --- a/src/java/org/apache/ivy/core/settings/typedef.properties +++ b/src/java/org/apache/ivy/core/settings/typedef.properties @@ -1,70 +1,68 @@ -# *************************************************************** -# * 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. -# *************************************************************** -filesystem = org.apache.ivy.plugins.resolver.FileSystemResolver -chain = org.apache.ivy.plugins.resolver.ChainResolver -ibiblio = org.apache.ivy.plugins.resolver.IBiblioResolver -bintray = org.apache.ivy.plugins.resolver.BintrayResolver -url = org.apache.ivy.plugins.resolver.URLResolver -dual = org.apache.ivy.plugins.resolver.DualResolver -ivyrep = org.apache.ivy.plugins.resolver.IvyRepResolver -ssh = org.apache.ivy.plugins.resolver.SshResolver -sftp = org.apache.ivy.plugins.resolver.SFTPResolver -vsftp = org.apache.ivy.plugins.resolver.VsftpResolver -vfs = org.apache.ivy.plugins.resolver.VfsResolver -jar = org.apache.ivy.plugins.resolver.JarResolver -packager = org.apache.ivy.plugins.resolver.packager.PackagerResolver -obr = org.apache.ivy.osgi.obr.OBRResolver -mirroredurl = org.apache.ivy.plugins.resolver.MirroredURLResolver -updatesite = org.apache.ivy.osgi.updatesite.UpdateSiteResolver -osgi-agg = org.apache.ivy.osgi.repo.AggregatedOSGiResolver +# *************************************************************** +# * 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. +# *************************************************************** +filesystem = org.apache.ivy.plugins.resolver.FileSystemResolver +chain = org.apache.ivy.plugins.resolver.ChainResolver +ibiblio = org.apache.ivy.plugins.resolver.IBiblioResolver +bintray = org.apache.ivy.plugins.resolver.BintrayResolver +url = org.apache.ivy.plugins.resolver.URLResolver +dual = org.apache.ivy.plugins.resolver.DualResolver +ivyrep = org.apache.ivy.plugins.resolver.IvyRepResolver +ssh = org.apache.ivy.plugins.resolver.SshResolver +sftp = org.apache.ivy.plugins.resolver.SFTPResolver +vsftp = org.apache.ivy.plugins.resolver.VsftpResolver +vfs = org.apache.ivy.plugins.resolver.VfsResolver +jar = org.apache.ivy.plugins.resolver.JarResolver +packager = org.apache.ivy.plugins.resolver.packager.PackagerResolver +obr = org.apache.ivy.osgi.obr.OBRResolver +mirroredurl = org.apache.ivy.plugins.resolver.MirroredURLResolver +updatesite = org.apache.ivy.osgi.updatesite.UpdateSiteResolver +osgi-agg = org.apache.ivy.osgi.repo.AggregatedOSGiResolver latest-revision = org.apache.ivy.plugins.latest.LatestRevisionStrategy latest-lexico = org.apache.ivy.plugins.latest.LatestLexicographicStrategy latest-time = org.apache.ivy.plugins.latest.LatestTimeStrategy -fixed-cm = org.apache.ivy.plugins.conflict.FixedConflictManager -latest-cm = org.apache.ivy.plugins.conflict.LatestConflictManager +fixed-cm = org.apache.ivy.plugins.conflict.FixedConflictManager +latest-cm = org.apache.ivy.plugins.conflict.LatestConflictManager compatible-cm = org.apache.ivy.plugins.conflict.LatestCompatibleConflictManager -no-cm = org.apache.ivy.plugins.conflict.NoConflictManager -strict-cm = org.apache.ivy.plugins.conflict.StrictConflictManager -regexp-cm = org.apache.ivy.plugins.conflict.RegexpConflictManager +no-cm = org.apache.ivy.plugins.conflict.NoConflictManager +strict-cm = org.apache.ivy.plugins.conflict.StrictConflictManager +regexp-cm = org.apache.ivy.plugins.conflict.RegexpConflictManager +namespace = org.apache.ivy.plugins.namespace.Namespace -namespace = org.apache.ivy.plugins.namespace.Namespace +exact-vm = org.apache.ivy.plugins.version.ExactVersionMatcher +chain-vm = org.apache.ivy.plugins.version.ChainVersionMatcher +latest-vm = org.apache.ivy.plugins.version.LatestVersionMatcher +sub-vm = org.apache.ivy.plugins.version.SubVersionMatcher +range-vm = org.apache.ivy.plugins.version.VersionRangeMatcher +pattern-vm = org.apache.ivy.plugins.version.PatternVersionMatcher +maven-tsnap-vm = org.apache.ivy.plugins.version.MavenTimedSnapshotVersionMatcher -exact-vm = org.apache.ivy.plugins.version.ExactVersionMatcher -chain-vm = org.apache.ivy.plugins.version.ChainVersionMatcher -latest-vm = org.apache.ivy.plugins.version.LatestVersionMatcher -sub-vm = org.apache.ivy.plugins.version.SubVersionMatcher -range-vm = org.apache.ivy.plugins.version.VersionRangeMatcher -pattern-vm = org.apache.ivy.plugins.version.PatternVersionMatcher -maven-tsnap-vm = org.apache.ivy.plugins.version.MavenTimedSnapshotVersionMatcher +ant-build = org.apache.ivy.ant.AntBuildTrigger +ant-call = org.apache.ivy.ant.AntCallTrigger +log = org.apache.ivy.plugins.trigger.LogTrigger -ant-build = org.apache.ivy.ant.AntBuildTrigger -ant-call = org.apache.ivy.ant.AntCallTrigger -log = org.apache.ivy.plugins.trigger.LogTrigger - -cache = org.apache.ivy.core.cache.DefaultRepositoryCacheManager +cache = org.apache.ivy.core.cache.DefaultRepositoryCacheManager pgp = org.apache.ivy.plugins.signer.bouncycastle.OpenPGPSignatureGenerator osgi-manifest-parser = org.apache.ivy.osgi.core.OSGiManifestParser timeout-constraint = org.apache.ivy.core.settings.NamedTimeoutConstraint - diff --git a/src/java/org/apache/ivy/osgi/core/jvm-packages.properties b/src/java/org/apache/ivy/osgi/core/jvm-packages.properties index fb9e0305..f86e74d5 100644 --- a/src/java/org/apache/ivy/osgi/core/jvm-packages.properties +++ b/src/java/org/apache/ivy/osgi/core/jvm-packages.properties @@ -1,30 +1,30 @@ -# *************************************************************** -# * 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. -# *************************************************************** +# *************************************************************** +# * 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. +# *************************************************************** OSGi/Minimum-1.0.aliases = OSGI_MINIMUM-1.0 -OSGi/Minimum-1.0.pkglist = +OSGi/Minimum-1.0.pkglist = OSGi/Minimum-1.1.aliases = OSGI_MINIMUM-1.1 -OSGi/Minimum-1.1.pkglist = +OSGi/Minimum-1.1.pkglist = OSGi/Minimum-1.2.aliases = OSGI_MINIMUM-1.2 -OSGi/Minimum-1.2.pkglist = +OSGi/Minimum-1.2.pkglist = CDC-1.0/Foundation-1.0.aliases = CDC-1.0_Foundation-1.0 CDC-1.0/Foundation-1.0.pkglist = \ @@ -215,6 +215,6 @@ JavaSE-1.6.pkglist = \ JavaSE-1.7.extends = JavaSE-1.6 JavaSE-1.7.pkglist = \ javax.swing.plaf.nimbus - + JavaSE-1.8.extends = JavaSE-1.7 JavaSE-1.8.pkglist = diff --git a/src/java/org/apache/ivy/plugins/circular/CircularDependencyException.java b/src/java/org/apache/ivy/plugins/circular/CircularDependencyException.java index 788b994e..83d85593 100644 --- a/src/java/org/apache/ivy/plugins/circular/CircularDependencyException.java +++ b/src/java/org/apache/ivy/plugins/circular/CircularDependencyException.java @@ -28,7 +28,7 @@ import org.apache.ivy.core.module.id.ModuleRevisionId; public class CircularDependencyException extends RuntimeException { /** - * + * */ private static final long serialVersionUID = 670272039106237360L; diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java index c4b4c353..a3295601 100644 --- a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java +++ b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java @@ -81,7 +81,7 @@ public final class PomModuleDescriptorParser implements ModuleDescriptorParser { private static final PomModuleDescriptorParser INSTANCE = new PomModuleDescriptorParser(); private static final String PARENT_MAP_KEY = PomModuleDescriptorParser.class.getName() + ".parentMap"; - + public static PomModuleDescriptorParser getInstance() { return INSTANCE; } diff --git a/src/java/org/apache/ivy/plugins/report/ivy-report-dot-all.xsl b/src/java/org/apache/ivy/plugins/report/ivy-report-dot-all.xsl index ef79a32f..e984508a 100644 --- a/src/java/org/apache/ivy/plugins/report/ivy-report-dot-all.xsl +++ b/src/java/org/apache/ivy/plugins/report/ivy-report-dot-all.xsl @@ -1,4 +1,4 @@ - + - + /* * directed graph dot input file. * * generated by ivy report */ digraph G { - "" + "" - "" -> ""; + "" -> ""; } diff --git a/src/java/org/apache/ivy/plugins/report/ivy-report-dot.xsl b/src/java/org/apache/ivy/plugins/report/ivy-report-dot.xsl index 58e79322..a6b98aee 100644 --- a/src/java/org/apache/ivy/plugins/report/ivy-report-dot.xsl +++ b/src/java/org/apache/ivy/plugins/report/ivy-report-dot.xsl @@ -1,3 +1,4 @@ + - + /* * directed graph dot input file. * * generated by ivy report */ digraph G { - "-" [label=""]; - - "-" [label=" - + "-" [label=""]; + + "-" [label=" + \n (error) (evicted) - - "]; + + "]; - - - " - - - " -> " - - - " [label=" - - "] - ; + + + " + - + " -> " + - + " [label=" + + "] + ; - - } + + } diff --git a/src/java/org/apache/ivy/plugins/report/ivy-report-graph-all.xsl b/src/java/org/apache/ivy/plugins/report/ivy-report-graph-all.xsl index 6cb6fecd..c124233a 100644 --- a/src/java/org/apache/ivy/plugins/report/ivy-report-graph-all.xsl +++ b/src/java/org/apache/ivy/plugins/report/ivy-report-graph-all.xsl @@ -1,4 +1,4 @@ - + - + - @@ -34,7 +33,7 @@ - + @@ -50,7 +49,7 @@ - - + @@ -58,7 +57,7 @@ - + diff --git a/src/java/org/apache/ivy/plugins/report/ivy-report-graph.xsl b/src/java/org/apache/ivy/plugins/report/ivy-report-graph.xsl index 88d6bacc..18c4dda7 100644 --- a/src/java/org/apache/ivy/plugins/report/ivy-report-graph.xsl +++ b/src/java/org/apache/ivy/plugins/report/ivy-report-graph.xsl @@ -1,4 +1,4 @@ - + - + - @@ -33,7 +32,7 @@ - + @@ -47,7 +46,7 @@ - + @@ -68,7 +67,7 @@ - - + @@ -79,7 +78,7 @@ - + diff --git a/src/java/org/apache/ivy/plugins/report/ivy-report.css b/src/java/org/apache/ivy/plugins/report/ivy-report.css index 135bc26a..643886ce 100644 --- a/src/java/org/apache/ivy/plugins/report/ivy-report.css +++ b/src/java/org/apache/ivy/plugins/report/ivy-report.css @@ -15,71 +15,71 @@ * limitations under the License. * */ - + body { - font-family:"Trebuchet MS",Verdana,Geneva,Arial,Helvetica,sans-serif; - font-size:small; + font-family: "Trebuchet MS",Verdana,Geneva,Arial,Helvetica,sans-serif; + font-size: small; } div#logo { - float: right; - padding-left: 10px; - padding-bottom: 10px; + float: right; + padding-left: 10px; + padding-bottom: 10px; background: white; text-align: center; } #logo img { - border: 0; + border: 0; } div#date { - font-style: italic; - padding-left: 60px; - padding-bottom: 40px; + font-style: italic; + padding-left: 60px; + padding-bottom: 40px; } h1 { - margin-bottom:2px; - - border-color:#7A9437; - border-style:solid; - border-width:0 0 3px 0; + margin-bottom: 2px; + + border-color: #7A9437; + border-style: solid; + border-width: 0 0 3px 0; } span#module { - color:#7A9437; - text-decoration:none; + color: #7A9437; + text-decoration: none; } span#organisation { - color:black; - text-decoration:none; + color: black; + text-decoration: none; } #confmenu { - color: #000; - border-bottom: 2px solid black; - margin: 12px 0px 0px 0px; - padding: 0px; - z-index: 1; - padding-left: 10px + color: #000; + border-bottom: 2px solid black; + margin: 12px 0px 0px 0px; + padding: 0px; + z-index: 1; + padding-left: 10px } #confmenu li { - display: inline; - overflow: hidden; - list-style-type: none; + display: inline; + overflow: hidden; + list-style-type: none; } #confmenu a, a.active { - color: #DEDECF; - background: #898B5E; - font: bold 1em "Trebuchet MS", Arial, sans-serif; - border: 2px solid black; - padding: 2px 5px 0px 5px; - text-decoration: none; + color: #DEDECF; + background: #898B5E; + font: bold 1em "Trebuchet MS", Arial, sans-serif; + border: 2px solid black; + padding: 2px 5px 0px 5px; + text-decoration: none; } /* @@ -88,192 +88,183 @@ background: #DEE4CD */ #confmenu a.active { - color: #7A9437; - background: #DEE4CD; - border-bottom: 3px solid #DEE4CD; + color: #7A9437; + background: #DEE4CD; + border-bottom: 3px solid #DEE4CD; } #confmenu a:hover { - color: #fff; - background: #ADC09F; + color: #fff; + background: #ADC09F; } #confmenu a:visited { - color: #DEDECF; + color: #DEDECF; } #confmenu a.active:visited { - color: #7A9437; + color: #7A9437; } #confmenu a.active:hover { - background: #DEE4CD; - color: #DEDECF; + background: #DEE4CD; + color: #DEDECF; } #content { - background: #DEE4CD; - padding: 20px; - border: 2px solid black; - border-top: none; - z-index: 2; + background: #DEE4CD; + padding: 20px; + border: 2px solid black; + border-top: none; + z-index: 2; } #content a { - text-decoration: none; - color: #E8E9BE; + text-decoration: none; + color: #E8E9BE; } -#content a:hover { - background: #898B5E; +#content a:hover { + background: #898B5E; } - h2 { - margin-bottom:2px; - font-size:medium; - - border-color:#7A9437; - border-style:solid; - border-width:0 0 2px 0; + margin-bottom: 2px; + font-size: medium; + border-color: #7A9437; + border-style: solid; + border-width: 0 0 2px 0; } h3 { - margin-top:30px; - margin-bottom:2px; + margin-top: 30px; + margin-bottom: 2px; padding: 5 5 5 0; font-size: 24px; - border-style:solid; - border-width:0 0 2px 0; + border-style: solid; + border-width: 0 0 2px 0; } h4 { - margin-bottom:2px; - margin-top:2px; - font-size:medium; - - border-color:#7A9437; - border-style:dashed; - border-width:0 0 1px 0; + margin-bottom: 2px; + margin-top: 2px; + font-size: medium; + border-color: #7A9437; + border-style: dashed; + border-width: 0 0 1px 0; } h5 { - margin-bottom:2px; - margin-top:2px; - margin-left:20px; - font-size:medium; + margin-bottom: 2px; + margin-top: 2px; + margin-left: 20px; + font-size: medium; } span.resolved { - padding-left: 15px; - font-weight: 500; - font-size: small; + padding-left: 15px; + font-weight: 500; + font-size: small; } - #content table { - border-collapse:collapse; - width:90%; - margin:auto; - margin-top: 5px; + border-collapse: collapse; + width: 90%; + margin: auto; + margin-top: 5px; } #content thead { - background-color:#CED4BD; - border:1px solid #7A9437; + background-color: #CED4BD; + border: 1px solid #7A9437; } #content tbody { - border-collapse:collapse; - background-color:#FFFFFF; - border:1px solid #7A9437; + border-collapse: collapse; + background-color: #FFFFFF; + border: 1px solid #7A9437; } #content th { - font-family:monospace; - border:1px solid #7A9437; - padding:5px; + font-family: monospace; + border: 1px solid #7A9437; + padding: 5px; } #content td { - border:1px dotted #7A9437; - padding:0 3 0 3; + border: 1px dotted #7A9437; + padding: 0 3 0 3; } #content table a { - color:#7A9437; - text-decoration:none; + color: #7A9437; + text-decoration: none; } #content table a:hover { - background-color:#CED4BD; - color:#7A9437; + background-color: #CED4BD; + color: #7A9437; } - - table.deps { - border-collapse:collapse; - width:90%; - margin:auto; - margin-top: 5px; + border-collapse: collapse; + width: 90%; + margin: auto; + margin-top: 5px; } table.deps thead { - background-color:#CED4BD; - border:1px solid #7A9437; + background-color: #CED4BD; + border: 1px solid #7A9437; } table.deps tbody { - border-collapse:collapse; - background-color:#FFFFFF; - border:1px solid #7A9437; + border-collapse: collapse; + background-color: #FFFFFF; + border: 1px solid #7A9437; } table.deps th { - font-family:monospace; - border:1px solid #7A9437; - padding:2; + font-family: monospace; + border: 1px solid #7A9437; + padding: 2; } table.deps td { - border:1px dotted #7A9437; - padding:0 3 0 3; + border: 1px dotted #7A9437; + padding: 0 3 0 3; } - - - - table.header { - border:0; - width:90%; - margin:auto; - margin-top: 5px; + border: 0; + width: 90%; + margin: auto; + margin-top: 5px; } table.header thead { - border:0; + border: 0; } + table.header tbody { - border:0; + border: 0; } + table.header tr { - padding:0px; - border:0; + padding: 0px; + border: 0; } + table.header td { - padding:0 3 0 3; - border:0; + padding: 0 3 0 3; + border: 0; } td.title { - width:150px; - margin-right:15px; - - font-size:small; - font-weight:700; + width: 150px; + margin-right: 15px; + font-size: small; + font-weight: 700; } td.title:first-letter { - color:#7A9437; - background-color:transparent; + color: #7A9437; + background-color: transparent; } - diff --git a/src/java/org/apache/ivy/plugins/report/ivy-report.xsl b/src/java/org/apache/ivy/plugins/report/ivy-report.xsl index af5f9530..c8ff9821 100644 --- a/src/java/org/apache/ivy/plugins/report/ivy-report.xsl +++ b/src/java/org/apache/ivy/plugins/report/ivy-report.xsl @@ -1,4 +1,4 @@ - + - + @@ -66,13 +65,13 @@ - + - - - + + + - + @@ -91,80 +90,80 @@ - - #- - - - by - - + + #- + + + by + + - - #-- - - + + #-- + + - + - + - + - + - + - kB + kB - - - + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - searched + searched - downloaded + downloaded @@ -189,21 +188,21 @@ - - #- - - by - - + + #- + + by + + - - #-- - - + + #-- + + - + @@ -212,17 +211,17 @@ - - - - - - + + + + + + - - - + + + @@ -230,13 +229,13 @@
  • - + - active + active --. - +
    • @@ -262,45 +261,45 @@

    - + - - - - - - by - - - + + + + + by + + +

    - resolved on - - - + resolved on + + +
      - - - + + +

    Dependencies Stats

    - - - - - -
    Modules
    Revisions - ( searched searched, - downloaded downloaded, - evicted evicted, - errors error)
    Artifacts - ( downloaded, - failed)
    Artifacts size kB - ( kB downloaded, - kB in cache)
    + + + + + +
    Modules
    Revisions + ( searched searched, + downloaded downloaded, + evicted evicted, + errors error)
    Artifacts + ( downloaded, + failed)
    Artifacts size kB + ( kB downloaded, + kB in cache)

    Errors

    @@ -315,10 +314,10 @@ - - - - + + + + @@ -336,35 +335,35 @@ - + - - #- - - by - - + + #- + + by + + - - - #-- - - - - + + + #-- + + + + - - - #-- - - - - - - + + + #-- + + + + + + @@ -400,41 +399,41 @@ - + - - + + + + + - - - - - - + ( kB downloaded, + kB in cache) + + + + + +
    Home Page - - -
    Status
    Publication
    Resolver
    Configurations
    Artifacts size kB - ( kB downloaded, - kB in cache)
    Licenses - - - -
    Evicted by - - - - - - - - - in conflict manager -
    Licenses + + + +
    Evicted by + + + + + + + + + in conflict manager +
    Required by
    @@ -448,14 +447,14 @@ - + @@ -468,9 +467,9 @@
    Dependencies
    - - - + + +
    Artifacts
    @@ -490,7 +489,7 @@ - + @@ -498,7 +497,7 @@ - +
    - - #- - - + + #- + +
    kB
    diff --git a/src/java/org/apache/ivy/plugins/resolver/packager/build.xml b/src/java/org/apache/ivy/plugins/resolver/packager/build.xml index f112fec0..ad46bf6b 100644 --- a/src/java/org/apache/ivy/plugins/resolver/packager/build.xml +++ b/src/java/org/apache/ivy/plugins/resolver/packager/build.xml @@ -46,7 +46,7 @@ - +