Skip to content
Browse files

Post merge fixes.

  • Loading branch information...
1 parent a830402 commit 1be96ba8683e8261add28a2b1e64302f80d4caf0 @cstamas cstamas committed Dec 5, 2012
View
2 nexus/nexus-core/src/main/java/org/sonatype/nexus/configuration/Configurable.java
@@ -1,4 +1,4 @@
-/**
+/*
* Sonatype Nexus (TM) Open Source Version
* Copyright (c) 2007-2012 Sonatype, Inc.
* All rights reserved. Includes the third-party code listed at http://links.sonatype.com/products/nexus/oss/attributions.
View
2 nexus/nexus-core/src/main/java/org/sonatype/nexus/configuration/CoreConfiguration.java
@@ -1,4 +1,4 @@
-/**
+/*
* Sonatype Nexus (TM) Open Source Version
* Copyright (c) 2007-2012 Sonatype, Inc.
* All rights reserved. Includes the third-party code listed at http://links.sonatype.com/products/nexus/oss/attributions.
View
2 nexus/nexus-core/src/main/java/org/sonatype/nexus/configuration/ExternalConfiguration.java
@@ -1,4 +1,4 @@
-/**
+/*
* Sonatype Nexus (TM) Open Source Version
* Copyright (c) 2007-2012 Sonatype, Inc.
* All rights reserved. Includes the third-party code listed at http://links.sonatype.com/products/nexus/oss/attributions.
View
2 nexus/nexus-core/src/main/java/org/sonatype/nexus/configuration/RevertableConfiguration.java
@@ -1,4 +1,4 @@
-/**
+/*
* Sonatype Nexus (TM) Open Source Version
* Copyright (c) 2007-2012 Sonatype, Inc.
* All rights reserved. Includes the third-party code listed at http://links.sonatype.com/products/nexus/oss/attributions.
View
2 nexus/nexus-core/src/test/java/com/sonatype/nexus/build/BuildApplicationStatusSource.java
@@ -1,4 +1,4 @@
-/**
+/*
* Sonatype Nexus (TM) Open Source Version
* Copyright (c) 2007-2012 Sonatype, Inc.
* All rights reserved. Includes the third-party code listed at http://links.sonatype.com/products/nexus/oss/attributions.
View
1 pom.xml
@@ -1386,6 +1386,7 @@
<exclude>**/org/sonatype/security/ldap/dao/password/hash/MD5Crypt.java</exclude>
<!-- FIXME is this really a good idea excluding all test resources? -->
<exclude>**/src/test/resources/**</exclude>
+ <exclude>**/src/test/filtered-resources/**</exclude>
<exclude>**/nexus-test-harness-its/resources/**</exclude>
<exclude>**/gwt/ext/ui/**/*.js</exclude>
<exclude>**/gwt/ext/ui/**/*.css</exclude>

0 comments on commit 1be96ba

Please sign in to comment.
Something went wrong with that request. Please try again.