You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2017/06/24 00:21:27 UTC
archiva git commit: force jcr save
Repository: archiva
Updated Branches:
refs/heads/feature/jcr_oak 0bfead826 -> 58ac86f01
force jcr save
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/58ac86f0
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/58ac86f0
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/58ac86f0
Branch: refs/heads/feature/jcr_oak
Commit: 58ac86f011603664b34dfc5089c1a998d7fdbbc9
Parents: 0bfead8
Author: olivier lamy <ol...@apache.org>
Authored: Sat Jun 24 10:21:14 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Sat Jun 24 10:21:14 2017 +1000
----------------------------------------------------------------------
archiva-modules/archiva-base/archiva-proxy-common/pom.xml | 4 ++++
archiva-modules/plugins/metadata-store-jcr/pom.xml | 2 +-
.../metadata/repository/jcr/JcrMetadataRepositoryTest.java | 9 ++++-----
3 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/58ac86f0/archiva-modules/archiva-base/archiva-proxy-common/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml b/archiva-modules/archiva-base/archiva-proxy-common/pom.xml
index 5fa20f6..4222657 100644
--- a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml
+++ b/archiva-modules/archiva-base/archiva-proxy-common/pom.xml
@@ -37,6 +37,10 @@
<artifactId>archiva-repository-admin-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-common</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/archiva/blob/58ac86f0/archiva-modules/plugins/metadata-store-jcr/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml
index 831b639..94eba17 100644
--- a/archiva-modules/plugins/metadata-store-jcr/pom.xml
+++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml
@@ -29,7 +29,7 @@
<packaging>bundle</packaging>
<name>Archiva Core Plugins :: JCR Storage for Metadata</name>
<properties>
- <jcr-oak.version>1.7.1</jcr-oak.version>
+ <jcr-oak.version>1.7.2</jcr-oak.version>
</properties>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/archiva/blob/58ac86f0/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java b/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java
index a232391..e87d53f 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java
+++ b/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java
@@ -19,7 +19,6 @@ package org.apache.archiva.metadata.repository.jcr;
* under the License.
*/
-import com.google.common.base.Objects;
import org.apache.archiva.metadata.model.MetadataFacetFactory;
import org.apache.archiva.metadata.repository.AbstractMetadataRepositoryTest;
import org.apache.commons.io.FileUtils;
@@ -29,13 +28,13 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.springframework.context.ApplicationContext;
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
import javax.inject.Inject;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
public class JcrMetadataRepositoryTest
extends AbstractMetadataRepositoryTest
@@ -58,7 +57,6 @@ public class JcrMetadataRepositoryTest
RepositoryFactory factory = new RepositoryFactory();
factory.setRepositoryPath( directory.getPath() );
jcrRepository = factory.createRepository();
-
}
@Before
@@ -83,6 +81,7 @@ public class JcrMetadataRepositoryTest
// removing content is faster than deleting and re-copying the files from target/jcr
session.getRootNode().getNode( "repositories" ).remove();
+ session.save();
}
catch ( RepositoryException e )
{