commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sebb <seb...@gmail.com>
Subject Re: [Math] Branch "master" modified, should have been "develop" (Was: [math] Standard Maven directory layout)
Date Tue, 19 Apr 2016 00:00:36 GMT
Sorry, my mistake.

Feel free to revert (I'm not very familiar with Git)

On 19 April 2016 at 00:38, Gilles <gilles@harfang.homelinux.org> wrote:
> Hi.
>
> Is there a reason why those changes were done in "master" rather than
> "develop"?
>
> Regards,
> Gilles
>
> On Mon, 18 Apr 2016 23:22:35 +0000 (UTC), sebb@apache.org wrote:
>>
>> Repository: commons-math
>> Updated Branches:
>>   refs/heads/master 050dfa6f0 -> 5bbd826e2
>>
>>
>> Standard Maven directory layout
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo
>> Commit:
>> http://git-wip-us.apache.org/repos/asf/commons-math/commit/5bbd826e
>> Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/5bbd826e
>> Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/5bbd826e
>>
>> Branch: refs/heads/master
>> Commit: 5bbd826e2f4332b0de439d2b4693347f4f2f8f9c
>> Parents: 050dfa6
>> Author: Sebb <sebb@apache.org>
>> Authored: Tue Apr 19 00:22:17 2016 +0100
>> Committer: Sebb <sebb@apache.org>
>> Committed: Tue Apr 19 00:22:17 2016 +0100
>>
>>
>> ----------------------------------------------------------------------
>>  pom.xml                   |  4 ++--
>>  src/assembly/bin.xml      | 51 ++++++++++++++++++++++++++++++++++++++++++
>>  src/assembly/src.xml      | 44 ++++++++++++++++++++++++++++++++++++
>>  src/main/assembly/bin.xml | 51 ------------------------------------------
>>  src/main/assembly/src.xml | 44 ------------------------------------
>>  5 files changed, 97 insertions(+), 97 deletions(-)
>>
>> ----------------------------------------------------------------------
>>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/commons-math/blob/5bbd826e/pom.xml
>>
>> ----------------------------------------------------------------------
>> diff --git a/pom.xml b/pom.xml
>> index 145c0d6..8f633af 100644
>> --- a/pom.xml
>> +++ b/pom.xml
>> @@ -439,8 +439,8 @@
>>            <artifactId>maven-assembly-plugin</artifactId>
>>            <configuration>
>>              <descriptors>
>> -              <descriptor>src/main/assembly/src.xml</descriptor>
>> -              <descriptor>src/main/assembly/bin.xml</descriptor>
>> +              <descriptor>src/assembly/src.xml</descriptor>
>> +              <descriptor>src/assembly/bin.xml</descriptor>
>>              </descriptors>
>>              <!-- There are a lot of long file names. Suppress the
>> warnings. -->
>>              <tarLongFileMode>gnu</tarLongFileMode>
>>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/commons-math/blob/5bbd826e/src/assembly/bin.xml
>>
>> ----------------------------------------------------------------------
>> diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
>> new file mode 100644
>> index 0000000..9cbca84
>> --- /dev/null
>> +++ b/src/assembly/bin.xml
>> @@ -0,0 +1,51 @@
>> +<?xml version="1.0"?>
>> +<!--
>> +   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.
>> +-->
>> +
>> +<assembly>
>> +  <id>bin</id>
>> +  <formats>
>> +    <format>tar.gz</format>
>> +    <format>zip</format>
>> +  </formats>
>> +  <includeSiteDirectory>false</includeSiteDirectory>
>> +  <fileSets>
>> +    <fileSet>
>> +      <includes>
>> +        <include>LICENSE*</include>
>> +        <include>NOTICE*</include>
>> +        <include>RELEASE-NOTES.txt</include>
>> +      </includes>
>> +    </fileSet>
>> +    <fileSet>
>> +      <directory>target</directory>
>> +      <outputDirectory></outputDirectory>
>> +      <includes>
>> +        <include>*.jar</include>
>> +      </includes>
>> +    </fileSet>
>> +    <fileSet>
>> +      <directory>target/site</directory>
>> +      <outputDirectory>docs</outputDirectory>
>> +      <excludes>
>> +        <exclude>**/customsorttypes.js</exclude>
>> +        <exclude>**/sortabletable.js</exclude>
>> +        <exclude>**/stringbuilder.js</exclude>
>> +      </excludes>
>> +    </fileSet>
>> +  </fileSets>
>> +</assembly>
>>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/commons-math/blob/5bbd826e/src/assembly/src.xml
>>
>> ----------------------------------------------------------------------
>> diff --git a/src/assembly/src.xml b/src/assembly/src.xml
>> new file mode 100644
>> index 0000000..679bff1
>> --- /dev/null
>> +++ b/src/assembly/src.xml
>> @@ -0,0 +1,44 @@
>> +<?xml version="1.0"?>
>> +<!--
>> +   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.
>> +-->
>> +<assembly>
>> +  <id>src</id>
>> +  <formats>
>> +    <format>tar.gz</format>
>> +    <format>zip</format>
>> +  </formats>
>> +  <baseDirectory>
>> +     ${project.artifactId}-${commons.release.version}-src
>> +  </baseDirectory>
>> +  <fileSets>
>> +    <fileSet>
>> +      <includes>
>> +        <include>*.txt</include>
>> +        <include>*.xml</include>
>> +      </includes>
>> +    </fileSet>
>> +    <fileSet>
>> +      <directory>src</directory>
>> +      <excludes>
>> +        <exclude>**/mantissa/**</exclude>
>> +        <exclude>**/experimental/**</exclude>
>> +        <exclude>**/download*.cgi</exclude>
>> +      </excludes>
>> +    </fileSet>
>> +  </fileSets>
>> +</assembly>
>> +
>>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/commons-math/blob/5bbd826e/src/main/assembly/bin.xml
>>
>> ----------------------------------------------------------------------
>> diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml
>> deleted file mode 100644
>> index 9cbca84..0000000
>> --- a/src/main/assembly/bin.xml
>> +++ /dev/null
>> @@ -1,51 +0,0 @@
>> -<?xml version="1.0"?>
>> -<!--
>> -   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.
>> --->
>> -
>> -<assembly>
>> -  <id>bin</id>
>> -  <formats>
>> -    <format>tar.gz</format>
>> -    <format>zip</format>
>> -  </formats>
>> -  <includeSiteDirectory>false</includeSiteDirectory>
>> -  <fileSets>
>> -    <fileSet>
>> -      <includes>
>> -        <include>LICENSE*</include>
>> -        <include>NOTICE*</include>
>> -        <include>RELEASE-NOTES.txt</include>
>> -      </includes>
>> -    </fileSet>
>> -    <fileSet>
>> -      <directory>target</directory>
>> -      <outputDirectory></outputDirectory>
>> -      <includes>
>> -        <include>*.jar</include>
>> -      </includes>
>> -    </fileSet>
>> -    <fileSet>
>> -      <directory>target/site</directory>
>> -      <outputDirectory>docs</outputDirectory>
>> -      <excludes>
>> -        <exclude>**/customsorttypes.js</exclude>
>> -        <exclude>**/sortabletable.js</exclude>
>> -        <exclude>**/stringbuilder.js</exclude>
>> -      </excludes>
>> -    </fileSet>
>> -  </fileSets>
>> -</assembly>
>>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/commons-math/blob/5bbd826e/src/main/assembly/src.xml
>>
>> ----------------------------------------------------------------------
>> diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml
>> deleted file mode 100644
>> index 679bff1..0000000
>> --- a/src/main/assembly/src.xml
>> +++ /dev/null
>> @@ -1,44 +0,0 @@
>> -<?xml version="1.0"?>
>> -<!--
>> -   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.
>> --->
>> -<assembly>
>> -  <id>src</id>
>> -  <formats>
>> -    <format>tar.gz</format>
>> -    <format>zip</format>
>> -  </formats>
>> -  <baseDirectory>
>> -     ${project.artifactId}-${commons.release.version}-src
>> -  </baseDirectory>
>> -  <fileSets>
>> -    <fileSet>
>> -      <includes>
>> -        <include>*.txt</include>
>> -        <include>*.xml</include>
>> -      </includes>
>> -    </fileSet>
>> -    <fileSet>
>> -      <directory>src</directory>
>> -      <excludes>
>> -        <exclude>**/mantissa/**</exclude>
>> -        <exclude>**/experimental/**</exclude>
>> -        <exclude>**/download*.cgi</exclude>
>> -      </excludes>
>> -    </fileSet>
>> -  </fileSets>
>> -</assembly>
>> -
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
> For additional commands, e-mail: dev-help@commons.apache.org
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org


Mime
View raw message