You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commonsrdf.apache.org by st...@apache.org on 2016/10/30 09:04:35 UTC
[1/2] incubator-commonsrdf git commit: tabs -> spaces in pom.xml
Repository: incubator-commonsrdf
Updated Branches:
refs/heads/master ac145ca13 -> baf6f6ed0
tabs -> spaces in pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/0a92d0db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/0a92d0db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/0a92d0db
Branch: refs/heads/master
Commit: 0a92d0db670c137cc6b88a508efa70efde975751
Parents: ac145ca
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Sun Oct 30 09:03:20 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Sun Oct 30 09:03:20 2016 +0000
----------------------------------------------------------------------
pom.xml | 88 ++++++++++++++++++++++++++++++------------------------------
1 file changed, 44 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/0a92d0db/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ddd23cd..59a03cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -239,10 +239,10 @@
<module>integration-tests</module>
</modules>
- <!--
- Common dependencies across modules.
- Keep this list small and only <scope>test</scope> !
- -->
+ <!--
+ Common dependencies across modules.
+ Keep this list small and only <scope>test</scope> !
+ -->
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -250,14 +250,14 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <!-- System.err logging for Jena, JSONLD-Java, RDF4J
- -->
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <!-- System.err logging for Jena, JSONLD-Java, RDF4J
+ -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -311,12 +311,12 @@
</executions>
<configuration>
<additionalparam>-Xdoclint:all</additionalparam>
- <links>
- <link>${commons.javadoc.java.link}</link>
- <link>https://jena.apache.org/documentation/javadoc/jena/</link>
- <link>https://jena.apache.org/documentation/javadoc/arq/</link>
- <link>http://rdf4j.org/javadoc/2.0/</link>
- </links>
+ <links>
+ <link>${commons.javadoc.java.link}</link>
+ <link>https://jena.apache.org/documentation/javadoc/jena/</link>
+ <link>https://jena.apache.org/documentation/javadoc/arq/</link>
+ <link>http://rdf4j.org/javadoc/2.0/</link>
+ </links>
</configuration>
</plugin>
<!--
@@ -429,37 +429,37 @@
</action>
</pluginExecution>
<pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <versionRange>[2.5.3,)</versionRange>
- <goals>
- <goal>manifest</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
+ <pluginExecutionFilter>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <versionRange>[2.5.3,)</versionRange>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
- <plugin>
- <!-- Check if we broke compatibibility against previous release -->
- <groupId>com.github.siom79.japicmp</groupId>
- <artifactId>japicmp-maven-plugin</artifactId>
- <version>${commons.japicmp.version}</version>
- <configuration>
- <parameter>
- <!-- Tell japicmp about the -incubator suffix -->
- <oldVersionPattern>\d+\.\d+\.\d+\-incubating</oldVersionPattern>
- <!-- japicmp requires "mvn package site" - below means "mvn
- site" still works (but without japicmp report) -->
- <ignoreMissingNewVersion/>
- </parameter>
- </configuration>
- </plugin>
+ <plugin>
+ <!-- Check if we broke compatibibility against previous release -->
+ <groupId>com.github.siom79.japicmp</groupId>
+ <artifactId>japicmp-maven-plugin</artifactId>
+ <version>${commons.japicmp.version}</version>
+ <configuration>
+ <parameter>
+ <!-- Tell japicmp about the -incubator suffix -->
+ <oldVersionPattern>\d+\.\d+\.\d+\-incubating</oldVersionPattern>
+ <!-- japicmp requires "mvn package site" - below means "mvn
+ site" still works (but without japicmp report) -->
+ <ignoreMissingNewVersion/>
+ </parameter>
+ </configuration>
+ </plugin>
<!--
<plugin>
[2/2] incubator-commonsrdf git commit: tweaks
Posted by st...@apache.org.
<finalName> tweaks
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/baf6f6ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/baf6f6ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/baf6f6ed
Branch: refs/heads/master
Commit: baf6f6ed0358492b8ec0adfd982dfc716dad56e2
Parents: 0a92d0d
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Sun Oct 30 09:03:35 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Sun Oct 30 09:03:35 2016 +0000
----------------------------------------------------------------------
pom.xml | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/baf6f6ed/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 59a03cc..817c9d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -290,13 +290,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <configuration>
- <finalName>apache-commons-rdf-${project.version}</finalName>
- </configuration>
- </execution>
- </executions>
+ <configuration>
+ <finalName>apache-commons-rdf-${project.version}</finalName>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -335,7 +331,9 @@
<artifactId>maven-release-plugin</artifactId>
<configuration>
<useReleaseProfile>true</useReleaseProfile>
- <!-- TODO: Use apache-parent's apache-release rather than common-parent's release? -->
+ <!-- TODO: Can we use apache-parent's apache-release rather than common-parent's release?
+ It seems to force adding a -source-release
+ -->
<releaseProfiles>release</releaseProfiles>
<goals>deploy</goals>
<autoVersionSubmodules>true</autoVersionSubmodules>
@@ -583,8 +581,11 @@
<profiles>
<profile>
<id>release</id>
- <!-- extends the release profile from commons -->
+ <!-- extends the release profile from commons -->
<build>
+ <!--
+ <finalName>apache-commons-rdf-${project.version}</finalName>
+-->
<plugins>
<!-- Generate convenience *.md5 *.sha1 files for dist puropses -->
<plugin>
@@ -625,6 +626,7 @@
</plugin>
<plugin>
+ <!-- Avoid making *.asc.asc -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<configuration>