343 tck via maven cli config on master

dev/build.example_fat/fat/src/com/ibm/ws/example/FATSuite.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017 IBM Corporation and others.
+ * Copyright (c) 2017, 2018 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,8 +15,8 @@
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
-import componenttest.rules.FeatureReplacementAction;
-import componenttest.rules.RepeatTests;
+import componenttest.rules.repeater.FeatureReplacementAction;
+import componenttest.rules.repeater.RepeatTests;
 
 @RunWith(Suite.class)
 @SuiteClasses({
@@ -28,6 +28,6 @@ public class FATSuite {
     // First without any modifications, then again with all features upgraded to their EE8 equivalents.
     @ClassRule
     public static RepeatTests r = RepeatTests.withoutModification()
-                    .andWith(FeatureReplacementAction.EE8_FEATURES);
+                    .andWith(FeatureReplacementAction.EE8_FEATURES());
 
 }

dev/build.example_fat/fat/src/com/ibm/ws/example/SimpleTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017 IBM Corporation and others.
+ * Copyright (c) 2017, 2018 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,6 +10,12 @@
  *******************************************************************************/
 package com.ibm.ws.example;
 
+import static componenttest.annotation.SkipForRepeat.EE8_FEATURES;
+import static componenttest.annotation.SkipForRepeat.NO_MODIFICATION;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Set;
+
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -19,6 +25,7 @@
 
 import app1.web.TestServletA;
 import componenttest.annotation.Server;
+import componenttest.annotation.SkipForRepeat;
 import componenttest.annotation.TestServlet;
 import componenttest.custom.junit.runner.FATRunner;
 import componenttest.topology.impl.LibertyServer;
@@ -67,4 +74,30 @@ public void verifyArtifactoryDependency() throws Exception {
         // Confirm that the example Artifactory dependency was download and is available on the classpath
         org.apache.commons.logging.Log.class.getName();
     }
+
+    @Test
+    @SkipForRepeat(EE8_FEATURES)
+    public void testEE7Only() throws Exception {
+        // This test will skip for the EE8 feature iteration
+
+        // Verify only EE7 features are enabled
+        Set<String> features = server.getServerConfiguration().getFeatureManager().getFeatures();
+        assertTrue("Expected the Java EE 7 feature 'servlet-3.1' to be enabled but was not: " + features,
+                   features.contains("servlet-3.1"));
+        assertTrue("No EE8 features should be enabled when this test runs: " + features,
+                   !features.contains("servlet-4.0"));
+    }
+
+    @Test
+    @SkipForRepeat(NO_MODIFICATION)
+    public void testEE8Only() throws Exception {
+        // This test will skip for the EE7 feature (i.e. NO_MODIFICATION) iteration
+
+        // Verify only EE8 features are enabled
+        Set<String> features = server.getServerConfiguration().getFeatureManager().getFeatures();
+        assertTrue("Expected the Java EE 8 feature 'servlet-4.0' to be enabled but was not: " + features,
+                   features.contains("servlet-4.0"));
+        assertTrue("No EE7 features should be enabled when this test runs: " + features,
+                   !features.contains("servlet-3.1"));
+    }
 }

dev/build.gradle

@@ -11,29 +11,14 @@
 /*
  * Master Gradle build script
  *
- * Depends on bndPlugin property set by settings.gradle.
- * and bnd_* values from gradle.properties.
+ * Depends on bnd_* values from gradle.properties.
  */
 
-import aQute.bnd.build.Workspace
-import aQute.bnd.osgi.Constants
-
-/* Add bnd gradle plugin as a script dependency */
-buildscript {
-  dependencies {
-    classpath bndPlugin
-  }
-}
-
-/* Initialize the bnd workspace */
-Workspace.setDriver(Constants.BNDDRIVER_GRADLE)
-Workspace.addGestalt(Constants.GESTALT_BATCH, null)
+/* Initialize rootProject properties */
 ext {
-  bndWorkspace = new Workspace(rootDir, bnd_cnf).setOffline(gradle.startParameter.offline)
   cnf = rootProject.project(bnd_cnf)
   buildImage = project(':build.image')
 }
-gradle.bndWorkspaceConfigure(bndWorkspace)
 
 /* Configure the subprojects */
 subprojects {
@@ -54,6 +39,9 @@ subprojects {
       }
     }
   }
