You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2015/04/03 13:40:42 UTC
[1/2] directory-fortress-core git commit: bumped up some dependencies
version, make the pom depend on 'project' instead of a parent pom,
removed the apache-release profile
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 3bbafab58 -> 7f1f90d2b
bumped up some dependencies version, make the pom depend on 'project' instead of a parent pom, removed the apache-release profile
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/37178658
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/37178658
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/37178658
Branch: refs/heads/master
Commit: 371786589a65b4834420a9ec30f8b9bb85a02ee6
Parents: 3bbafab
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Fri Apr 3 13:39:57 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Fri Apr 3 13:39:57 2015 +0200
----------------------------------------------------------------------
pom.xml | 67 +++---------------------------------------------------------
1 file changed, 3 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/37178658/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 286beb0..e7c84f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,12 +19,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <!--parent>
- <groupId>org.apache.directory.fortress</groupId>
- <artifactId>fortress-parent</artifactId>
- <version>1.0-RC40-SNAPSHOT</version>
- </parent-->
-
<parent>
<groupId>org.apache.directory.project</groupId>
<artifactId>project</artifactId>
@@ -32,7 +26,6 @@
<relativePath />
</parent>
- <!--groupId>org.apache.directory.fortress</groupId-->
<artifactId>fortress-core</artifactId>
<packaging>jar</packaging>
<name>Apache Fortress Core</name>
@@ -90,7 +83,7 @@
<version.ant.launcher>1.9.1</version.ant.launcher>
<version.antlr>2.7.7</version.antlr>
<version.apacheds>2.0.0-M19</version.apacheds>
- <version.api.all>1.0.0-M28</version.api.all>
+ <version.api.all>1.0.0-M29</version.api.all>
<version.commons.beanutils>1.7.0</version.commons.beanutils>
<version.commons.beanutils-core>1.8.0</version.commons.beanutils-core>
<version.commons.codec>1.2</version.commons.codec>
@@ -115,8 +108,8 @@
<version.junit>4.12</version.junit>
<version.log4j>1.2.17</version.log4j>
<version.mina.core>2.0.8</version.mina.core>
- <version.slf4j.api>1.7.10</version.slf4j.api>
- <version.slf4j.log4j12>1.7.10</version.slf4j.log4j12>
+ <version.slf4j.api>1.7.12</version.slf4j.api>
+ <version.slf4j.log4j12>1.7.12</version.slf4j.log4j12>
<version.stax2.api>3.1.1</version.stax2.api>
<version.opencsv>2.3</version.opencsv>
<version.woodstox.core.asl>4.2.0</version.woodstox.core.asl>
@@ -458,7 +451,6 @@
<systemPropertyVariables>
<version>${project.version}</version>
</systemPropertyVariables>
-<!-- <testFailureIgnore>true</testFailureIgnore>-->
<excludes>
<exclude>${exclude.tests}</exclude>
</excludes>
@@ -473,15 +465,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <arguments>${release.arguments}</arguments>
- <tagNameFormat>@{project.version}</tagNameFormat>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
@@ -657,50 +640,6 @@
</build>
<profiles>
- <!-- Build the packages : mvn -Papache-release -->
- <profile>
- <id>apache-release</id>
-
- <build>
- <finalName>fortress-core-${project.version}</finalName>
-
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
-
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
<!-- To execute: mvn -Pconsole test -->
<profile>
<id>console</id>
[2/2] directory-fortress-core git commit: removed the assembly files,
they are not used anymore
Posted by el...@apache.org.
removed the assembly files, they are not used anymore
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/7f1f90d2
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/7f1f90d2
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/7f1f90d2
Branch: refs/heads/master
Commit: 7f1f90d2ba75a28a0cd83482d511c1fd849b2d6a
Parents: 3717865
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Fri Apr 3 13:40:28 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Fri Apr 3 13:40:28 2015 +0200
----------------------------------------------------------------------
src/main/assembly/bin.xml | 78 ----------------------------------------
src/main/assembly/src.xml | 80 ------------------------------------------
2 files changed, 158 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7f1f90d2/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml
deleted file mode 100644
index a8f55f6..0000000
--- a/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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.
--->
-<assembly>
- <id>bin</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
-
- <!-- Now copy the other files, excluding the files we don't want -->
- <fileSets>
- <!-- Copy licenses into '/' -->
- <fileSet>
- <directory>..</directory>
- <outputDirectory/>
- <includes>
- <include>LICENSE*</include>
- <include>NOTICE</include>
- </includes>
- </fileSet>
-
- <!-- Copy Javadoc into '/docs' -->
- <fileSet>
- <directory>../target/site</directory>
- <outputDirectory>docs</outputDirectory>
- <includes>
- <include>apidocs*/**</include>
- <include>xref*/**</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <!-- Copy Fortress Core modules into '/dist' -->
- <dependencySet>
- <outputDirectory>dist</outputDirectory>
- <includes>
- <!-- Including only Fortress Core modules -->
- <include>${project.groupId}:*</include>
- </includes>
-
- <excludes>
- <!-- Excluding sources jars -->
- <exclude>*:sources</exclude>
- </excludes>
- </dependencySet>
-
- <!-- Copy Fortress Core dependencies into '/lib' -->
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <excludes>
- <!-- Excluding Fortress Core modules -->
- <exclude>${project.groupId}:*</exclude>
-
- <!-- Excluding sources jars -->
- <exclude>*:sources</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7f1f90d2/src/main/assembly/src.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml
deleted file mode 100644
index bf20858..0000000
--- a/src/main/assembly/src.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?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.
--->
-<assembly>
- <id>src</id>
- <formats>
- <format>tar.gz</format>
- <format>tar.bz2</format>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <!-- Copy licenses into '/' -->
- <fileSet>
- <directory>.</directory>
- <outputDirectory/>
- <includes>
- <include>README*</include>
- <include>LICENSE*</include>
- <include>NOTICE</include>
- </includes>
- </fileSet>
-
- <!-- Copy Javadoc into '/docs' -->
- <fileSet>
- <directory>./target/site</directory>
- <outputDirectory>docs</outputDirectory>
- <includes>
- <include>apidocs*/**</include>
- <include>xref*/**</include>
- </includes>
- </fileSet>
-
- <!-- Copy sources into '/src' -->
- <fileSet>
- <directory>.</directory>
- <outputDirectory/>
- <includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <exclude>.git/**</exclude>
- <exclude>KEYS</exclude>
- <exclude>LICENSE-bin</exclude>
- <exclude>NOTICE</exclude>
- <exclude>**/target</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/.settings</exclude>
- <exclude>**/.settings/**</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/*.gen</exclude>
- <exclude>**/.wtpmodules</exclude>
- <exclude>**/surefire*</exclude>
- <exclude>**/cobertura.ser</exclude>
- <exclude>**/velocity.log</exclude>
- <exclude>**/release.properties</exclude>
- <exclude>**/pom.xml.releaseBackup</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-
-</assembly>