You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2018/02/16 21:33:42 UTC
[1/4] marmotta git commit: MARMOTTA-668: Updated and fixed the
refpack-plugin
Repository: marmotta
Updated Branches:
refs/heads/develop 4384d61b1 -> eb2776486
MARMOTTA-668: Updated and fixed the refpack-plugin
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/2079e4ec
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/2079e4ec
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/2079e4ec
Branch: refs/heads/develop
Commit: 2079e4ecb4b2ef4c49900a3f53ed54444c93d8c9
Parents: 4384d61
Author: Jakob Frank <ja...@apache.org>
Authored: Fri Feb 16 18:49:06 2018 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Fri Feb 16 18:49:06 2018 +0100
----------------------------------------------------------------------
build/plugins/pom.xml | 15 ++++++------
build/plugins/refpack-maven-plugin/pom.xml | 25 ++++----------------
.../maven/plugins/refpack/RefPackMojo.java | 24 +++++++++----------
build/plugins/repocheck-maven-plugin/pom.xml | 6 +++--
4 files changed, 27 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/2079e4ec/build/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/pom.xml b/build/plugins/pom.xml
index c8affc6..b680532 100644
--- a/build/plugins/pom.xml
+++ b/build/plugins/pom.xml
@@ -30,6 +30,10 @@
<name>Apache Marmotta: Maven Plugins</name>
<description>Marmotta-specific maven plugins</description>
+ <properties>
+ <maven.version>3.1.1</maven.version>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -125,7 +129,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.0.4</version>
+ <version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -136,17 +140,12 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>3.0.4</version>
+ <version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.0.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.2.1</version>
+ <version>${maven.version}</version>
</dependency>
<dependency>
<!-- maven is using commons-logging -->
http://git-wip-us.apache.org/repos/asf/marmotta/blob/2079e4ec/build/plugins/refpack-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/refpack-maven-plugin/pom.xml b/build/plugins/refpack-maven-plugin/pom.xml
index 507737d..27ce68c 100644
--- a/build/plugins/refpack-maven-plugin/pom.xml
+++ b/build/plugins/refpack-maven-plugin/pom.xml
@@ -32,6 +32,10 @@
<name>Maven Refpack Plugin</name>
<description>This Maven Plugin allows generating IzPack Refpack descriptions out of a collection of dependencies</description>
+ <prerequisites>
+ <maven>${maven.version}</maven>
+ </prerequisites>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -41,27 +45,6 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- </dependency>
- <dependency>
- <!-- required in all cases -->
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-api</artifactId>
- <version>1.13.1</version>
- </dependency>
- <dependency>
- <!-- might be superfluous depending on your use case -->
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-util</artifactId>
- <version>1.13.1</version>
- </dependency>
- <dependency>
- <groupId>com.jcabi</groupId>
- <artifactId>jcabi-aether</artifactId>
- <version>0.7.8</version>
- </dependency>
<!-- dependencies to annotations -->
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/2079e4ec/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java
----------------------------------------------------------------------
diff --git a/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java b/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java
index 5fcf7f7..847e9c6 100644
--- a/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java
+++ b/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java
@@ -24,22 +24,22 @@ import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.*;
import org.apache.maven.project.*;
+import org.eclipse.aether.artifact.DefaultArtifact;
import org.jdom2.Element;
import org.jdom2.Text;
import org.jdom2.output.Format;
import org.jdom2.output.XMLOutputter;
-import org.sonatype.aether.RepositorySystem;
-import org.sonatype.aether.RepositorySystemSession;
-import org.sonatype.aether.artifact.Artifact;
-import org.sonatype.aether.collection.CollectRequest;
-import org.sonatype.aether.collection.DependencyCollectionException;
-import org.sonatype.aether.graph.Dependency;
-import org.sonatype.aether.graph.DependencyNode;
-import org.sonatype.aether.repository.RemoteRepository;
-import org.sonatype.aether.resolution.DependencyRequest;
-import org.sonatype.aether.resolution.DependencyResolutionException;
-import org.sonatype.aether.resolution.DependencyResult;
-import org.sonatype.aether.util.artifact.DefaultArtifact;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.collection.CollectRequest;
+import org.eclipse.aether.collection.DependencyCollectionException;
+import org.eclipse.aether.graph.Dependency;
+import org.eclipse.aether.graph.DependencyNode;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.resolution.DependencyRequest;
+import org.eclipse.aether.resolution.DependencyResolutionException;
+import org.eclipse.aether.resolution.DependencyResult;
import java.io.File;
import java.io.FileOutputStream;
http://git-wip-us.apache.org/repos/asf/marmotta/blob/2079e4ec/build/plugins/repocheck-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/repocheck-maven-plugin/pom.xml b/build/plugins/repocheck-maven-plugin/pom.xml
index 9658b67..b755ab7 100644
--- a/build/plugins/repocheck-maven-plugin/pom.xml
+++ b/build/plugins/repocheck-maven-plugin/pom.xml
@@ -31,7 +31,9 @@
<name>Repository Plugin</name>
<description>Check which repository contains which dependencies </description>
-
+ <prerequisites>
+ <maven>${maven.version}</maven>
+ </prerequisites>
<dependencies>
@@ -42,7 +44,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
[2/4] marmotta git commit: update assembly-plugin
Posted by ja...@apache.org.
update assembly-plugin
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/7c1badca
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/7c1badca
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/7c1badca
Branch: refs/heads/develop
Commit: 7c1badca1a5ca4e481637073dd8cf50862e80428
Parents: 2079e4e
Author: Jakob Frank <ja...@apache.org>
Authored: Fri Feb 16 19:20:57 2018 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Fri Feb 16 19:20:57 2018 +0100
----------------------------------------------------------------------
launchers/marmotta-installer/assembly.xml | 4 ----
launchers/marmotta-webapp/assembly.xml | 4 ----
parent/pom.xml | 2 +-
3 files changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/7c1badca/launchers/marmotta-installer/assembly.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/assembly.xml b/launchers/marmotta-installer/assembly.xml
index d097f07..c5eb5cf 100644
--- a/launchers/marmotta-installer/assembly.xml
+++ b/launchers/marmotta-installer/assembly.xml
@@ -33,23 +33,19 @@
<files>
<file>
<source>${project.basedir}/src/main/resources/installer/LICENSE.txt</source>
- <outputDirectory>/</outputDirectory>
<fileMode>0644</fileMode>
</file>
<file>
<source>${project.basedir}/src/main/resources/installer/README.txt</source>
- <outputDirectory>/</outputDirectory>
<fileMode>0644</fileMode>
<filtered>true</filtered>
</file>
<file>
<source>${project.basedir}/src/main/resources/installer/NOTICE.txt</source>
- <outputDirectory>/</outputDirectory>
<fileMode>0644</fileMode>
</file>
<file>
<source>${project.build.directory}/marmotta-installer-${project.version}.jar</source>
- <outputDirectory>/</outputDirectory>
<fileMode>0644</fileMode>
</file>
</files>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/7c1badca/launchers/marmotta-webapp/assembly.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/assembly.xml b/launchers/marmotta-webapp/assembly.xml
index cd76e27..19e5dc7 100644
--- a/launchers/marmotta-webapp/assembly.xml
+++ b/launchers/marmotta-webapp/assembly.xml
@@ -33,24 +33,20 @@
<file>
<source>${project.basedir}/src/main/webapp/META-INF/LICENSE</source>
<destName>LICENSE.txt</destName>
- <outputDirectory>/</outputDirectory>
<fileMode>0644</fileMode>
</file>
<file>
<source>${project.basedir}/src/main/doc/README.txt</source>
- <outputDirectory>/</outputDirectory>
<fileMode>0644</fileMode>
<filtered>true</filtered>
</file>
<file>
<source>${project.basedir}/src/main/webapp/META-INF/NOTICE</source>
<destName>NOTICE.txt</destName>
- <outputDirectory>/</outputDirectory>
<fileMode>0644</fileMode>
</file>
<file>
<source>${project.build.directory}/marmotta.war</source>
- <outputDirectory>/</outputDirectory>
<fileMode>0644</fileMode>
</file>
</files>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/7c1badca/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 715bce0..051c251 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -561,7 +561,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5.4</version>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
[3/4] marmotta git commit: fixed RAT check (missing license headers
in source files)
Posted by ja...@apache.org.
fixed RAT check (missing license headers in source files)
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/0726f498
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/0726f498
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/0726f498
Branch: refs/heads/develop
Commit: 0726f498412b4f138ca2aa09999762615c11a19f
Parents: 7c1badc
Author: Jakob Frank <ja...@apache.org>
Authored: Fri Feb 16 19:22:59 2018 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Fri Feb 16 19:22:59 2018 +0100
----------------------------------------------------------------------
Dockerfile | 16 ++++++++++++++++
libraries/ostrich/Dockerfile | 16 ++++++++++++++++
pom.xml | 1 +
3 files changed, 33 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/0726f498/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
index 60b6a4c..42a8cf6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,19 @@
+# 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.
+#
# Dockerfile for Apache Marmotta
FROM debian:jessie-backports
http://git-wip-us.apache.org/repos/asf/marmotta/blob/0726f498/libraries/ostrich/Dockerfile
----------------------------------------------------------------------
diff --git a/libraries/ostrich/Dockerfile b/libraries/ostrich/Dockerfile
index 03f1567..43a156a 100644
--- a/libraries/ostrich/Dockerfile
+++ b/libraries/ostrich/Dockerfile
@@ -1,3 +1,19 @@
+# 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.
+#
# Dockerfile for Apache Marmotta Ostrich Triplestore
FROM debian:stretch
http://git-wip-us.apache.org/repos/asf/marmotta/blob/0726f498/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1553ed6..360fdf5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -251,6 +251,7 @@
<!-- Some extra files not covered by the default excludes -->
<exclude>.git/**</exclude>
<exclude>.gitignore</exclude>
+ <exclude>.github/PULL_REQUEST_TEMPLATE.md</exclude>
<exclude>.idea/**</exclude>
<exclude>atlassian-ide-plugin.xml</exclude>
<exclude>**/.dockerignore</exclude>
[4/4] marmotta git commit: trying to get travis back working
Posted by ja...@apache.org.
trying to get travis back working
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/eb277648
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/eb277648
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/eb277648
Branch: refs/heads/develop
Commit: eb2776486dc0863714eac878a1de392b24296174
Parents: 0726f49
Author: Jakob Frank <ja...@apache.org>
Authored: Fri Feb 16 19:43:27 2018 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Fri Feb 16 19:43:27 2018 +0100
----------------------------------------------------------------------
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/eb277648/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index aad6f0e..c5caed5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@
#
language: java
-
+dist: precise
sudo: false
branches: