aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorolivier lamy <olamy@apache.org>2017-06-24 10:21:14 +1000
committerolivier lamy <olamy@apache.org>2017-06-24 10:21:14 +1000
commit58ac86f011603664b34dfc5089c1a998d7fdbbc9 (patch)
treedcf83d5b22c1b23c8ce08e1478ee03fdcf9298a9
parent0bfead8264c924e832a9672f85516e0bf69c5cd8 (diff)
downloadarchiva-58ac86f011603664b34dfc5089c1a998d7fdbbc9.tar.gz
archiva-58ac86f011603664b34dfc5089c1a998d7fdbbc9.zip
force jcr save
Signed-off-by: olivier lamy <olamy@apache.org>
-rw-r--r--archiva-modules/archiva-base/archiva-proxy-common/pom.xml4
-rw-r--r--archiva-modules/plugins/metadata-store-jcr/pom.xml2
-rw-r--r--archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java9
3 files changed, 9 insertions, 6 deletions
diff --git a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml b/archiva-modules/archiva-base/archiva-proxy-common/pom.xml
index 5fa20f65d..42226575f 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>
diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml
index 831b639b0..94eba17a2 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>
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 a232391f0..e87d53f98 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 )
{