+  // Make the release task depend on assemble so that invoking 'release' or 'releaseNeeded'
+  // will publish jar updates to the local build.image/wlp image
+  release.dependsOn assemble
 }
 
 task wrapper(type: Wrapper) {

dev/cnf/.gitignore

@@ -1,7 +1,7 @@
 /cache/
 /bin/
+/local/
 /release/
 /generated/
-/maven-local/
 /mavenlibs/
 /*.mvn

dev/cnf/ant/delivery_validation.xml

@@ -74,7 +74,7 @@
 
     <target name="statusChecksGHE">
        <sequential>
-           <startActivity label="Create status checks for Open Libety EBC builds linked to pull requests and commits"/>
+           <startActivity label="Create status checks for Open Liberty EBC builds linked to pull requests and commits"/>
            <createStatusChecksForOpenLibertyBuilds 
                repositoryAddress="${repositoryAddress}"
                userId="${userId}"

dev/cnf/build.bnd

@@ -8,7 +8,7 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 #*******************************************************************************
--include: ${workspace}/gradle.properties, ${workspace}/generated.properties
+-include: ${workspace}/gradle.properties
 
 # Maven repository credentials
 -connection-settings: ${if;${artifactory.download.token};server;-dummy};id=https://${artifactory.download.server};username=${artifactory.download.user};password=${artifactory.download.token}, \
@@ -17,6 +17,8 @@
 # Logging for repository connection when debugging
 #-connection-log: ${.}/connection-log.txt
 
+maven.release.name: release
+
 -plugin.1.Local: \
     aQute.bnd.repository.maven.provider.MavenBndRepository; \
         name = Local; \
@@ -27,22 +29,41 @@
     aQute.bnd.repository.maven.provider.MavenBndRepository; \
         name = Release; \
         noupdateOnRelease = true; \
-        local = ${build}/${maven.release.name}
+        releaseUrl="${fileuri;${build}/${maven.release.name}}"; \
+        snapshotUrl="${fileuri;${build}/${maven.release.name}}"; \
+        local = ${build}/local
+
+fetch.oss.repository: \
+    aQute.bnd.repository.maven.provider.MavenBndRepository; \
+        name = RemotePublic; \
+        releaseUrl = https://repo.maven.apache.org/maven2/; \
+        index = ${build}/oss_dependencies.maven
+
+fetch.oss.ibm.repository: \
+    aQute.bnd.repository.maven.provider.MavenBndRepository; \
+        name = RemoteIBM; \
+        local = ~/.ibmdhe/repository; \
+        releaseUrl = http://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/wasliberty-open-liberty/; \
+        index = ${build}/oss_ibm.maven
+
+fetch.ibm.java.repository:
+
+push.ibm.repository:
 
--plugin.3.RemotePublic = ${fetch.oss.repository}
+-plugin.3.RemotePublic: ${fetch.oss.repository}
 
--plugin.4.RemoteIBM = ${fetch.oss.ibm.repository}
+-plugin.4.RemoteIBM: ${fetch.oss.ibm.repository}
 
--plugin.5.RemoteIBMJava = ${fetch.ibm.java.repository}
+-plugin.5.RemoteIBMJava: ${fetch.ibm.java.repository}
 
--plugin.6.RemotePublish = ${push.ibm.repository}
+-plugin.6.RemotePublish: ${push.ibm.repository}
 
 # TODO: Disabled while testing whether this works correctly.
 # Remove -SNAPSHOT for releases
 #-snapshot: ${if;${is.release};;SNAPSHOT}
 
 # Don't upload sources or javadoc unless bundle overrides
--maven-release: ${if;${is.remote.publishing};remote;local}, sources;path=NONE, javadoc;path=NONE
+-maven-release: ${if;${driver;gradle};remote;local}, sources;path=NONE, javadoc;path=NONE
 
 bin: ${if;${driver;gradle};build/classes/java/main;bin}
 testbin: ${if;${driver;gradle};build/classes/java/test;bin_test}
@@ -58,14 +79,16 @@ javac.encoding: UTF-8
 -sources: false
 
 -pedantic: true
+-fixupmessages.javac17: "The .JRE container is set to JavaSE-1.8 but bnd is compiling against 1.7";is:=ignore
+-fixupmessages.nosrc: "bnd's src folder 'src' is not in the Eclipse build path";is:=ignore
 -fixupmessages.missingexport: "Used bundle version * for exported package";is:=error
 
 -releaserepo: ${if;${is.remote.publishing};RemotePublish;Release}
 -baselinerepo: Release
 -buildrepo: Local
 -groupid: ${if;${test.project};test;dev}
 -pom: 
--dsannotations-options: version;minimum=1.2
+#-dsannotations-options: version;minimum=1.2
 
 buildEngineName: defaultEngine
 
@@ -85,9 +108,7 @@ junit: org.apache.servicemix.bundles.junit;version="[4.11,5)"
 mockito: org.mockito.mockito-core;version="[1.9,2)",\
   org.objenesis;version="[2.1,3)"
 
--pluginpath: \
-    ${workspace}/cnf/lib/wlp-bndPlugins.jar,\
-    ${workspace}/cnf/mavenlibs/org.apache.aries.util-1.1.3.jar
+-pluginpath: ${if;${driver;gradle};${workspace}/cnf/lib/wlp-bndPlugins.jar,${workspace}/cnf/mavenlibs/org.apache.aries.util-1.1.3.jar;}
 
 instrument.disabled: ${if;${test.project};true;false}
 instrument.classesIncludes: **/*.class
@@ -121,9 +142,8 @@ javac.bootclasspath.java8:
 
 # catch-all if something goes wrong. This should be updated in
 # settings.gradle
-defaultjdklib.bootclasspath: \
-    ${java.home}/jre/lib/rt.jar;version=file;boot=true
-
+defaultjdklib.bootclasspath:
+
 internaljavac.bootclasspath.1.4: \
     com.ibm.ws.internal.prereq.java:java.rt;strategy=exact;version=1.6.0;boot=true