On 19/09/12 13:47, Svante Schubert wrote: > PS: As you are already an apache committer, I have used your patch from > the mail attachment. I believe the correct way is to take the attachment > from an issue, but no time for the mail ping-pong atm.. ;)
well having to file a bug for every trivial patch is rather cumbersome :) > On 19.09.2012 13:38, Svante Schubert wrote: >> Hi Michael, >> >> I have applied your patches manual, as the merge did not work out well. merge? that's odd, i thought i had the latest trunk. >> If you like even provide GIT patches and/or use github, as we have a git >> read-access. >> Downside it is only read-only, but I prefer to copy the diff over to a >> svn rep. i'm using git-svn here which would allow pushing as well... >> Some notes and changes to your patch noted below... >> >> On 13.09.2012 20:08, Michael Stahl wrote: >>> a .jar file with the sources (the point of which escapes >>> me), and a validator-with-all-dependencies.jar file. the latter looked >>> promising until it became apparent that it didn't, uhmmm, include the >>> actual validator classes, so it didn't run. >>> >>> attached is my attempt to fix this; i failed to somehow add extra files >>> to the existing "assembly" thing so just copied its definition from the >>> maven website and added the target/classes, which seems to work but is >>> likely not the best way to do this (please note that i know absolutely >>> nothing about maven). >> The manifest entry was wrong, I fixed the correct spelling, did you >> tested it? hmm it worked very well here, the jar i've built [1] contains this manifest: > Manifest-Version: 1.0 > Archiver-Version: Plexus Archiver > Created-By: Apache Maven > Built-By: ms > Build-Jdk: 1.6.0_24 > Main-Class: org.odftoolkit.odfvalidator.Main [1] http://people.freedesktop.org/~mst/odfvalidator-1.1.6-incubating-SNAPSHOT-jar-with-dependencies.jar >> As you have no test case provided you need to test the latest update.. ;) after fixing the broken license comment/XML declaration (see attachment) it worked fine here. >>> also i've noticed the lack of a .gitignore hence the second patch. >> Apache is using Subversion as their house version system, but as I use >> mainly git myself, I added it, although moved it to root level. uhm, it was at the root level. but thanks for committing it :)
From 8d8a7f47349db1680a6ef82e0ad74b05c4a67e12 Mon Sep 17 00:00:00 2001 From: Michael Stahl <[email protected]> Date: Wed, 19 Sep 2012 22:51:48 +0200 Subject: [PATCH] validator: fix broken XML declaration in assembly file --- validator/src/main/assembly/src.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/validator/src/main/assembly/src.xml b/validator/src/main/assembly/src.xml index a670895..afa435c 100644 --- a/validator/src/main/assembly/src.xml +++ b/validator/src/main/assembly/src.xml @@ -1,3 +1,4 @@ +<?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 @@ -14,7 +15,6 @@ See the License for the specific language governing permissions and limitations under the License. --> -<?xml version="1.0" encoding="UTF-8"?> <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd";> -- 1.7.7.6
