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 2014/04/10 06:36:46 UTC
[1/4] git commit: fix archetype compiler target/source
Repository: archiva
Updated Branches:
refs/heads/master edb1bd05d -> 03601570e
fix archetype compiler target/source
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/25c1e7e9
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/25c1e7e9
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/25c1e7e9
Branch: refs/heads/master
Commit: 25c1e7e9a4ab04f94420a2ee38cdabfc950b901b
Parents: edb1bd0
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Apr 10 14:12:45 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Apr 10 14:12:45 2014 +1000
----------------------------------------------------------------------
.../src/main/resourcesstatic/archetype-resources/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/25c1e7e9/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
index 81d7d33..6d15c51 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
@@ -313,8 +313,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
<plugin>
[2/4] git commit: fix that as it is wrong and cause issues with idea
Posted by ol...@apache.org.
fix that as it is wrong and cause issues with idea
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/608103d5
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/608103d5
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/608103d5
Branch: refs/heads/master
Commit: 608103d59326cb86c6962b874ed991dd13e3df2c
Parents: 25c1e7e
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Apr 10 14:27:32 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Apr 10 14:27:32 2014 +1000
----------------------------------------------------------------------
pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/608103d5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 92b480c..0cedcc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,6 @@
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-parent</artifactId>
<version>13-SNAPSHOT</version>
- <relativePath />
</parent>
<artifactId>archiva</artifactId>
[3/4] git commit: fix idea warning
Posted by ol...@apache.org.
fix idea warning
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/0bb58b73
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/0bb58b73
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/0bb58b73
Branch: refs/heads/master
Commit: 0bb58b73ab27f984d5f08af35ed2b3bc572d956b
Parents: 608103d
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Apr 10 14:27:45 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Apr 10 14:27:45 2014 +1000
----------------------------------------------------------------------
archiva-modules/archiva-web/archiva-webapp-test/pom.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/0bb58b73/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
index 8b41f86..4eaaa1f 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
@@ -38,6 +38,8 @@
<seleniumPluginVersion>2.3</seleniumPluginVersion>
<selenium-server.version>2.40.0</selenium-server.version>
<fluentlenium.version>0.9.2</fluentlenium.version>
+
+ <browserPath></browserPath>
</properties>
<dependencies>
[4/4] git commit: my bad fix compilation
Posted by ol...@apache.org.
my bad fix compilation
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/03601570
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/03601570
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/03601570
Branch: refs/heads/master
Commit: 03601570ef70ec4c1ae9f2b992333b8200c016d5
Parents: 0bb58b7
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Apr 10 14:36:30 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Apr 10 14:36:30 2014 +1000
----------------------------------------------------------------------
.../java/org/apache/archiva/proxy/AbstractProxyTestCase.java | 6 +++---
.../java/org/apache/archiva/proxy/MetadataTransferTest.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/03601570/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
index 98c17a9..e3f39d2 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
@@ -144,9 +144,9 @@ public abstract class AbstractProxyTestCase
config =
(MockConfiguration) applicationContext.getBean( "archivaConfiguration#mock", ArchivaConfiguration.class );
- config.getConfiguration().setManagedRepositories( new ArrayList<>() );
- config.getConfiguration().setRemoteRepositories( new ArrayList<>() );
- config.getConfiguration().setProxyConnectors( new ArrayList<>() );
+ config.getConfiguration().setManagedRepositories( new ArrayList<ManagedRepositoryConfiguration>() );
+ config.getConfiguration().setRemoteRepositories( new ArrayList<RemoteRepositoryConfiguration>() );
+ config.getConfiguration().setProxyConnectors( new ArrayList<ProxyConnectorConfiguration>() );
// Setup source repository (using default layout)
String name = getClass().getSimpleName();
http://git-wip-us.apache.org/repos/asf/archiva/blob/03601570/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java
index 24624b2..ed7f04b 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java
@@ -186,7 +186,7 @@ public class MetadataTransferTest
String requestedResource = "org/apache/maven/test/get-default-metadata-nonexistant/maven-metadata.xml";
setupTestableManagedRepository( requestedResource );
- config.getConfiguration().setProxyConnectors( new ArrayList<>( ) );
+ config.getConfiguration().setProxyConnectors( new ArrayList<ProxyConnectorConfiguration>( ) );
assertResourceNotFound( requestedResource );
@@ -206,7 +206,7 @@ public class MetadataTransferTest
String requestedResource = "org/apache/maven/test/get-project-metadata/maven-metadata.xml";
setupTestableManagedRepository( requestedResource );
- config.getConfiguration().setProxyConnectors( new ArrayList<>( ) );
+ config.getConfiguration().setProxyConnectors( new ArrayList<ProxyConnectorConfiguration>( ) );
assertResourceExists( requestedResource );
@@ -333,7 +333,7 @@ public class MetadataTransferTest
setupTestableManagedRepository( requestedResource );
- config.getConfiguration().setProxyConnectors( new ArrayList<>( ) );
+ config.getConfiguration().setProxyConnectors( new ArrayList<ProxyConnectorConfiguration>( ) );
// Configure Connector (usually done within archiva.xml configuration)
saveConnector( ID_DEFAULT_MANAGED, ID_PROXIED1, ChecksumPolicy.FIX, ReleasesPolicy.ALWAYS,
SnapshotsPolicy.ALWAYS, CachedFailuresPolicy.NO, false );