accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [23/29] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Date Tue, 04 Feb 2014 22:58:38 GMT
Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	assemble/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/279024fe
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/279024fe
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/279024fe

Branch: refs/heads/master
Commit: 279024fe900c9964b3db75f39577aee6111de560
Parents: ccffeee 9ff6eea
Author: John Vines <vines@apache.org>
Authored: Tue Feb 4 17:44:35 2014 -0500
Committer: John Vines <vines@apache.org>
Committed: Tue Feb 4 17:44:35 2014 -0500

----------------------------------------------------------------------
 assemble/pom.xml | 4 ++--
 proxy/pom.xml    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/279024fe/assemble/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/279024fe/proxy/pom.xml
----------------------------------------------------------------------
diff --cc proxy/pom.xml
index b57790e,1b2bfa2..522ecfa
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@@ -111,71 -119,5 +111,71 @@@
          </plugins>
        </build>
      </profile>
 +    <profile>
 +      <id>rpm</id>
 +      <build>
 +        <plugins>
 +          <plugin>
 +            <groupId>org.codehaus.mojo</groupId>
 +            <artifactId>rpm-maven-plugin</artifactId>
 +            <executions>
 +              <execution>
 +                <id>build-rpm</id>
 +                <goals>
 +                  <goal>attached-rpm</goal>
 +                </goals>
 +                <phase>package</phase>
 +                <configuration>
 +                  <requires>
 +                    <require>jre &gt;= 1.6.0</require>
 +                    <require>accumulo-core = %{version}-%{release}</require>
 +                  </requires>
 +                  <mappings>
 +                    <mapping>
 +                      <directory>%{_javadir}/accumulo</directory>
 +                      <artifact />
 +                    </mapping>
 +                    <mapping>
 +                      <directory>%{_datadir}/accumulo/proxy</directory>
 +                      <recurseDirectories>true</recurseDirectories>
 +                      <sources>
 +                        <source>
 +                          <location>README</location>
 +                        </source>
 +                        <source>
 +                          <location>proxy.properties</location>
 +                        </source>
 +                        <source>
 +                          <location>examples</location>
 +                        </source>
 +                      </sources>
 +                    </mapping>
 +                    <mapping>
 +                      <directory>%{_datadir}/accumulo/proxy/thrift</directory>
 +                      <sources>
 +                        <source>
 +                          <location>src/main/thrift</location>
 +                          <includes>
 +                            <include>*.thrift</include>
 +                          </includes>
 +                        </source>
 +                        <source>
-                           <location>target</location>
++                          <location>src/main</location>
 +                          <includes>
-                             <include>gen-cpp/**</include>
-                             <include>gen-py/**</include>
-                             <include>gen-rb/**</include>
++                            <include>cpp/**</include>
++                            <include>python/**</include>
++                            <include>ruby/**</include>
 +                          </includes>
 +                        </source>
 +                      </sources>
 +                    </mapping>
 +                  </mappings>
 +                </configuration>
 +              </execution>
 +            </executions>
 +          </plugin>
 +        </plugins>
 +      </build>
 +    </profile>
    </profiles>
  </project>


Mime
View raw message